third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Exiv2:main' into patch-1

Browse Source
This commit is contained in:
Gribouilleuse 2023-04-11 13:02:23 +02:00 committed by GitHub
commit a714596b49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/on_PR_windows_matrix.yml vendored
View File

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

1
exiv2.md
View File

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

6
src/tiffimage_int.cpp
View File

@ -2146,8 +2146,10 @@ bool TiffHeaderBase::read(const byte* pData, size_t size) {
} else { } else {
return false; 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_); offset_ = getULong(pData + 4, byteOrder_);
return true; return true;

BIN
test/data/pr_2574.dcp Normal file
View File

Binary file not shown.

7
test/data/test_reference_files/pr_2574.dcp.out Normal file
View File

File diff suppressed because one or more lines are too long

1
tests/regression_tests/test_regression_allfiles.py
View File

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