diff --git a/appveyor_mingw_cygwin.yml b/appveyor_mingw_cygwin.yml new file mode 100644 index 00000000..31f054d4 --- /dev/null +++ b/appveyor_mingw_cygwin.yml @@ -0,0 +1,64 @@ +init: + - echo %PYTHON% + +environment: + PYTHON: "C:/Python37-x64" + + matrix: + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + BUILD: MINGW64 + INTEGRATION_TESTS: 1 + ARCHITECTURE: x86_64 + UNIT_TESTS: 1 + WEBREADY: False + WARNINGS_AS_ERRORS: ON + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + BUILD: CYGWIN64 + INTEGRATION_TESTS: 1 + ARCHITECTURE: x86_64 + UNIT_TESTS: 1 + WEBREADY: False + WARNINGS_AS_ERRORS: ON + +shallow_clone: true + +install: + - echo %APPVEYOR_BUILD_FOLDER% + - if "%BUILD%"=="MINGW64" set "PATH=c:\msys64\mingw64\bin;c:\msys64\usr\bin;c:\msys64\usr\local\bin;" + - if "%BUILD%"=="MINGW64" C:\msys64\usr\bin\bash -c "python -m pip install --upgrade pip;pip3.exe install lxml ; for i in base-devel git coreutils dos2unix tar diffutils make \ + mingw-w64-x86_64-toolchain mingw-w64-x86_64-gcc mingw-w64-x86_64-gdb \ + mingw-w64-x86_64-cmake mingw-w64-x86_64-gettext mingw-w64-x86_64-python3 \ + mingw-w64-x86_64-libexpat mingw-w64-x86_64-libiconv mingw-w64-x86_64-zlib \ + mingw-w64-x86_64-gtest ; do (echo y | pacman -S $i) ; done + - cd %APPVEYOR_BUILD_FOLDER% + - if "%BUILD%"=="CYGWIN64" set "PATH=c:\cygwin64\usr\local\bin;c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\cygwin64\usr\sbin;" + - if "%BUILD%"=="CYGWIN64" C:\cygwin64\bin\bash -c "wget https://raw.githubusercontent.com/transcode-open/apt-cyg/master/apt-cyg ; chmod +x apt-cyg; mv apt-cyg /usr/local/bin" + - if "%BUILD%"=="CYGWIN64" C:\cygwin64\bin\bash -c "apt-cyg install cmake zlib-devel libexpat-devel libxml2-devel libxslt-devel python38 python38-pip python38-libxml2" + - if "%BUILD%"=="CYGWIN64" C:\cygwin64\bin\bash -c "/usr/bin/python3.8.exe -m pip install --upgrade pip" + +build_script: + - cmd: set CMD=mkdir -p build + - cmd: set CMD=%CMD%; cd build + - cmd: set CMD=%CMD%; cmake .. -G 'Unix Makefiles' -DCMAKE_CXX_STANDARD=98 -DCMAKE_CXX_FLAGS=-Wno-deprecated + - cmd: set CMD=%CMD%; cmake --build . --config Release + - cmd: rem echo %CMD% + - cd %APPVEYOR_BUILD_FOLDER% + - cmd: if "%BUILD%"=="MINGW64" C:\msys64\usr\bin\bash -c "%CMD%" + - cmd: set CMD=which python3 python + - cmd: set CMD=%CMD%; python --version + - cmd: set CMD=%CMD%; build/bin/exiv2 --verbose --version; pwd ; ls -l + - cmd: set CMD=%CMD%; cd build ; cmake --build . --config Release --target python_tests + - cmd: echo %CMD% + - cd %APPVEYOR_BUILD_FOLDER% + - cmd: if "%BUILD%"=="MINGW64" C:\msys64\usr\bin\bash -c "%CMD%" + - cmd: set "PATH=c:\cygwin64\usr\local\bin;c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\cygwin64\usr\sbin;" + - cmd: set CMD=rm -rf build + - cmd: set CMD=%CMD%; mkdir -p build + - cmd: set CMD=%CMD%; cd build + - cmd: set CMD=%CMD%;cmake .. -DCMAKE_CXX_STANDARD=98 -DCMAKE_CXX_FLAGS=-Wno-deprecated + - cmd: set CMD=%CMD%; make + - cmd: set CMD=%CMD%; make python_tests + - cmd: echo %CMD% + - cd %APPVEYOR_BUILD_FOLDER% + - cmd: if "%BUILD%"=="CYGWIN64" C:\cygwin64\bin\bash -c "%CMD%" + diff --git a/src/tags_int.cpp b/src/tags_int.cpp index 39b59f02..1f9499fa 100644 --- a/src/tags_int.cpp +++ b/src/tags_int.cpp @@ -190,6 +190,12 @@ namespace Exiv2 { { 8, N_("left, bottom") } // To silence compiler warning }; + //! PlanarConfiguration, tag 0x011c + extern const TagDetails exifPlanarConfiguration[] = { + { 1, N_("Chunky") }, + { 2, N_("Planar") } + }; + //! Predictor, tag 0x013d extern const TagDetails exifPredictor[] = { { 1, N_("No prediction scheme used") }, @@ -585,7 +591,7 @@ namespace Exiv2 { "or planar format. In JPEG compressed files a JPEG marker " "is used instead of this tag. If this field does not exist, " "the TIFF default of 1 (chunky) is assumed."), - ifd0Id, imgStruct, unsignedShort, 1, printValue), + ifd0Id, imgStruct, unsignedShort, 1, EXV_PRINT_TAG(exifPlanarConfiguration)), TagInfo(0x0122, "GrayResponseUnit", N_("Gray Response Unit"), N_("The precision of the information contained in the GrayResponseCurve."), ifd0Id, imgStruct, unsignedShort, 1, printValue), // TIFF tag diff --git a/test/data/tiff-test.out b/test/data/tiff-test.out index a59f8f39..01ac5b46 100644 --- a/test/data/tiff-test.out +++ b/test/data/tiff-test.out @@ -14,7 +14,7 @@ RowsPerStrip Short 1 "64" StripByteCounts Long 1 "243" XResolution Rational 1 "72" YResolution Rational 1 "72" -PlanarConfiguration Short 1 "1" +PlanarConfiguration Short 1 "Chunky" ResolutionUnit Short 1 "inch" exiv2 -pS output @@ -99,7 +99,7 @@ RowsPerStrip Short 1 "64" StripByteCounts Long 1 "243" XResolution Rational 1 "72" YResolution Rational 1 "72" -PlanarConfiguration Short 1 "1" +PlanarConfiguration Short 1 "Chunky" ResolutionUnit Short 1 "inch" ExifTag Long 1 "294" DateTimeOriginal Ascii 18 "Yesterday at noon" diff --git a/tests/bugfixes/redmine/test_issue_831.py b/tests/bugfixes/redmine/test_issue_831.py index 3369869b..7f044150 100644 --- a/tests/bugfixes/redmine/test_issue_831.py +++ b/tests/bugfixes/redmine/test_issue_831.py @@ -35,7 +35,7 @@ Exif.Image.RowsPerStrip Short 1 64 Exif.Image.StripByteCounts Long 1 243 Exif.Image.XResolution Rational 1 72 Exif.Image.YResolution Rational 1 72 -Exif.Image.PlanarConfiguration Short 1 1 +Exif.Image.PlanarConfiguration Short 1 Chunky Exif.Image.ResolutionUnit Short 1 inch """ ] diff --git a/tests/tiff_test/test_tag_compare.py b/tests/tiff_test/test_tag_compare.py index b50dd196..a8538bd2 100644 --- a/tests/tiff_test/test_tag_compare.py +++ b/tests/tiff_test/test_tag_compare.py @@ -92,7 +92,7 @@ class OutputTagExtract(metaclass=system_tests.CaseMeta): if pa_elem["tag"] in [ "ImageWidth", "ImageLength", "BitsPerSample", "DocumentName", "ImageDescription", "StripOffsets", - "SamplesPerPixel", "StripByteCounts", "PlanarConfiguration"]: + "SamplesPerPixel", "StripByteCounts"]: self.assertEquals(pa_elem["val"], pS_elem["val"]) def compare_stdout(self, i, command, got_stdout, expected_stdout): @@ -128,7 +128,7 @@ Exif.Image.RowsPerStrip Short 1 64 Exif.Image.StripByteCounts Long 1 243 Exif.Image.XResolution Rational 1 72 Exif.Image.YResolution Rational 1 72 -Exif.Image.PlanarConfiguration Short 1 1 +Exif.Image.PlanarConfiguration Short 1 Chunky Exif.Image.ResolutionUnit Short 1 inch """, """STRUCTURE OF TIFF FILE (II): $data_path/mini9.tif