Merge pull request #25 from remia/fix/non-pod-variadic-warning

[asdcplib.git] / src / JP2K_Sequence_Parser.cpp

diff --git a/src/JP2K_Sequence_Parser.cpp b/src/JP2K_Sequence_Parser.cpp
index e8d779c612aaf5900b3496627ffb290ee3ff6148..c5610337fd3fedbd863b792b5632a1810cec9d63 100755 (executable)
--- a/src/JP2K_Sequence_Parser.cpp
+++ b/src/JP2K_Sequence_Parser.cpp
@@ -229,7 +229,7 @@ operator==(const ASDCP::JP2K::CodingStyleDefault_t& lhs, const ASDCP::JP2K::Codi
 
   for ( ui32_t i = 0; i < sizeof(ui16_t); i++ )
     {
-      if ( lhs.SGcod.NumberOfLayers[i] != lhs.SGcod.NumberOfLayers[i]  )
+      if ( lhs.SGcod.NumberOfLayers[i] != rhs.SGcod.NumberOfLayers[i]  )
        return false;
     }
 
@@ -253,14 +253,18 @@ operator==(const ASDCP::JP2K::CodingStyleDefault_t& lhs, const ASDCP::JP2K::Codi
 bool
 operator==(const ASDCP::JP2K::ExtendedCapabilities_t& lhs, const ASDCP::JP2K::ExtendedCapabilities_t& rhs)
 {
-       if (lhs.Pcap != rhs.Pcap) return false;
-
        if (lhs.N != rhs.N) return false;
 
-       for (ui32_t i = 0; i < lhs.N; i++)
-       {
-               if (lhs.Ccap[i] != rhs.Ccap[i])
-                       return false;
+       if (lhs.N != JP2K::NoExtendedCapabilitiesSignaled) {
+
+               if (lhs.Pcap != rhs.Pcap) return false;
+
+               for (ui32_t i = 0; i < lhs.N; i++)
+               {
+                       if (lhs.Ccap[i] != rhs.Ccap[i])
+                               return false;
+               }
+
        }
 
        return true;