646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
16 lines
644 B
Diff
16 lines
644 B
Diff
Fix build with libtiff 4.4.0 by not using a private libtiff API.
|
|
Patch by Kurt Schwehr: https://sourceforge.net/p/freeimage/discussion/36109/thread/2018fdc6e7/
|
|
|
|
diff -ru a/Source/Metadata/XTIFF.cpp b/Source/Metadata/XTIFF.cpp
|
|
--- a/Source/Metadata/XTIFF.cpp
|
|
+++ b/Source/Metadata/XTIFF.cpp
|
|
@@ -749,7 +749,7 @@
|
|
continue;
|
|
}
|
|
// type of storage may differ (e.g. rationnal array vs float array type)
|
|
- if((unsigned)_TIFFDataSize(tif_tag_type) != FreeImage_TagDataWidth(tag_type)) {
|
|
+ if((unsigned)TIFFFieldSetGetSize(fld) != FreeImage_TagDataWidth(tag_type)) {
|
|
// skip tag or _TIFFmemcpy will fail
|
|
continue;
|
|
}
|