Add patch for libtiff-4.5.0 comptability

This commit is contained in:
wu-leilei 2023-02-13 11:39:42 +08:00
parent 506430106b
commit 2b2e70e339
2 changed files with 17 additions and 1 deletions

12
freeimage-libtiff45.patch Normal file
View File

@ -0,0 +1,12 @@
diff -Nur a/Source/Metadata/XTIFF.cpp b/Source/Metadata/XTIFF.cpp
--- a/Source/Metadata/XTIFF.cpp 2023-02-13 11:08:06.161477974 +0800
+++ b/Source/Metadata/XTIFF.cpp 2023-02-13 11:15:35.831996396 +0800
@@ -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;
}

View File

@ -4,7 +4,7 @@
Name: freeimage Name: freeimage
Version: 3.18.0 Version: 3.18.0
Release: 8 Release: 9
Summary: FreeImage is a library project for developers who would like to support popular graphics image formats (PNG, JPEG, TIFF, BMP and others) Summary: FreeImage is a library project for developers who would like to support popular graphics image formats (PNG, JPEG, TIFF, BMP and others)
License: GPLv2 or GPLv3 and FIPL License: GPLv2 or GPLv3 and FIPL
URL: https://freeimage.sourceforge.io/ URL: https://freeimage.sourceforge.io/
@ -21,6 +21,7 @@ Patch3: FreeImage_doxygen.patch
Patch4: FreeImage_bigendian.patch Patch4: FreeImage_bigendian.patch
Patch5: substream.patch Patch5: substream.patch
Patch6: Fix-build-failure-with-OpenEXR-3.0.patch Patch6: Fix-build-failure-with-OpenEXR-3.0.patch
Patch7: freeimage-libtiff45.patch
BuildRequires: doxygen gcc-c++ make jxrlib-devel libjpeg-devel libmng-devel libpng-devel libtiff-devel libwebp-devel LibRaw-devel OpenEXR-devel openjpeg2-devel BuildRequires: doxygen gcc-c++ make jxrlib-devel libjpeg-devel libmng-devel libpng-devel libtiff-devel libwebp-devel LibRaw-devel OpenEXR-devel openjpeg2-devel
@ -105,6 +106,9 @@ ldconfig -n %{buildroot}%{_libdir}
%changelog %changelog
* Mon Feb 13 2023 wulei <wulei80@h-partners.com> - 3.18.0-9
- Add patch for libtiff-4.5.0 comptability
* Wed Aug 24 2022 caodongxia <caodongxia@h-partners.com> -3.18.0-8 * Wed Aug 24 2022 caodongxia <caodongxia@h-partners.com> -3.18.0-8
- Add debug package to add strip - Add debug package to add strip