diff options
author | Frankie Dintino <fdintino@theatlantic.com> | 2016-06-02 13:59:03 -0400 |
---|---|---|
committer | Hubert Figuière <hub@figuiere.net> | 2016-06-05 00:38:54 -0400 |
commit | b6ff77dd74a12432f434e2bcf5bc8721b403151a (patch) | |
tree | bf1bd38ae2046ed1e6f5e7409e4e65cb36da897a /XMPFiles/source/FormatSupport | |
parent | 54808b2b850181719fe3d2537f682071777aa910 (diff) |
Fix type mismatch in calls to XMPMeta::GetProperty
kXMP_NoOptions is (XMP_OptionBits) whereas the final argument to
XMPMeta::GetProperty takes (XMP_OptionBits*)
Diffstat (limited to 'XMPFiles/source/FormatSupport')
-rw-r--r-- | XMPFiles/source/FormatSupport/ID3_Support.cpp | 2 | ||||
-rw-r--r-- | XMPFiles/source/FormatSupport/RIFF_Support.cpp | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/XMPFiles/source/FormatSupport/ID3_Support.cpp b/XMPFiles/source/FormatSupport/ID3_Support.cpp index fc482ba..dd19c16 100644 --- a/XMPFiles/source/FormatSupport/ID3_Support.cpp +++ b/XMPFiles/source/FormatSupport/ID3_Support.cpp @@ -871,7 +871,7 @@ void ID3v1Tag::write ( XMP_IO* file, SXMPMeta* meta ) } - if ( meta->GetProperty ( kXMP_NS_DM, "trackNumber", &utf8, kXMP_NoOptions ) ) { + if ( meta->GetProperty ( kXMP_NS_DM, "trackNumber", &utf8, 0 ) ) { XMP_Uns8 trackNo = 0; try { diff --git a/XMPFiles/source/FormatSupport/RIFF_Support.cpp b/XMPFiles/source/FormatSupport/RIFF_Support.cpp index 1e2fad1..152a53b 100644 --- a/XMPFiles/source/FormatSupport/RIFF_Support.cpp +++ b/XMPFiles/source/FormatSupport/RIFF_Support.cpp @@ -613,7 +613,7 @@ static void exportXMPtoBextChunk( RIFF_MetaHandler* handler, ValueChunk** bextCh // prepare buffer, need to know CodingHistory size as the only variable XMP_Int32 bextBufferSize = MIN_BEXT_SIZE - 8; // -8 because of header std::string value; - if ( xmp->GetProperty( bextCodingHistory.ns, bextCodingHistory.prop, &value, kXMP_NoOptions )) + if ( xmp->GetProperty( bextCodingHistory.ns, bextCodingHistory.prop, &value, 0 )) { bextBufferSize += ((XMP_StringLen)value.size()) + 1 ; // add to size (and a trailing zero) } @@ -625,35 +625,35 @@ static void exportXMPtoBextChunk( RIFF_MetaHandler* handler, ValueChunk** bextCh // grab props, write into buffer, remove from XMP /////////////////////////// // bextDescription ------------------------------------------------ - if ( xmp->GetProperty( bextDescription.ns, bextDescription.prop, &value, kXMP_NoOptions ) ) + if ( xmp->GetProperty( bextDescription.ns, bextDescription.prop, &value, 0 ) ) { setBextField( &value, (XMP_Uns8*) buffer, 0, 256 ); xmp->DeleteProperty( bextDescription.ns, bextDescription.prop) ; chunkUsed = true; } // bextOriginator ------------------------------------------------- - if ( xmp->GetProperty( bextOriginator.ns , bextOriginator.prop, &value, kXMP_NoOptions ) ) + if ( xmp->GetProperty( bextOriginator.ns , bextOriginator.prop, &value, 0 ) ) { setBextField( &value, (XMP_Uns8*) buffer, 256, 32 ); xmp->DeleteProperty( bextOriginator.ns , bextOriginator.prop ); chunkUsed = true; } // bextOriginatorRef ---------------------------------------------- - if ( xmp->GetProperty( bextOriginatorRef.ns , bextOriginatorRef.prop, &value, kXMP_NoOptions ) ) + if ( xmp->GetProperty( bextOriginatorRef.ns , bextOriginatorRef.prop, &value, 0 ) ) { setBextField( &value, (XMP_Uns8*) buffer, 256+32, 32 ); xmp->DeleteProperty( bextOriginatorRef.ns , bextOriginatorRef.prop ); chunkUsed = true; } // bextOriginationDate -------------------------------------------- - if ( xmp->GetProperty( bextOriginationDate.ns , bextOriginationDate.prop, &value, kXMP_NoOptions ) ) + if ( xmp->GetProperty( bextOriginationDate.ns , bextOriginationDate.prop, &value, 0 ) ) { setBextField( &value, (XMP_Uns8*) buffer, 256+32+32, 10 ); xmp->DeleteProperty( bextOriginationDate.ns , bextOriginationDate.prop ); chunkUsed = true; } // bextOriginationTime -------------------------------------------- - if ( xmp->GetProperty( bextOriginationTime.ns , bextOriginationTime.prop, &value, kXMP_NoOptions ) ) + if ( xmp->GetProperty( bextOriginationTime.ns , bextOriginationTime.prop, &value, 0 ) ) { setBextField( &value, (XMP_Uns8*) buffer, 256+32+32+10, 8 ); xmp->DeleteProperty( bextOriginationTime.ns , bextOriginationTime.prop ); @@ -661,7 +661,7 @@ static void exportXMPtoBextChunk( RIFF_MetaHandler* handler, ValueChunk** bextCh } // bextTimeReference ---------------------------------------------- // thanx to friendly byte order, all 8 bytes can be written in one go: - if ( xmp->GetProperty( bextTimeReference.ns, bextTimeReference.prop, &value, kXMP_NoOptions ) ) + if ( xmp->GetProperty( bextTimeReference.ns, bextTimeReference.prop, &value, 0 ) ) { try { @@ -684,7 +684,7 @@ static void exportXMPtoBextChunk( RIFF_MetaHandler* handler, ValueChunk** bextCh xmp->DeleteProperty( bextVersion.ns, bextVersion.prop ); // bextUMID ------------------------------------------------------- - if ( xmp->GetProperty( bextUMID.ns, bextUMID.prop, &value, kXMP_NoOptions ) ) + if ( xmp->GetProperty( bextUMID.ns, bextUMID.prop, &value, 0 ) ) { std::string rawStr; @@ -703,7 +703,7 @@ static void exportXMPtoBextChunk( RIFF_MetaHandler* handler, ValueChunk** bextCh } // bextCodingHistory ---------------------------------------------- - if ( xmp->GetProperty( bextCodingHistory.ns, bextCodingHistory.prop, &value, kXMP_NoOptions ) ) + if ( xmp->GetProperty( bextCodingHistory.ns, bextCodingHistory.prop, &value, 0 ) ) { std::string ascii; convertToASCII( value.data(), (XMP_StringLen) value.size() , &ascii, (XMP_StringLen) value.size() ); |