!36 修复由于LibRaw 升级到0.21.1引起的编译失败

From: @lyn1001 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2023-07-05 08:01:06 +00:00 committed by Gitee
commit dec7e6fb33
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 18 additions and 1 deletions

View File

@ -0,0 +1,13 @@
diff -rupN --no-dereference freeimage-svn-r1889-FreeImage-trunk/Source/FreeImage/PluginRAW.cpp freeimage-svn-r1889-FreeImage-trunk-new/Source/FreeImage/PluginRAW.cpp
--- freeimage-svn-r1889-FreeImage-trunk/Source/FreeImage/PluginRAW.cpp 2023-04-13 15:28:11.206544177 +0200
+++ freeimage-svn-r1889-FreeImage-trunk-new/Source/FreeImage/PluginRAW.cpp 2023-04-13 15:28:11.524544641 +0200
@@ -701,7 +701,7 @@ Load(FreeImageIO *io, fi_handle handle,
// --------------------------------------------
// (-s [0..N-1]) Select one raw image from input file
- RawProcessor->imgdata.params.shot_select = 0;
+ RawProcessor->imgdata.rawparams.shot_select = 0;
// (-w) Use camera white balance, if possible (otherwise, fallback to auto_wb)
RawProcessor->imgdata.params.use_camera_wb = 1;
// (-M) Use any color matrix from the camera metadata. This option only affects Olympus, Leaf, and Phase One cameras.

View File

@ -4,7 +4,7 @@
Name: freeimage Name: freeimage
Version: 3.18.0 Version: 3.18.0
Release: 9 Release: 10
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/
@ -22,6 +22,7 @@ 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 Patch7: freeimage-libtiff45.patch
Patch8: Fix-build-failure-with-LibRaw-0.21.1.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
@ -106,6 +107,9 @@ ldconfig -n %{buildroot}%{_libdir}
%changelog %changelog
* Wed Jul 5 2023 liyanan <thistleslyn@163.com> - 3.18.0-10
- Fix compilation failure caused by LibRaw upgrade
* Mon Feb 13 2023 wulei <wulei80@h-partners.com> - 3.18.0-9 * Mon Feb 13 2023 wulei <wulei80@h-partners.com> - 3.18.0-9
- Add patch for libtiff-4.5.0 comptability - Add patch for libtiff-4.5.0 comptability