diff --git a/CMakeLists.txt b/CMakeLists.txt index 573268ff..3083b3e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,6 @@ option( EXIV2_ENABLE_XMP "Build with XMP metadata support" option( EXIV2_ENABLE_EXTERNAL_XMP "Use external version of XMP" OFF ) option( EXIV2_ENABLE_PNG "Build with png support (requires libz)" ON ) option( EXIV2_ENABLE_NLS "Build native language support (requires gettext)" OFF ) -option( EXIV2_ENABLE_PRINTUCS2 "Build with Printucs2" ON ) option( EXIV2_ENABLE_LENSDATA "Build including lens data" ON ) option( EXIV2_ENABLE_DYNAMIC_RUNTIME "Use dynamic runtime (used for static libs)" ON ) option( EXIV2_ENABLE_WEBREADY "Build webready support into library" OFF ) diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake index 4e52a3c6..0bed81c5 100644 --- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake @@ -73,7 +73,4 @@ // Define if you have the iconv function. #cmakedefine EXV_HAVE_ICONV -// Definition to enable conversion of UCS2 encoded Windows tags to UTF-8. -#cmakedefine EXV_HAVE_PRINTUCS2 - #endif /* !_EXV_CONF_H_ */ diff --git a/cmake/generateConfigFile.cmake b/cmake/generateConfigFile.cmake index 3e9dbc48..91b9554b 100644 --- a/cmake/generateConfigFile.cmake +++ b/cmake/generateConfigFile.cmake @@ -9,7 +9,6 @@ endif() set(EXV_ENABLE_BMFF ${EXIV2_ENABLE_BMFF}) set(EXV_ENABLE_WEBREADY ${EXIV2_ENABLE_WEBREADY}) set(EXV_HAVE_LENSDATA ${EXIV2_ENABLE_LENSDATA}) -set(EXV_HAVE_PRINTUCS2 ${EXIV2_ENABLE_PRINTUCS2}) set(EXV_PACKAGE_NAME ${PROJECT_NAME}) set(EXV_PACKAGE_VERSION ${PROJECT_VERSION}) diff --git a/cmake/printSummary.cmake b/cmake/printSummary.cmake index 13963dc6..f1e6a033 100644 --- a/cmake/printSummary.cmake +++ b/cmake/printSummary.cmake @@ -52,7 +52,6 @@ else() endif() OptionOutput( "Building BMFF support: " EXIV2_ENABLE_BMFF ) OptionOutput( "Native language support: " EXIV2_ENABLE_NLS ) -OptionOutput( "Conversion of Windows XP tags: " EXIV2_ENABLE_PRINTUCS2 ) OptionOutput( "Nikon lens database: " EXIV2_ENABLE_LENSDATA ) OptionOutput( "Building webready support: " EXIV2_ENABLE_WEBREADY ) if ( EXIV2_ENABLE_WEBREADY ) diff --git a/src/tags_int.cpp b/src/tags_int.cpp index 2e142931..55ed6499 100644 --- a/src/tags_int.cpp +++ b/src/tags_int.cpp @@ -2731,7 +2731,7 @@ namespace Exiv2 { } if (!cnv) os << value; return os; - } // printUcs2 + } std::ostream& printExifUnit(std::ostream& os, const Value& value, const ExifData* metadata) {