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

[asdcplib.git] / src / AS_DCP.h

diff --git a/src/AS_DCP.h b/src/AS_DCP.h
index 0948cbf5b2bff9f854d5b60c5b6cb5b52a4e142b..74991f68f47f819463e5e874975b2ded225b2065 100755 (executable)
--- a/src/AS_DCP.h
+++ b/src/AS_DCP.h
@@ -1051,6 +1051,9 @@ namespace ASDCP {
       const ui8_t  MaxCapabilities = 32;
                        const ui16_t MaxPRFN = 4;
                        const ui16_t MaxCPFN = 4;
+                       const i8_t NoExtendedCapabilitiesSignaled = -1;
+                       const ui16_t NoPRFSignaled = 0;
+                       const ui16_t NoCPFSignaled = 0;
 
 #pragma pack(1)
       struct ImageComponent_t  // ISO 15444-1 Annex A.5.1
@@ -1092,18 +1095,19 @@ namespace ASDCP {
       struct ExtendedCapabilities_t // ISO 15444-1 Annex A.5.2
       {
        ui32_t  Pcap; // Pcap = 0 means that no extended capabilities are required
-       ui16_t  Ccap[MaxCapabilities]; // Ccap^i in ISO/IEC 15444-1 corresponds to Ccap[i - 1]
+       i8_t N; // Number of Ccap elements, or NoExtendedCapabilitiesSignaled if no Extended Capabilities are signaled
+       ui16_t  Ccap[MaxCapabilities]; 
       };
 
                        struct Profile_t // ISO 15444-1
       {
-       ui16_t  N; // N = 0 means that the profile is signaled through Rsiz exclusively
+       ui16_t  N; // N = NoPRFSignaled means that Profile is signaled through Rsiz exclusively
        ui16_t  Pprf[MaxPRFN]; // Pprf^i in ISO/IEC 15444-1 corresponds to Pprf[i -1]
       };
 
                        struct CorrespondingProfile_t // ISO 15444-1
       {
-       ui16_t  N; // N = 0 means that no corresponding profile is signaled
+       ui16_t  N; // N = NoCPFSignaled means that no corresponding profile is signaled
        ui16_t  Pcpf[MaxCPFN]; // Pcpf^i in ISO/IEC 15444-1 corresponds to Pcpf[i -1]
       };