diff options
| author | Hubert Figuiere <hub@figuiere.net> | 2008-11-24 19:38:27 -0500 |
|---|---|---|
| committer | Hubert Figuiere <hub@figuiere.net> | 2008-11-24 19:38:27 -0500 |
| commit | 4c36cfcd907f811feb10a52c0bc27e68188c5816 (patch) | |
| tree | b7e05c798f8fcd8e073116ca8ca35c5bd6d1e7a8 /source | |
| parent | 89c24570fe50f58cbf25049cbf5042a048280489 (diff) | |
* source/XMPFiles/FormatSupport/ReconcileTIFF.cpp (ImportSingleTIFF_ASCII):
Re-enable the conversion for UNIX. Disabled in the original SDK.
Diffstat (limited to 'source')
| -rw-r--r-- | source/XMPFiles/FormatSupport/ReconcileTIFF.cpp | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/source/XMPFiles/FormatSupport/ReconcileTIFF.cpp b/source/XMPFiles/FormatSupport/ReconcileTIFF.cpp index 19031ba..92e4c46 100644 --- a/source/XMPFiles/FormatSupport/ReconcileTIFF.cpp +++ b/source/XMPFiles/FormatSupport/ReconcileTIFF.cpp @@ -491,11 +491,7 @@ ImportSingleTIFF_ASCII ( const TIFF_Manager::TagInfo & tagInfo, if ( isUTF8 ) { strValue.assign ( chPtr, tagInfo.dataLen ); } else { - #if ! XMP_UNIXBuild - ReconcileUtils::LocalToUTF8 ( chPtr, tagInfo.dataLen, &strValue ); - #else - return; // ! Hack until legacy-as-local issues are resolved for generic UNIX. - #endif + ReconcileUtils::LocalToUTF8 ( chPtr, tagInfo.dataLen, &strValue ); } xmp->SetProperty ( xmpNS, xmpProp, strValue.c_str() ); } @@ -869,11 +865,7 @@ ImportArrayTIFF_ASCII ( const TIFF_Manager::TagInfo & tagInfo, if ( isUTF8 ) { strValue.assign ( chPtr, tagInfo.dataLen ); } else { - #if ! XMP_UNIXBuild - ReconcileUtils::LocalToUTF8 ( chPtr, tagInfo.dataLen, &strValue ); - #else - return; // ! Hack until legacy-as-local issues are resolved for generic UNIX. - #endif + ReconcileUtils::LocalToUTF8 ( chPtr, tagInfo.dataLen, &strValue ); } chPtr = strValue.c_str(); chEnd = chPtr + strValue.size(); @@ -1341,11 +1333,7 @@ ImportTIFF_LocTextASCII ( const TIFF_Manager & tiff, XMP_Uns8 ifd, XMP_Uns16 tag if ( isUTF8 ) { strValue.assign ( chPtr, tagInfo.dataLen ); } else { - #if ! XMP_UNIXBuild - ReconcileUtils::LocalToUTF8 ( chPtr, tagInfo.dataLen, &strValue ); - #else - return; // ! Hack until legacy-as-local issues are resolved for generic UNIX. - #endif + ReconcileUtils::LocalToUTF8 ( chPtr, tagInfo.dataLen, &strValue ); } xmp->SetLocalizedText ( xmpNS, xmpProp, "", "x-default", strValue.c_str() ); } |