diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ffb319a..3a9b6f8c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,6 @@ option( EXIV2_ENABLE_PNG "Build with png support (requires libz)" 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_VIDEO "Build video support into library" OFF ) option( EXIV2_ENABLE_DYNAMIC_RUNTIME "Use dynamic runtime (used for static libs)" ON ) option( EXIV2_ENABLE_WIN_UNICODE "Use Unicode paths (wstring) on Windows" OFF ) option( EXIV2_ENABLE_WEBREADY "Build webready support into library" OFF ) diff --git a/README.md b/README.md index af5d02ba..ce1528e1 100644 --- a/README.md +++ b/README.md @@ -658,7 +658,6 @@ Note, you may wish to choose to build with optional features and/or build static ```bash $ mingw64-cmake .. -DEXIV2_TEAM_EXTRA_WARNINGS=On \ - -DEXIV2_ENABLE_VIDEO=On \ -DEXIV2_ENABLE_WEBREADY=On \ -DEXIV2_ENABLE_WIN_UNICODE=On \ -DBUILD_SHARED_LIBS=Off diff --git a/ci/test_build.py b/ci/test_build.py index 9faaafc9..b7fe117b 100644 --- a/ci/test_build.py +++ b/ci/test_build.py @@ -116,7 +116,7 @@ if __name__ == '__main__': help="Additional flags for cmake", type=str, nargs='?', - default="-DEXIV2_TEAM_EXTRA_WARNINGS=ON -DEXIV2_ENABLE_VIDEO=ON " + default="-DEXIV2_TEAM_EXTRA_WARNINGS=ON " "-DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_BMFF=ON " "-DBUILD_WITH_CCACHE=ON -DEXIV2_ENABLE_CURL=ON" ) diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake index f18f87a0..daed3cdd 100644 --- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake @@ -18,9 +18,6 @@ // Define if you want BMFF support. #cmakedefine EXV_ENABLE_BMFF -// Define if you want video support. -#cmakedefine EXV_ENABLE_VIDEO - // Define if you have the strerror_r function. #cmakedefine EXV_HAVE_STRERROR_R diff --git a/cmake/generateConfigFile.cmake b/cmake/generateConfigFile.cmake index ec9a013a..187a7474 100644 --- a/cmake/generateConfigFile.cmake +++ b/cmake/generateConfigFile.cmake @@ -7,7 +7,6 @@ if (${EXIV2_ENABLE_WEBREADY}) set(EXV_USE_CURL ${EXIV2_ENABLE_CURL}) endif() set(EXV_ENABLE_BMFF ${EXIV2_ENABLE_BMFF}) -set(EXV_ENABLE_VIDEO ${EXIV2_ENABLE_VIDEO}) set(EXV_ENABLE_WEBREADY ${EXIV2_ENABLE_WEBREADY}) set(EXV_HAVE_LENSDATA ${EXIV2_ENABLE_LENSDATA}) set(EXV_HAVE_PRINTUCS2 ${EXIV2_ENABLE_PRINTUCS2}) diff --git a/cmake/packaging.cmake b/cmake/packaging.cmake index fdc862e8..423d9a4a 100644 --- a/cmake/packaging.cmake +++ b/cmake/packaging.cmake @@ -59,11 +59,6 @@ if ( NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" ) endif() endif() -set (VI "") # Video -if ( EXIV2_ENABLE_VIDEO ) - set (VI Video) -endif() - set (WR "") # WebReady if ( EXIV2_ENABLE_WEBREADY ) set (WR Webready) @@ -118,7 +113,7 @@ endif() # Set RV = Release Version set(RV "Exiv2 v${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") -set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${VS}${BUNDLE_NAME}${BS}${CC}${LT}${BT}${VI}${WR}) +set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${VS}${BUNDLE_NAME}${BS}${CC}${LT}${BT}${WR}) # https://stackoverflow.com/questions/17495906/copying-files-and-including-them-in-a-cpack-archive install(FILES "${PROJECT_SOURCE_DIR}/samples/exifprint.cpp" DESTINATION "samples") diff --git a/cmake/printSummary.cmake b/cmake/printSummary.cmake index 720b1055..98ba8c1f 100644 --- a/cmake/printSummary.cmake +++ b/cmake/printSummary.cmake @@ -54,7 +54,6 @@ 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 video support: " EXIV2_ENABLE_VIDEO ) OptionOutput( "Building webready support: " EXIV2_ENABLE_WEBREADY ) if ( EXIV2_ENABLE_WEBREADY ) OptionOutput( "USE Libcurl for HttpIo: " EXIV2_ENABLE_CURL ) diff --git a/contrib/vs2019/solution/exv_conf.h b/contrib/vs2019/solution/exv_conf.h index ebeaa003..fafabd7b 100644 --- a/contrib/vs2019/solution/exv_conf.h +++ b/contrib/vs2019/solution/exv_conf.h @@ -21,9 +21,6 @@ // Define if you want translation of program messages to the user's native language #define EXV_ENABLE_NLS -// Define if you want video support. -#define EXV_ENABLE_VIDEO - // Define if you have the strerror_r function. /* #undef EXV_HAVE_STRERROR_R */ diff --git a/include/exiv2/CMakeLists.txt b/include/exiv2/CMakeLists.txt index 2f326000..cbe4fa80 100644 --- a/include/exiv2/CMakeLists.txt +++ b/include/exiv2/CMakeLists.txt @@ -35,7 +35,6 @@ install(FILES tgaimage.hpp tiffimage.hpp types.hpp - utilsvideo.hpp value.hpp version.hpp webpimage.hpp diff --git a/include/exiv2/utilsvideo.hpp b/include/exiv2/utilsvideo.hpp deleted file mode 100644 index b09de2e4..00000000 --- a/include/exiv2/utilsvideo.hpp +++ /dev/null @@ -1,65 +0,0 @@ -// ***************************************************************** -*- C++ -*- -/* - * Copyright (C) 2004-2021 Exiv2 authors - * This program is part of the Exiv2 distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef UTILSVIDEO_HPP_ -#define UTILSVIDEO_HPP_ - -#include "exiv2lib_export.h" -#include "exif.hpp" - -namespace Exiv2 -{ - - /*! - @brief Class of utility functions used by the video code. - */ - class EXIV2LIB_DEPRECATED_EXPORT UtilsVideo - { - public: - /*! - @brief compare a buffer and string - @param buf - binary buffer - @param str - nul terminated C string - @return true if match - */ - static bool compareTagValue(Exiv2::DataBuf &buf, const char *str); - - /*! - @brief compare a buffer and an array of strings - @param buf - binary buffer - @param arr - array of C strings C - @param arraysize - length of arr - @return true if match - */ - static bool compareTagValue(Exiv2::DataBuf& buf,const char arr[][5],int32_t arraysize); - - /*! - @brief compare a buffer and string - @param buf - binary buffer - @param str - C string (not guaranteed nul terminated) - @param size - number of bytes to compare - @return true if match - */ - static bool simpleBytesComparison(Exiv2::DataBuf& buf ,const char* str,int32_t size); - }; // class UtilsVideo - -} // namespace Exiv2 - -#endif // #ifndef UTILSVIDEO_HPP_ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 280c431e..18a26b28 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -103,12 +103,6 @@ if( EXIV2_ENABLE_PNG ) target_sources(exiv2lib PRIVATE pngimage.cpp ../include/exiv2/pngimage.hpp) endif() -if( EXIV2_ENABLE_VIDEO ) - target_sources(exiv2lib PRIVATE - utilsvideo.cpp ../include/exiv2/utilsvideo.hpp - ) -endif() - target_sources(exiv2lib PRIVATE bmffimage.cpp ../include/exiv2/bmffimage.hpp ) diff --git a/src/utilsvideo.cpp b/src/utilsvideo.cpp deleted file mode 100644 index 9e86a2ed..00000000 --- a/src/utilsvideo.cpp +++ /dev/null @@ -1,57 +0,0 @@ -// ***************************************************************** -*- C++ -*- -/* - * Copyright (C) 2004-2021 Exiv2 authors - * This program is part of the Exiv2 distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. - */ -// ***************************************************************************** - -#include "config.h" - -#ifdef EXV_ENABLE_VIDEO -#include "utilsvideo.hpp" - -#ifndef _MSC_VER -#define stricmp strcasecmp -#endif - -namespace Exiv2 -{ - -bool UtilsVideo::compareTagValue(Exiv2::DataBuf& buf ,const char* str){ - bool result = true; - for(int32_t i=0; result && i<4; i++ ) - if(tolower(buf.pData_[i]) != tolower(str[i])) - return false; - return true; -} - -bool UtilsVideo::compareTagValue(Exiv2::DataBuf& buf,const char arr[][5],int32_t arraysize){ - bool result = false; - for ( int32_t i=0; !result && i< arraysize; i++) - result = (bool)(stricmp((const char*)buf.pData_,arr[i])==0); - return result; -} - -bool UtilsVideo::simpleBytesComparison(Exiv2::DataBuf& buf ,const char* str,int32_t size){ - for(int32_t i=0; i