Bump patch version post tag.

[asdcplib.git] / src / MXFTypes.cpp

diff --git a/src/MXFTypes.cpp b/src/MXFTypes.cpp
index ec55f87315480877c553aff60a168ce79a484d26..72338bbfda5f3290f8de2b9990345e4c52e92ba9 100755 (executable)
--- a/src/MXFTypes.cpp
+++ b/src/MXFTypes.cpp
@@ -777,18 +777,15 @@ ASDCP::MXF::Raw::EncodeString(char* str_buf, ui32_t buf_len) const
 
 //
 bool
-ASDCP::MXF::J2KExtendedCapabilities::Archive(Kumu::MemIOWriter* Writer) const {
+ASDCP::MXF::J2KExtendedCapabilitiesType::Archive(Kumu::MemIOWriter* Writer) const {
   if ( ! Writer->WriteUi32BE(Pcap) )
     {
       return false;
     }
 
-  for ( int i = 0; i < JP2K::MaxCapabilities; ++i )
+    if ( ! Ccap.Archive(Writer) )
     {
-      if ( ! Writer->WriteUi16BE(Ccapi[i]) )
-        {
-          return false;
-        }
+        return false;
     }
 
   return true;
@@ -796,18 +793,15 @@ ASDCP::MXF::J2KExtendedCapabilities::Archive(Kumu::MemIOWriter* Writer) const {
 
 //
 bool
-ASDCP::MXF::J2KExtendedCapabilities::Unarchive(Kumu::MemIOReader* Reader) {
+ASDCP::MXF::J2KExtendedCapabilitiesType::Unarchive(Kumu::MemIOReader* Reader) {
   if ( ! Reader->ReadUi32BE(&Pcap) )
     {
       return false;
     }
 
-  for ( int i = 0; i < JP2K::MaxCapabilities; ++i )
+ if ( ! Ccap.Unarchive(Reader) )
     {
-      if ( ! Reader->ReadUi16BE(&Ccapi[i]) )
-        {
-          return false;
-        }
+        return false;
     }
 
   return true;
@@ -815,15 +809,15 @@ ASDCP::MXF::J2KExtendedCapabilities::Unarchive(Kumu::MemIOReader* Reader) {
 
 //
 const char*
-ASDCP::MXF::J2KExtendedCapabilities::EncodeString(char* str_buf, ui32_t buf_len) const
+ASDCP::MXF::J2KExtendedCapabilitiesType::EncodeString(char* str_buf, ui32_t buf_len) const
 {
   const int str_len = ( sizeof(ui16_t) + 1 ) * JP2K::MaxCapabilities;
 
   if ( Pcap != 0 && buf_len > str_len )
     {
-      for ( int i = 0; i < JP2K::MaxCapabilities; ++i )
+      for ( int i = 0; i < Ccap.size(); ++i )
         {
-         snprintf(str_buf+(i*3), 4, "%02hx.", Ccapi[i]);
+         snprintf(str_buf+(i*3), 4, "%02hx.", Ccap[i].value);
         }
 
       str_buf[str_len-1] = 0;