Merge branch 'Exiv2:main' into patch-1

.github/workflows/on_PR_windows_matrix.yml

@@ -153,7 +153,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Set up Cygwin
-        uses: cygwin/cygwin-install-action@v3
+        uses: cygwin/cygwin-install-action@v4
         with:
           platform: ${{matrix.platform}}
           packages: >-

exiv2.md

@@ -75,6 +75,7 @@ BMP  | -          | -          | -          | -              | -           | -
 CR2  | Read/Write | Read/Write | Read/Write | -              | Read/Write  | Read/Write
 CR3  | Read       | Read       | Read       | -              | -           | Read
 CRW  | Read/Write | -          | -          | Read/Write     | -           | Read/Write
+DCP  | Read/Write | -          | -          | -              | -           | -
 DNG  | Read/Write | Read/Write | Read/Write | -              | Read/Write  | Read/Write
 EPS  | -          | -          | Read/Write |                | -           | -
 EXV  | Read/Write | Read/Write | Read/Write | Read/Write     | Read/Write  | Read/Write

src/tiffimage_int.cpp

@@ -2146,8 +2146,10 @@ bool TiffHeaderBase::read(const byte* pData, size_t size) {
   } else {
     return false;
   }
-  if (uint16_t t = getUShort(pData + 2, byteOrder_); t != 444 && tag_ != t)
+  uint16_t t = getUShort(pData + 2, byteOrder_);
-    return false;  // 444 is for the JPEG-XR
+  if (t != 444 && t != 17234 && tag_ != t)
+    return false;  // 444 is for the JPEG-XR; 17234 is for DCP
+  tag_ = t;
   offset_ = getULong(pData + 4, byteOrder_);
 
   return true;

tests/regression_tests/test_regression_allfiles.py

@@ -12,6 +12,7 @@ def get_valid_files(data_dir):
         ".avif",
         ".cr3",
         ".crw",
+        ".dcp",
         ".dng",
         ".eps",
         ".exv",