Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package freeimage for openSUSE:Factory
checked in at 2023-10-19 22:49:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/freeimage (Old)
and /work/SRC/openSUSE:Factory/.freeimage.new.1945 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "freeimage"
Thu Oct 19 22:49:54 2023 rev:13 rq:1118912 version:3.18.0.1909
Changes:
--------
--- /work/SRC/openSUSE:Factory/freeimage/freeimage.changes 2023-10-05
20:06:48.330629964 +0200
+++ /work/SRC/openSUSE:Factory/.freeimage.new.1945/freeimage.changes
2023-10-19 22:52:14.825155325 +0200
@@ -1,0 +2,6 @@
+Tue Oct 17 10:31:26 UTC 2023 - Ich <jeng...@inai.de>
+
+- Unbreak the build of all downstream packages, repeal
+ excessive excludes from _service, redo unbundle.patch [boo#1216332]
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ freeimage.spec ++++++
--- /var/tmp/diff_new_pack.fWUsFr/_old 2023-10-19 22:52:15.437177522 +0200
+++ /var/tmp/diff_new_pack.fWUsFr/_new 2023-10-19 22:52:15.441177667 +0200
@@ -83,12 +83,14 @@
%autosetup -p1
%build
-
-# clear files which cannot be built due to dependencies on private headers
-# (see also unbundle patch)
-# It disables the G3 Fax Loader and the JPEG lossless transformations plugins
-> Source/FreeImage/PluginG3.cpp
-> Source/FreeImageToolkit/JPEGTransform.cpp
+# access to libtiff/libjpeg internals requires internal headers, requires
+# bundled copy of the libs, which is a no-no.
+# Disable the affected components without removing files (which may be
+# referenced in the build system).
+#
+: >Source/FreeImage/PluginG3.cpp >Source/Metadata/XTIFF.cpp \
+ >Source/FreeImageToolkit/JPEGTransform.cpp \
+ >Source/FreeImage/PluginTIFF.cpp
# sanitize encodings / line endings
for file in `find . -type f -name '*.c' -or -name '*.cpp' -or -name '*.h' -or
-name '*.txt' -or -name Makefile`; do
@@ -99,6 +101,10 @@
sh ./gensrclist.sh
sh ./genfipsrclist.sh
+if grep -q 'SRCS = $' Makefile.srcs; then
+ echo "Empty source list generated. Broken OBS package."
+ exit 1
+fi
export CFLAGS="%{optflags} -fPIC"
export CXXFLAGS="%{optflags} -fPIC"
++++++ _service ++++++
--- /var/tmp/diff_new_pack.fWUsFr/_old 2023-10-19 22:52:15.481179117 +0200
+++ /var/tmp/diff_new_pack.fWUsFr/_new 2023-10-19 22:52:15.485179263 +0200
@@ -7,9 +7,6 @@
<param name="versionprefix">3.18.0</param>
<param name="changesgenerate">enable</param>
<param name="exclude">*.sln</param>
- <param name="exclude">*.vcxproj</param>
- <param name="exclude">*.vcproj</param>
- <param name="exclude">*.vcxproj.filters</param>
<param name="exclude">*.cygwin</param>
<param name="exclude">*.iphone</param>
<param name="exclude">*.mingw</param>
++++++ freeimage-3.18.0.1909.obscpio ++++++
++++ 2474 lines of diff (skipped)
++++++ freeimage-openexr3.patch ++++++
--- /var/tmp/diff_new_pack.fWUsFr/_old 2023-10-19 22:52:15.801190724 +0200
+++ /var/tmp/diff_new_pack.fWUsFr/_new 2023-10-19 22:52:15.805190869 +0200
@@ -1,3 +1,8 @@
+---
+ Source/FreeImage/PluginEXR.cpp | 10 +++++-----
+ Source/FreeImage/PluginTIFF.cpp | 2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
Index: freeimage-3.18.0.1909/Source/FreeImage/PluginEXR.cpp
===================================================================
--- freeimage-3.18.0.1909.orig/Source/FreeImage/PluginEXR.cpp
++++++ unbundle.patch ++++++
--- /var/tmp/diff_new_pack.fWUsFr/_old 2023-10-19 22:52:15.841192175 +0200
+++ /var/tmp/diff_new_pack.fWUsFr/_new 2023-10-19 22:52:15.845192320 +0200
@@ -1,34 +1,26 @@
-Index: freeimage-3.18.0.1909/genfipsrclist.sh
-===================================================================
---- freeimage-3.18.0.1909.orig/genfipsrclist.sh
-+++ freeimage-3.18.0.1909/genfipsrclist.sh
-@@ -1,6 +1,6 @@
- #!/bin/sh
-
--DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG
Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR
Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf
Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/OpenEXR/IexMath
Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal
Source/LibRawLite/libraw Source/LibRawLite/src Source/LibWebP Source/LibJXR
Source/LibJXR/common/include Source/LibJXR/image/sys Source/LibJXR/jxrgluelib
Wrapper/FreeImagePlus"
-+DIRLIST="Wrapper/FreeImagePlus"
-
-
- echo "VER_MAJOR = 3" > fipMakefile.srcs
-@@ -19,5 +19,6 @@ echo -n "INCLUDE =" >> fipMakefile.srcs
- for DIR in $DIRLIST; do
- echo -n " -I$DIR" >> fipMakefile.srcs
- done
-+echo -n " -IDist" >> fipMakefile.srcs
- echo >> fipMakefile.srcs
-
-Index: freeimage-3.18.0.1909/gensrclist.sh
-===================================================================
---- freeimage-3.18.0.1909.orig/gensrclist.sh
-+++ freeimage-3.18.0.1909/gensrclist.sh
-@@ -1,6 +1,6 @@
- #!/bin/sh
-
--DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG
Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR
Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf
Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/OpenEXR/IexMath
Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal
Source/LibRawLite/libraw Source/LibRawLite/src Source/LibWebP Source/LibJXR
Source/LibJXR/common/include Source/LibJXR/image/sys Source/LibJXR/jxrgluelib"
-+DIRLIST=". Source Source/Metadata Source/FreeImageToolkit"
-
- echo "VER_MAJOR = 3" > Makefile.srcs
- echo "VER_MINOR = 19.0" >> Makefile.srcs
+---
+ Makefile.fip | 20 ++---
+ Makefile.gnu | 16 +---
+ Source/FreeImage.h | 21 ++++-
+ Source/FreeImage/J2KHelper.cpp | 2
+ Source/FreeImage/PSDParser.cpp | 18 ++--
+ Source/FreeImage/Plugin.cpp | 2
+ Source/FreeImage/PluginEXR.cpp | 20 ++---
+ Source/FreeImage/PluginJ2K.cpp | 2
+ Source/FreeImage/PluginJP2.cpp | 2
+ Source/FreeImage/PluginJPEG.cpp | 116
------------------------------
+ Source/FreeImage/PluginJXR.cpp | 3
+ Source/FreeImage/PluginPNG.cpp | 4 -
+ Source/FreeImage/PluginRAW.cpp | 2
+ Source/FreeImage/PluginWebP.cpp | 6 -
+ Source/FreeImage/ZLibInterface.cpp | 5 -
+ Source/FreeImageToolkit/JPEGTransform.cpp | 8 +-
+ Source/Metadata/TagConversion.cpp | 5 +
+ Source/Utilities.h | 4 -
+ genfipsrclist.sh | 3
+ gensrclist.sh | 2
+ 20 files changed, 83 insertions(+), 178 deletions(-)
+
Index: freeimage-3.18.0.1909/Makefile.fip
===================================================================
--- freeimage-3.18.0.1909.orig/Makefile.fip
@@ -121,6 +113,177 @@
install:
install -d $(INCDIR) $(INSTALLDIR)
+Index: freeimage-3.18.0.1909/Source/FreeImage.h
+===================================================================
+--- freeimage-3.18.0.1909.orig/Source/FreeImage.h
++++ freeimage-3.18.0.1909/Source/FreeImage.h
+@@ -155,8 +155,11 @@ typedef uint8_t BYTE;
+ typedef uint16_t WORD;
+ typedef uint32_t DWORD;
+ typedef int32_t LONG;
++// Disable these, they conflict with the (wrong) ones of libraw
++#if 0
+ typedef int64_t INT64;
+ typedef uint64_t UINT64;
++#endif
+ #else
+ // MS is not C99 ISO compliant
+ typedef long BOOL;
+@@ -410,7 +413,12 @@ FI_ENUM(FREE_IMAGE_FORMAT) {
+ FIF_DDS = 24,
+ FIF_GIF = 25,
+ FIF_HDR = 26,
+- FIF_FAXG3 = 27,
++/* The G3 fax format plugin is deliberately disabled in the Fedora build of
++ FreeImage as it requires that FreeImage uses a private copy of libtiff
++ which is a no no because of security reasons. */
++#if 0
++ FIF_FAXG3 = 27,
++#endif
+ FIF_SGI = 28,
+ FIF_EXR = 29,
+ FIF_J2K = 30,
+@@ -473,6 +481,10 @@ FI_ENUM(FREE_IMAGE_DITHER) {
+ FID_BAYER16x16 = 6 //! Bayer ordered dispersed dot
dithering (order 4 dithering matrix)
+ };
+
++/* The FreeImage_JPEGTransform functions are deliberately disabled in the
++ Fedora build of FreeImage as they require that FreeImage uses a private
copy
++ of libjpeg which is a no no because of security reasons. */
++#if 0
+ /** Lossless JPEG transformations
+ Constants used in FreeImage_JPEGTransform
+ */
+@@ -486,6 +498,7 @@ FI_ENUM(FREE_IMAGE_JPEG_OPERATION) {
+ FIJPEG_OP_ROTATE_180 = 6, //! 180-degree rotation
+ FIJPEG_OP_ROTATE_270 = 7 //! 270-degree clockwise (or 90
ccw)
+ };
++#endif
+
+ /** Tone mapping operators.
+ Constants used in FreeImage_ToneMapping.
+@@ -1088,7 +1101,10 @@ DLL_API const char* DLL_CALLCONV FreeIma
+ // --------------------------------------------------------------------------
+ // JPEG lossless transformation routines
+ // --------------------------------------------------------------------------
+-
++/* The FreeImage_JPEGTransform functions are deliberately disabled in the
+++ Fedora build of FreeImage as they require that FreeImage uses a private
copy
+++ of libjpeg which is a no no because of security reasons. */
++#if 0
+ DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransform(const char *src_file, const
char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect
FI_DEFAULT(TRUE));
+ DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformU(const wchar_t *src_file,
const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect
FI_DEFAULT(TRUE));
+ DLL_API BOOL DLL_CALLCONV FreeImage_JPEGCrop(const char *src_file, const char
*dst_file, int left, int top, int right, int bottom);
+@@ -1097,6 +1113,7 @@ DLL_API BOOL DLL_CALLCONV FreeImage_JPEG
+ DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombined(const char
*src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int*
left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
+ DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedU(const wchar_t
*src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int*
left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
+ DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedFromMemory(FIMEMORY*
src_stream, FIMEMORY* dst_stream, FREE_IMAGE_JPEG_OPERATION operation, int*
left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
++#endif
+
+
+ // --------------------------------------------------------------------------
+Index: freeimage-3.18.0.1909/Source/FreeImage/J2KHelper.cpp
+===================================================================
+--- freeimage-3.18.0.1909.orig/Source/FreeImage/J2KHelper.cpp
++++ freeimage-3.18.0.1909/Source/FreeImage/J2KHelper.cpp
+@@ -21,7 +21,7 @@
+
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../LibOpenJPEG/openjpeg.h"
++#include <openjpeg.h>
+ #include "J2KHelper.h"
+
+ // --------------------------------------------------------------------------
+Index: freeimage-3.18.0.1909/Source/FreeImage/PSDParser.cpp
+===================================================================
+--- freeimage-3.18.0.1909.orig/Source/FreeImage/PSDParser.cpp
++++ freeimage-3.18.0.1909/Source/FreeImage/PSDParser.cpp
+@@ -133,8 +133,8 @@ public:
+ template <>
+ class PSDGetValue<8> {
+ public:
+- static inline UINT64 get(const BYTE * iprBuffer) {
+- UINT64 v = ((const UINT64*)iprBuffer)[0];
++ static inline uint64_t get(const BYTE * iprBuffer) {
++ uint64_t v = ((const uint64_t*)iprBuffer)[0];
+ #ifndef FREEIMAGE_BIGENDIAN
+ SwapInt64(&v);
+ #endif
+@@ -147,7 +147,7 @@ public:
+
+ // --------------------------------------------------------------------------
+
+-static UINT64
++static uint64_t
+ psdReadSize(FreeImageIO *io, fi_handle handle, const psdHeaderInfo& header) {
+ if(header._Version == 1) {
+ BYTE Length[4];
+@@ -199,11 +199,11 @@ public:
+ template <>
+ class PSDSetValue<8> {
+ public:
+- static inline void set(const BYTE * iprBuffer, UINT64 v) {
++ static inline void set(const BYTE * iprBuffer, uint64_t v) {
+ #ifndef FREEIMAGE_BIGENDIAN
+ SwapInt64(&v);
+ #endif
+- ((UINT64*)iprBuffer)[0] = v;
++ ((uint64_t*)iprBuffer)[0] = v;
+ }
+ };
+
+@@ -213,7 +213,7 @@ public:
+ // --------------------------------------------------------------------------
+
+ static inline bool
+-psdWriteSize(FreeImageIO *io, fi_handle handle, const psdHeaderInfo& header,
UINT64 v) {
++psdWriteSize(FreeImageIO *io, fi_handle handle, const psdHeaderInfo& header,
uint64_t v) {
+ if(header._Version == 1) {
+ BYTE Length[4];
+ psdSetLongValue(Length, sizeof(Length), (DWORD)v);
+@@ -1063,10 +1063,10 @@ unsigned psdParser::GetChannelOffset(FIB
+ bool psdParser::ReadLayerAndMaskInfoSection(FreeImageIO *io, fi_handle
handle) {
+ bool bSuccess = true;
+
+- UINT64 nTotalBytes = psdReadSize(io, handle, _headerInfo);
++ uint64_t nTotalBytes = psdReadSize(io, handle, _headerInfo);
+
+ // Hack to handle large PSB files without using fseeko().
+- if (sizeof(long) < sizeof(UINT64)) {
++ if (sizeof(long) < sizeof(uint64_t)) {
+ const long offset = 0x10000000;
+ while (nTotalBytes > offset) {
+ if (io->seek_proc(handle, offset, SEEK_CUR) != 0) {
+@@ -1672,7 +1672,7 @@ bool psdParser::WriteLayerAndMaskInfoSec
+ // Short section with no layers.
+ BYTE IntValue[4];
+
+- UINT64 size;
++ uint64_t size;
+ if(_headerInfo._Version == 1) {
+ size = 8;
+ } else {
+Index: freeimage-3.18.0.1909/Source/FreeImage/Plugin.cpp
+===================================================================
+--- freeimage-3.18.0.1909.orig/Source/FreeImage/Plugin.cpp
++++ freeimage-3.18.0.1909/Source/FreeImage/Plugin.cpp
+@@ -255,7 +255,6 @@ FreeImage_Initialise(BOOL load_local_plu
+ s_plugins->AddNode(InitPNM, NULL, "PPMRAW", "Portable
Pixelmap (RAW)", "ppm", "^P6");
+ s_plugins->AddNode(InitRAS);
+ s_plugins->AddNode(InitTARGA);
+- s_plugins->AddNode(InitTIFF);
+ s_plugins->AddNode(InitWBMP);
+ s_plugins->AddNode(InitPSD);
+ s_plugins->AddNode(InitCUT);
+@@ -264,7 +263,6 @@ FreeImage_Initialise(BOOL load_local_plu
+ s_plugins->AddNode(InitDDS);
+ s_plugins->AddNode(InitGIF);
+ s_plugins->AddNode(InitHDR);
+- s_plugins->AddNode(InitG3);
+ s_plugins->AddNode(InitSGI);
+ s_plugins->AddNode(InitEXR);
+ s_plugins->AddNode(InitJ2K);
Index: freeimage-3.18.0.1909/Source/FreeImage/PluginEXR.cpp
===================================================================
--- freeimage-3.18.0.1909.orig/Source/FreeImage/PluginEXR.cpp
@@ -312,6 +475,20 @@
Read JPEG_APPD marker (IPTC or Adobe Photoshop profile)
*/
static BOOL
+Index: freeimage-3.18.0.1909/Source/FreeImage/PluginJXR.cpp
+===================================================================
+--- freeimage-3.18.0.1909.orig/Source/FreeImage/PluginJXR.cpp
++++ freeimage-3.18.0.1909/Source/FreeImage/PluginJXR.cpp
+@@ -22,8 +22,7 @@
+ #include "FreeImage.h"
+ #include "Utilities.h"
+ #include "../Metadata/FreeImageTag.h"
+-
+-#include "../LibJXR/jxrgluelib/JXRGlue.h"
++#include <JXRGlue.h>
+
+ // ==========================================================
+ // Plugin Interface
Index: freeimage-3.18.0.1909/Source/FreeImage/PluginPNG.cpp
===================================================================
--- freeimage-3.18.0.1909.orig/Source/FreeImage/PluginPNG.cpp
@@ -357,75 +534,6 @@
// ==========================================================
// Plugin Interface
-Index: freeimage-3.18.0.1909/Source/FreeImage/PSDParser.cpp
-===================================================================
---- freeimage-3.18.0.1909.orig/Source/FreeImage/PSDParser.cpp
-+++ freeimage-3.18.0.1909/Source/FreeImage/PSDParser.cpp
-@@ -133,8 +133,8 @@ public:
- template <>
- class PSDGetValue<8> {
- public:
-- static inline UINT64 get(const BYTE * iprBuffer) {
-- UINT64 v = ((const UINT64*)iprBuffer)[0];
-+ static inline uint64_t get(const BYTE * iprBuffer) {
-+ uint64_t v = ((const uint64_t*)iprBuffer)[0];
- #ifndef FREEIMAGE_BIGENDIAN
- SwapInt64(&v);
- #endif
-@@ -147,7 +147,7 @@ public:
-
- // --------------------------------------------------------------------------
-
--static UINT64
-+static uint64_t
- psdReadSize(FreeImageIO *io, fi_handle handle, const psdHeaderInfo& header) {
- if(header._Version == 1) {
- BYTE Length[4];
-@@ -199,11 +199,11 @@ public:
- template <>
- class PSDSetValue<8> {
- public:
-- static inline void set(const BYTE * iprBuffer, UINT64 v) {
-+ static inline void set(const BYTE * iprBuffer, uint64_t v) {
- #ifndef FREEIMAGE_BIGENDIAN
- SwapInt64(&v);
- #endif
-- ((UINT64*)iprBuffer)[0] = v;
-+ ((uint64_t*)iprBuffer)[0] = v;
- }
- };
-
-@@ -213,7 +213,7 @@ public:
- // --------------------------------------------------------------------------
-
- static inline bool
--psdWriteSize(FreeImageIO *io, fi_handle handle, const psdHeaderInfo& header,
UINT64 v) {
-+psdWriteSize(FreeImageIO *io, fi_handle handle, const psdHeaderInfo& header,
uint64_t v) {
- if(header._Version == 1) {
- BYTE Length[4];
- psdSetLongValue(Length, sizeof(Length), (DWORD)v);
-@@ -1063,10 +1063,10 @@ unsigned psdParser::GetChannelOffset(FIB
- bool psdParser::ReadLayerAndMaskInfoSection(FreeImageIO *io, fi_handle
handle) {
- bool bSuccess = true;
-
-- UINT64 nTotalBytes = psdReadSize(io, handle, _headerInfo);
-+ uint64_t nTotalBytes = psdReadSize(io, handle, _headerInfo);
-
- // Hack to handle large PSB files without using fseeko().
-- if (sizeof(long) < sizeof(UINT64)) {
-+ if (sizeof(long) < sizeof(uint64_t)) {
- const long offset = 0x10000000;
- while (nTotalBytes > offset) {
- if (io->seek_proc(handle, offset, SEEK_CUR) != 0) {
-@@ -1672,7 +1672,7 @@ bool psdParser::WriteLayerAndMaskInfoSec
- // Short section with no layers.
- BYTE IntValue[4];
-
-- UINT64 size;
-+ uint64_t size;
- if(_headerInfo._Version == 1) {
- size = 8;
- } else {
Index: freeimage-3.18.0.1909/Source/FreeImage/ZLibInterface.cpp
===================================================================
--- freeimage-3.18.0.1909.orig/Source/FreeImage/ZLibInterface.cpp
@@ -451,75 +559,6 @@
crc = crc32(crc, source, source_size);
memcpy(target + 4 + dest_len, &crc, 4);
memcpy(target + 8 + dest_len, &source_size, 4);
-Index: freeimage-3.18.0.1909/Source/FreeImage.h
-===================================================================
---- freeimage-3.18.0.1909.orig/Source/FreeImage.h
-+++ freeimage-3.18.0.1909/Source/FreeImage.h
-@@ -155,8 +155,11 @@ typedef uint8_t BYTE;
- typedef uint16_t WORD;
- typedef uint32_t DWORD;
- typedef int32_t LONG;
-+// Disable these, they conflict with the (wrong) ones of libraw
-+#if 0
- typedef int64_t INT64;
- typedef uint64_t UINT64;
-+#endif
- #else
- // MS is not C99 ISO compliant
- typedef long BOOL;
-@@ -410,7 +413,12 @@ FI_ENUM(FREE_IMAGE_FORMAT) {
- FIF_DDS = 24,
- FIF_GIF = 25,
- FIF_HDR = 26,
-- FIF_FAXG3 = 27,
-+/* The G3 fax format plugin is deliberately disabled in the Fedora build of
-+ FreeImage as it requires that FreeImage uses a private copy of libtiff
-+ which is a no no because of security reasons. */
-+#if 0
-+ FIF_FAXG3 = 27,
-+#endif
- FIF_SGI = 28,
- FIF_EXR = 29,
- FIF_J2K = 30,
-@@ -473,6 +481,10 @@ FI_ENUM(FREE_IMAGE_DITHER) {
- FID_BAYER16x16 = 6 //! Bayer ordered dispersed dot
dithering (order 4 dithering matrix)
- };
-
-+/* The FreeImage_JPEGTransform functions are deliberately disabled in the
-+ Fedora build of FreeImage as they require that FreeImage uses a private
copy
-+ of libjpeg which is a no no because of security reasons. */
-+#if 0
- /** Lossless JPEG transformations
- Constants used in FreeImage_JPEGTransform
- */
-@@ -486,6 +498,7 @@ FI_ENUM(FREE_IMAGE_JPEG_OPERATION) {
- FIJPEG_OP_ROTATE_180 = 6, //! 180-degree rotation
- FIJPEG_OP_ROTATE_270 = 7 //! 270-degree clockwise (or 90
ccw)
- };
-+#endif
-
- /** Tone mapping operators.
- Constants used in FreeImage_ToneMapping.
-@@ -1088,7 +1101,10 @@ DLL_API const char* DLL_CALLCONV FreeIma
- // --------------------------------------------------------------------------
- // JPEG lossless transformation routines
- // --------------------------------------------------------------------------
--
-+/* The FreeImage_JPEGTransform functions are deliberately disabled in the
-++ Fedora build of FreeImage as they require that FreeImage uses a private
copy
-++ of libjpeg which is a no no because of security reasons. */
-+#if 0
- DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransform(const char *src_file, const
char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect
FI_DEFAULT(TRUE));
- DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformU(const wchar_t *src_file,
const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect
FI_DEFAULT(TRUE));
- DLL_API BOOL DLL_CALLCONV FreeImage_JPEGCrop(const char *src_file, const char
*dst_file, int left, int top, int right, int bottom);
-@@ -1097,6 +1113,7 @@ DLL_API BOOL DLL_CALLCONV FreeImage_JPEG
- DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombined(const char
*src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int*
left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
- DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedU(const wchar_t
*src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int*
left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
- DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedFromMemory(FIMEMORY*
src_stream, FIMEMORY* dst_stream, FREE_IMAGE_JPEG_OPERATION operation, int*
left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
-+#endif
-
-
- // --------------------------------------------------------------------------
Index: freeimage-3.18.0.1909/Source/FreeImageToolkit/JPEGTransform.cpp
===================================================================
--- freeimage-3.18.0.1909.orig/Source/FreeImageToolkit/JPEGTransform.cpp
@@ -574,4 +613,35 @@
DWORD ul[2];
} tmp, result;
tmp.sv = *arg;
+Index: freeimage-3.18.0.1909/genfipsrclist.sh
+===================================================================
+--- freeimage-3.18.0.1909.orig/genfipsrclist.sh
++++ freeimage-3.18.0.1909/genfipsrclist.sh
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+
+-DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG
Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR
Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf
Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/OpenEXR/IexMath
Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal
Source/LibRawLite/libraw Source/LibRawLite/src Source/LibWebP Source/LibJXR
Source/LibJXR/common/include Source/LibJXR/image/sys Source/LibJXR/jxrgluelib
Wrapper/FreeImagePlus"
++DIRLIST="Wrapper/FreeImagePlus"
+
+
+ echo "VER_MAJOR = 3" > fipMakefile.srcs
+@@ -19,5 +19,6 @@ echo -n "INCLUDE =" >> fipMakefile.srcs
+ for DIR in $DIRLIST; do
+ echo -n " -I$DIR" >> fipMakefile.srcs
+ done
++echo -n " -IDist" >> fipMakefile.srcs
+ echo >> fipMakefile.srcs
+
+Index: freeimage-3.18.0.1909/gensrclist.sh
+===================================================================
+--- freeimage-3.18.0.1909.orig/gensrclist.sh
++++ freeimage-3.18.0.1909/gensrclist.sh
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+
+-DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG
Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR
Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf
Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/OpenEXR/IexMath
Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal
Source/LibRawLite/libraw Source/LibRawLite/src Source/LibWebP Source/LibJXR
Source/LibJXR/common/include Source/LibJXR/image/sys Source/LibJXR/jxrgluelib"
++DIRLIST=". Source Source/Metadata Source/FreeImageToolkit"
+
+ echo "VER_MAJOR = 3" > Makefile.srcs
+ echo "VER_MINOR = 19.0" >> Makefile.srcs
