Compare commits
24 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
87cdefb362 | ||
|
4274ff2157 | ||
|
19f4527a7c | ||
|
66edb386c9 | ||
|
f72a4dd6a9 | ||
|
9250323d0d | ||
|
581525f4f2 | ||
|
11c1e1f46b | ||
|
91896c5baa | ||
|
90921b0d09 | ||
|
246677abcc | ||
|
7322eb5e74 | ||
|
381ce41302 | ||
|
cff9c9b392 | ||
|
ab704684da | ||
|
6aac817770 | ||
|
5e1a2f4b8c | ||
|
516a7af4d1 | ||
|
fc5ef5e01a | ||
|
931bdfd484 | ||
|
8bbc4193f5 | ||
|
1359abddf0 | ||
|
96323e74b5 | ||
|
aafc03fa2b |
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
FreeImage3100.zip
|
FreeImage3100.zip
|
||||||
|
/FreeImage3170.zip
|
||||||
|
@ -1,38 +0,0 @@
|
|||||||
diff -up FreeImage/Wrapper/FreeImagePlus/doc/FreeImagePlus.dox~ FreeImage/Wrapper/FreeImagePlus/doc/FreeImagePlus.dox
|
|
||||||
--- FreeImage/Wrapper/FreeImagePlus/doc/FreeImagePlus.dox~ 2008-03-18 14:39:25.000000000 +0100
|
|
||||||
+++ FreeImage/Wrapper/FreeImagePlus/doc/FreeImagePlus.dox 2008-03-18 14:39:25.000000000 +0100
|
|
||||||
@@ -5,7 +5,7 @@
|
|
||||||
#---------------------------------------------------------------------------
|
|
||||||
PROJECT_NAME = FreeImagePlus
|
|
||||||
PROJECT_NUMBER = "FreeImage 3.9.0"
|
|
||||||
-OUTPUT_DIRECTORY = C:/Projects/FreeImage/Wrapper/FreeImagePlus/
|
|
||||||
+OUTPUT_DIRECTORY = .
|
|
||||||
CREATE_SUBDIRS = NO
|
|
||||||
OUTPUT_LANGUAGE = English
|
|
||||||
USE_WINDOWS_ENCODING = YES
|
|
||||||
@@ -67,12 +67,11 @@ WARN_IF_UNDOCUMENTED = YES
|
|
||||||
WARN_IF_DOC_ERROR = YES
|
|
||||||
WARN_NO_PARAMDOC = NO
|
|
||||||
WARN_FORMAT = "$file:$line: $text"
|
|
||||||
-WARN_LOGFILE = C:\Projects\FreeImage\Wrapper\FreeImagePlus\doc\doxygen.log
|
|
||||||
+WARN_LOGFILE = ./doxygen.log
|
|
||||||
#---------------------------------------------------------------------------
|
|
||||||
# configuration options related to the input files
|
|
||||||
#---------------------------------------------------------------------------
|
|
||||||
-INPUT = C:/Projects/FreeImage/Source/FreeImage.h \
|
|
||||||
- C:/Projects/FreeImage/Wrapper/FreeImagePlus/FreeImagePlus.h
|
|
||||||
+INPUT = ../../../Source/FreeImage.h ../FreeImagePlus.h
|
|
||||||
FILE_PATTERNS = *.h
|
|
||||||
RECURSIVE = YES
|
|
||||||
EXCLUDE =
|
|
||||||
@@ -106,8 +105,8 @@ IGNORE_PREFIX =
|
|
||||||
GENERATE_HTML = YES
|
|
||||||
HTML_OUTPUT = html
|
|
||||||
HTML_FILE_EXTENSION = .html
|
|
||||||
-HTML_HEADER = C:/Projects/FreeImage/Wrapper/FreeImagePlus/doc/header.html
|
|
||||||
-HTML_FOOTER = C:/Projects/FreeImage/Wrapper/FreeImagePlus/doc/footer.html
|
|
||||||
+HTML_HEADER = ./header.html
|
|
||||||
+HTML_FOOTER = ./footer.html
|
|
||||||
HTML_STYLESHEET =
|
|
||||||
HTML_ALIGN_MEMBERS = YES
|
|
||||||
GENERATE_HTMLHELP = YES
|
|
@ -1,35 +0,0 @@
|
|||||||
--- Source/FreeImage/PluginPNG.cpp.orig 2012-02-13 20:40:18.980814932 -0600
|
|
||||||
+++ Source/FreeImage/PluginPNG.cpp 2012-02-13 21:20:54.917409944 -0600
|
|
||||||
@@ -322,7 +322,8 @@
|
|
||||||
|
|
||||||
png_read_info(png_ptr, info_ptr);
|
|
||||||
png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, NULL, NULL, NULL);
|
|
||||||
- pixel_depth = info_ptr->pixel_depth;
|
|
||||||
+ pixel_depth = png_get_bit_depth(png_ptr, info_ptr) *
|
|
||||||
+ png_get_channels(png_ptr, info_ptr);
|
|
||||||
|
|
||||||
// get image data type (assume standard image type)
|
|
||||||
|
|
||||||
@@ -534,11 +535,11 @@
|
|
||||||
|
|
||||||
if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP)) {
|
|
||||||
png_charp profile_name = NULL;
|
|
||||||
- png_charp profile_data = NULL;
|
|
||||||
+ png_bytepp profile_data = NULL;
|
|
||||||
png_uint_32 profile_length = 0;
|
|
||||||
int compression_type;
|
|
||||||
|
|
||||||
- png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &profile_data, &profile_length);
|
|
||||||
+ png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, profile_data, &profile_length);
|
|
||||||
|
|
||||||
// copy ICC profile data (must be done after FreeImage_Allocate)
|
|
||||||
|
|
||||||
@@ -771,7 +772,7 @@
|
|
||||||
|
|
||||||
FIICCPROFILE *iccProfile = FreeImage_GetICCProfile(dib);
|
|
||||||
if (iccProfile->size && iccProfile->data) {
|
|
||||||
- png_set_iCCP(png_ptr, info_ptr, "Embedded Profile", 0, (png_charp)iccProfile->data, iccProfile->size);
|
|
||||||
+ png_set_iCCP(png_ptr, info_ptr, "Embedded Profile", 0, (png_const_bytep)iccProfile->data, iccProfile->size);
|
|
||||||
}
|
|
||||||
|
|
||||||
// write metadata
|
|
@ -1,160 +0,0 @@
|
|||||||
This patch depends on functions that will appear in upstream libtiff in
|
|
||||||
4.0.3. In Fedora, it will only build against libtiff 4.0.2-5 or later.
|
|
||||||
|
|
||||||
|
|
||||||
diff -Naur FreeImage-3.10.0-syslibs/Source/Metadata/XTIFF.cpp FreeImage-3.10.0/Source/Metadata/XTIFF.cpp
|
|
||||||
--- FreeImage-3.10.0-syslibs/Source/Metadata/XTIFF.cpp 2012-07-29 14:15:00.057023161 -0400
|
|
||||||
+++ FreeImage-3.10.0/Source/Metadata/XTIFF.cpp 2012-07-29 14:21:35.278415039 -0400
|
|
||||||
@@ -214,7 +214,7 @@
|
|
||||||
count = (short) TIFFGetTagListCount(tif);
|
|
||||||
for(i = 0; i < count; i++) {
|
|
||||||
ttag_t tag = TIFFGetTagListEntry(tif, i);
|
|
||||||
- const TIFFFieldInfo *fip;
|
|
||||||
+ const TIFFField *fip;
|
|
||||||
uint32 value_count;
|
|
||||||
int mem_alloc = 0;
|
|
||||||
void *raw_data;
|
|
||||||
@@ -229,29 +229,30 @@
|
|
||||||
if(fip == NULL)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
- if(fip->field_passcount) {
|
|
||||||
+ if(TIFFFieldPassCount(fip)) {
|
|
||||||
if(TIFFGetField(tif, tag, &value_count, &raw_data) != 1)
|
|
||||||
continue;
|
|
||||||
} else {
|
|
||||||
- if (fip->field_readcount == TIFF_VARIABLE || fip->field_readcount == TIFF_VARIABLE2)
|
|
||||||
+ if (TIFFFieldReadCount(fip) == TIFF_VARIABLE ||
|
|
||||||
+ TIFFFieldReadCount(fip) == TIFF_VARIABLE2)
|
|
||||||
value_count = 1;
|
|
||||||
- else if (fip->field_readcount == TIFF_SPP) {
|
|
||||||
+ else if (TIFFFieldReadCount(fip) == TIFF_SPP) {
|
|
||||||
uint16 spp;
|
|
||||||
TIFFGetFieldDefaulted(tif,
|
|
||||||
TIFFTAG_SAMPLESPERPIXEL, &spp);
|
|
||||||
value_count = spp;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
- value_count = fip->field_readcount;
|
|
||||||
- if (fip->field_type == TIFF_ASCII
|
|
||||||
- || fip->field_readcount == TIFF_VARIABLE
|
|
||||||
- || fip->field_readcount == TIFF_VARIABLE2
|
|
||||||
- || fip->field_readcount == TIFF_SPP
|
|
||||||
+ value_count = TIFFFieldReadCount(fip);
|
|
||||||
+ if (TIFFFieldDataType(fip) == TIFF_ASCII
|
|
||||||
+ || TIFFFieldReadCount(fip) == TIFF_VARIABLE
|
|
||||||
+ || TIFFFieldReadCount(fip) == TIFF_VARIABLE2
|
|
||||||
+ || TIFFFieldReadCount(fip) == TIFF_SPP
|
|
||||||
|| value_count > 1) {
|
|
||||||
if(TIFFGetField(tif, tag, &raw_data) != 1)
|
|
||||||
continue;
|
|
||||||
} else {
|
|
||||||
- raw_data = _TIFFmalloc(_TIFFDataSize(fip->field_type) * value_count);
|
|
||||||
+ raw_data = _TIFFmalloc(_TIFFDataSize(TIFFFieldDataType(fip)) * value_count);
|
|
||||||
mem_alloc = 1;
|
|
||||||
if(TIFFGetField(tif, tag, raw_data) != 1) {
|
|
||||||
_TIFFfree(raw_data);
|
|
||||||
@@ -271,59 +272,59 @@
|
|
||||||
FreeImage_SetTagID(fitag, (WORD)tag);
|
|
||||||
FreeImage_SetTagKey(fitag, key);
|
|
||||||
|
|
||||||
- switch(fip->field_type) {
|
|
||||||
+ switch(TIFFFieldDataType(fip)) {
|
|
||||||
case TIFF_BYTE:
|
|
||||||
FreeImage_SetTagType(fitag, FIDT_BYTE);
|
|
||||||
- FreeImage_SetTagLength(fitag, TIFFDataWidth(fip->field_type) * value_count);
|
|
||||||
+ FreeImage_SetTagLength(fitag, TIFFDataWidth(TIFFFieldDataType(fip)) * value_count);
|
|
||||||
FreeImage_SetTagCount(fitag, value_count);
|
|
||||||
FreeImage_SetTagValue(fitag, raw_data);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case TIFF_UNDEFINED:
|
|
||||||
FreeImage_SetTagType(fitag, FIDT_UNDEFINED);
|
|
||||||
- FreeImage_SetTagLength(fitag, TIFFDataWidth(fip->field_type) * value_count);
|
|
||||||
+ FreeImage_SetTagLength(fitag, TIFFDataWidth(TIFFFieldDataType(fip)) * value_count);
|
|
||||||
FreeImage_SetTagCount(fitag, value_count);
|
|
||||||
FreeImage_SetTagValue(fitag, raw_data);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case TIFF_SBYTE:
|
|
||||||
FreeImage_SetTagType(fitag, FIDT_SBYTE);
|
|
||||||
- FreeImage_SetTagLength(fitag, TIFFDataWidth(fip->field_type) * value_count);
|
|
||||||
+ FreeImage_SetTagLength(fitag, TIFFDataWidth(TIFFFieldDataType(fip)) * value_count);
|
|
||||||
FreeImage_SetTagCount(fitag, value_count);
|
|
||||||
FreeImage_SetTagValue(fitag, raw_data);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case TIFF_SHORT:
|
|
||||||
FreeImage_SetTagType(fitag, FIDT_SHORT);
|
|
||||||
- FreeImage_SetTagLength(fitag, TIFFDataWidth(fip->field_type) * value_count);
|
|
||||||
+ FreeImage_SetTagLength(fitag, TIFFDataWidth(TIFFFieldDataType(fip)) * value_count);
|
|
||||||
FreeImage_SetTagCount(fitag, value_count);
|
|
||||||
FreeImage_SetTagValue(fitag, raw_data);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case TIFF_SSHORT:
|
|
||||||
FreeImage_SetTagType(fitag, FIDT_SSHORT);
|
|
||||||
- FreeImage_SetTagLength(fitag, TIFFDataWidth(fip->field_type) * value_count);
|
|
||||||
+ FreeImage_SetTagLength(fitag, TIFFDataWidth(TIFFFieldDataType(fip)) * value_count);
|
|
||||||
FreeImage_SetTagCount(fitag, value_count);
|
|
||||||
FreeImage_SetTagValue(fitag, raw_data);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case TIFF_LONG:
|
|
||||||
FreeImage_SetTagType(fitag, FIDT_LONG);
|
|
||||||
- FreeImage_SetTagLength(fitag, TIFFDataWidth(fip->field_type) * value_count);
|
|
||||||
+ FreeImage_SetTagLength(fitag, TIFFDataWidth(TIFFFieldDataType(fip)) * value_count);
|
|
||||||
FreeImage_SetTagCount(fitag, value_count);
|
|
||||||
FreeImage_SetTagValue(fitag, raw_data);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case TIFF_IFD:
|
|
||||||
FreeImage_SetTagType(fitag, FIDT_IFD);
|
|
||||||
- FreeImage_SetTagLength(fitag, TIFFDataWidth(fip->field_type) * value_count);
|
|
||||||
+ FreeImage_SetTagLength(fitag, TIFFDataWidth(TIFFFieldDataType(fip)) * value_count);
|
|
||||||
FreeImage_SetTagCount(fitag, value_count);
|
|
||||||
FreeImage_SetTagValue(fitag, raw_data);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case TIFF_SLONG:
|
|
||||||
FreeImage_SetTagType(fitag, FIDT_SLONG);
|
|
||||||
- FreeImage_SetTagLength(fitag, TIFFDataWidth(fip->field_type) * value_count);
|
|
||||||
+ FreeImage_SetTagLength(fitag, TIFFDataWidth(TIFFFieldDataType(fip)) * value_count);
|
|
||||||
FreeImage_SetTagCount(fitag, value_count);
|
|
||||||
FreeImage_SetTagValue(fitag, raw_data);
|
|
||||||
break;
|
|
||||||
@@ -339,7 +340,7 @@
|
|
||||||
rvalue[2*i+1] = rational.getDenominator();
|
|
||||||
}
|
|
||||||
FreeImage_SetTagType(fitag, FIDT_RATIONAL);
|
|
||||||
- FreeImage_SetTagLength(fitag, TIFFDataWidth(fip->field_type) * value_count);
|
|
||||||
+ FreeImage_SetTagLength(fitag, TIFFDataWidth(TIFFFieldDataType(fip)) * value_count);
|
|
||||||
FreeImage_SetTagCount(fitag, value_count);
|
|
||||||
FreeImage_SetTagValue(fitag, rvalue);
|
|
||||||
free(rvalue);
|
|
||||||
@@ -357,7 +358,7 @@
|
|
||||||
rvalue[2*i+1] = rational.getDenominator();
|
|
||||||
}
|
|
||||||
FreeImage_SetTagType(fitag, FIDT_RATIONAL);
|
|
||||||
- FreeImage_SetTagLength(fitag, TIFFDataWidth(fip->field_type) * value_count);
|
|
||||||
+ FreeImage_SetTagLength(fitag, TIFFDataWidth(TIFFFieldDataType(fip)) * value_count);
|
|
||||||
FreeImage_SetTagCount(fitag, value_count);
|
|
||||||
FreeImage_SetTagValue(fitag, rvalue);
|
|
||||||
free(rvalue);
|
|
||||||
@@ -366,14 +367,14 @@
|
|
||||||
|
|
||||||
case TIFF_FLOAT:
|
|
||||||
FreeImage_SetTagType(fitag, FIDT_FLOAT);
|
|
||||||
- FreeImage_SetTagLength(fitag, TIFFDataWidth(fip->field_type) * value_count);
|
|
||||||
+ FreeImage_SetTagLength(fitag, TIFFDataWidth(TIFFFieldDataType(fip)) * value_count);
|
|
||||||
FreeImage_SetTagCount(fitag, value_count);
|
|
||||||
FreeImage_SetTagValue(fitag, raw_data);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case TIFF_DOUBLE:
|
|
||||||
FreeImage_SetTagType(fitag, FIDT_DOUBLE);
|
|
||||||
- FreeImage_SetTagLength(fitag, TIFFDataWidth(fip->field_type) * value_count);
|
|
||||||
+ FreeImage_SetTagLength(fitag, TIFFDataWidth(TIFFFieldDataType(fip)) * value_count);
|
|
||||||
FreeImage_SetTagCount(fitag, value_count);
|
|
||||||
FreeImage_SetTagValue(fitag, raw_data);
|
|
||||||
break;
|
|
@ -1,505 +0,0 @@
|
|||||||
--- FreeImage/FreeImage.2003.vcproj 2007-11-15 20:08:30.000000000 +0100
|
|
||||||
+++ FreeImage.new/FreeImage.2003.vcproj 2008-03-18 13:19:41.000000000 +0100
|
|
||||||
@@ -206,9 +206,6 @@
|
|
||||||
RelativePath=".\Source\FreeImage\PluginEXR.cpp">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
- RelativePath="Source\FreeImage\PluginG3.cpp">
|
|
||||||
- </File>
|
|
||||||
- <File
|
|
||||||
RelativePath="Source\FreeImage\PluginGIF.cpp">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
@@ -442,9 +439,6 @@
|
|
||||||
RelativePath="Source\FreeImageToolkit\Flip.cpp">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
- RelativePath="Source\FreeImageToolkit\JPEGTransform.cpp">
|
|
||||||
- </File>
|
|
||||||
- <File
|
|
||||||
RelativePath=".\Source\FreeImageToolkit\MultigridPoissonSolver.cpp">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
--- FreeImage/Makefile.gnu 2007-08-25 18:44:24.000000000 +0200
|
|
||||||
+++ FreeImage.new/Makefile.gnu 2008-03-18 13:21:55.000000000 +0100
|
|
||||||
@@ -14,8 +14,8 @@
|
|
||||||
# Converts cr/lf to just lf
|
|
||||||
DOS2UNIX = dos2unix
|
|
||||||
|
|
||||||
-COMPILERFLAGS = -O3 -fPIC -fexceptions -fvisibility=hidden
|
|
||||||
-LIBRARIES = -lstdc++
|
|
||||||
+COMPILERFLAGS = -O3 -fPIC -fexceptions -fvisibility=hidden `pkgconfig --cflags libopenjpeg` -I/usr/include/OpenEXR
|
|
||||||
+LIBRARIES = -lstdc++ -lz -lmng -lpng -ltiff -ljpeg `pkg-config --libs libopenjpeg` `pkg-config --libs OpenEXR`
|
|
||||||
|
|
||||||
MODULES = $(SRCS:.c=.o)
|
|
||||||
MODULES := $(MODULES:.cpp=.o)
|
|
||||||
--- FreeImage/Source/FreeImage/J2KHelper.cpp 2007-05-08 20:04:18.000000000 +0200
|
|
||||||
+++ FreeImage.new/Source/FreeImage/J2KHelper.cpp 2008-03-13 22:06:02.000000000 +0100
|
|
||||||
@@ -21,7 +21,7 @@
|
|
||||||
|
|
||||||
#include "FreeImage.h"
|
|
||||||
#include "Utilities.h"
|
|
||||||
-#include "../LibOpenJPEG/openjpeg.h"
|
|
||||||
+#include <openjpeg.h>
|
|
||||||
|
|
||||||
/**
|
|
||||||
Divide an integer by a power of 2 and round upwards
|
|
||||||
--- FreeImage/Source/FreeImage/Plugin.cpp 2007-05-08 20:04:18.000000000 +0200
|
|
||||||
+++ FreeImage.new/Source/FreeImage/Plugin.cpp 2008-03-18 13:24:16.000000000 +0100
|
|
||||||
@@ -248,7 +248,12 @@
|
|
||||||
s_plugins->AddNode(InitDDS);
|
|
||||||
s_plugins->AddNode(InitGIF);
|
|
||||||
s_plugins->AddNode(InitHDR);
|
|
||||||
+/* 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
|
|
||||||
s_plugins->AddNode(InitG3);
|
|
||||||
+#endif
|
|
||||||
s_plugins->AddNode(InitSGI);
|
|
||||||
s_plugins->AddNode(InitEXR);
|
|
||||||
s_plugins->AddNode(InitJ2K);
|
|
||||||
--- FreeImage/Source/FreeImage/PluginBMP.cpp 2007-10-21 16:50:08.000000000 +0200
|
|
||||||
+++ FreeImage.new/Source/FreeImage/PluginBMP.cpp 2008-03-12 23:14:51.000000000 +0100
|
|
||||||
@@ -189,6 +189,8 @@
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
+#define MIN(a, b) ( ((a) < (b))? (a):(b) )
|
|
||||||
+
|
|
||||||
/**
|
|
||||||
Load image pixels for 4-bit RLE compressed dib
|
|
||||||
@param io FreeImage IO
|
|
||||||
--- FreeImage/Source/FreeImage/PluginEXR.cpp 2007-05-08 20:04:18.000000000 +0200
|
|
||||||
+++ FreeImage.new/Source/FreeImage/PluginEXR.cpp 2008-03-13 20:36:07.000000000 +0100
|
|
||||||
@@ -21,15 +21,15 @@
|
|
||||||
|
|
||||||
#include "FreeImage.h"
|
|
||||||
#include "Utilities.h"
|
|
||||||
-#include "../OpenEXR/IlmImf/ImfIO.h"
|
|
||||||
-#include "../OpenEXR/Iex/Iex.h"
|
|
||||||
-#include "../OpenEXR/IlmImf/ImfOutputFile.h"
|
|
||||||
-#include "../OpenEXR/IlmImf/ImfInputFile.h"
|
|
||||||
-#include "../OpenEXR/IlmImf/ImfRgbaFile.h"
|
|
||||||
-#include "../OpenEXR/IlmImf/ImfChannelList.h"
|
|
||||||
-#include "../OpenEXR/IlmImf/ImfRgba.h"
|
|
||||||
-#include "../OpenEXR/IlmImf/ImfArray.h"
|
|
||||||
-#include "../OpenEXR/Half/half.h"
|
|
||||||
+#include <ImfIO.h>
|
|
||||||
+#include <Iex.h>
|
|
||||||
+#include <ImfOutputFile.h>
|
|
||||||
+#include <ImfInputFile.h>
|
|
||||||
+#include <ImfRgbaFile.h>
|
|
||||||
+#include <ImfChannelList.h>
|
|
||||||
+#include <ImfRgba.h>
|
|
||||||
+#include <ImfArray.h>
|
|
||||||
+#include <half.h>
|
|
||||||
|
|
||||||
|
|
||||||
// ==========================================================
|
|
||||||
--- FreeImage/Source/FreeImage/PluginJ2K.cpp 2007-05-08 20:04:18.000000000 +0200
|
|
||||||
+++ FreeImage.new/Source/FreeImage/PluginJ2K.cpp 2008-03-13 22:06:36.000000000 +0100
|
|
||||||
@@ -21,7 +21,7 @@
|
|
||||||
|
|
||||||
#include "FreeImage.h"
|
|
||||||
#include "Utilities.h"
|
|
||||||
-#include "../LibOpenJPEG/openjpeg.h"
|
|
||||||
+#include <openjpeg.h>
|
|
||||||
|
|
||||||
// ==========================================================
|
|
||||||
// Plugin Interface
|
|
||||||
--- FreeImage/Source/FreeImage/PluginJP2.cpp 2007-05-08 20:04:18.000000000 +0200
|
|
||||||
+++ FreeImage.new/Source/FreeImage/PluginJP2.cpp 2008-03-13 22:07:03.000000000 +0100
|
|
||||||
@@ -21,7 +21,7 @@
|
|
||||||
|
|
||||||
#include "FreeImage.h"
|
|
||||||
#include "Utilities.h"
|
|
||||||
-#include "../LibOpenJPEG/openjpeg.h"
|
|
||||||
+#include <openjpeg.h>
|
|
||||||
|
|
||||||
// ==========================================================
|
|
||||||
// Plugin Interface
|
|
||||||
--- FreeImage/Source/FreeImage/PluginJPEG.cpp 2007-08-11 01:57:28.000000000 +0200
|
|
||||||
+++ FreeImage.new/Source/FreeImage/PluginJPEG.cpp 2008-03-13 21:58:24.000000000 +0100
|
|
||||||
@@ -34,9 +34,9 @@
|
|
||||||
#undef FAR
|
|
||||||
#include <setjmp.h>
|
|
||||||
|
|
||||||
-#include "../LibJPEG/jinclude.h"
|
|
||||||
-#include "../LibJPEG/jpeglib.h"
|
|
||||||
-#include "../LibJPEG/jerror.h"
|
|
||||||
+#include <stdio.h>
|
|
||||||
+#include <jpeglib.h>
|
|
||||||
+#include <jerror.h>
|
|
||||||
}
|
|
||||||
|
|
||||||
#include "FreeImage.h"
|
|
||||||
@@ -158,7 +158,7 @@
|
|
||||||
|
|
||||||
dest->buffer = (JOCTET *)
|
|
||||||
(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
|
|
||||||
- OUTPUT_BUF_SIZE * SIZEOF(JOCTET));
|
|
||||||
+ OUTPUT_BUF_SIZE * sizeof(JOCTET));
|
|
||||||
|
|
||||||
dest->pub.next_output_byte = dest->buffer;
|
|
||||||
dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
|
|
||||||
@@ -333,12 +333,12 @@
|
|
||||||
|
|
||||||
if (cinfo->src == NULL) {
|
|
||||||
cinfo->src = (struct jpeg_source_mgr *) (*cinfo->mem->alloc_small)
|
|
||||||
- ((j_common_ptr) cinfo, JPOOL_PERMANENT, SIZEOF(SourceManager));
|
|
||||||
+ ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(SourceManager));
|
|
||||||
|
|
||||||
src = (freeimage_src_ptr) cinfo->src;
|
|
||||||
|
|
||||||
src->buffer = (JOCTET *) (*cinfo->mem->alloc_small)
|
|
||||||
- ((j_common_ptr) cinfo, JPOOL_PERMANENT, INPUT_BUF_SIZE * SIZEOF(JOCTET));
|
|
||||||
+ ((j_common_ptr) cinfo, JPOOL_PERMANENT, INPUT_BUF_SIZE * sizeof(JOCTET));
|
|
||||||
}
|
|
||||||
|
|
||||||
// initialize the jpeg pointer struct with pointers to functions
|
|
||||||
@@ -366,7 +366,7 @@
|
|
||||||
|
|
||||||
if (cinfo->dest == NULL) {
|
|
||||||
cinfo->dest = (struct jpeg_destination_mgr *)(*cinfo->mem->alloc_small)
|
|
||||||
- ((j_common_ptr) cinfo, JPOOL_PERMANENT, SIZEOF(DestinationManager));
|
|
||||||
+ ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(DestinationManager));
|
|
||||||
}
|
|
||||||
|
|
||||||
dest = (freeimage_dst_ptr) cinfo->dest;
|
|
||||||
--- FreeImage/Source/FreeImage/PluginMNG.cpp 2007-08-11 01:57:28.000000000 +0200
|
|
||||||
+++ FreeImage.new/Source/FreeImage/PluginMNG.cpp 2008-03-13 20:16:48.000000000 +0100
|
|
||||||
@@ -22,7 +22,7 @@
|
|
||||||
#include "FreeImage.h"
|
|
||||||
#include "Utilities.h"
|
|
||||||
|
|
||||||
-#include "../LibMNG/libmng.h"
|
|
||||||
+#include <libmng.h>
|
|
||||||
|
|
||||||
// ----------------------------------------------------------
|
|
||||||
// Constants + headers
|
|
||||||
--- FreeImage/Source/FreeImage/PluginPNG.cpp 2007-08-11 01:57:28.000000000 +0200
|
|
||||||
+++ FreeImage.new/Source/FreeImage/PluginPNG.cpp 2008-03-13 20:29:31.000000000 +0100
|
|
||||||
@@ -37,7 +37,7 @@
|
|
||||||
|
|
||||||
// ----------------------------------------------------------
|
|
||||||
|
|
||||||
-#include "../LibPNG/png.h"
|
|
||||||
+#include <png.h>
|
|
||||||
|
|
||||||
// ----------------------------------------------------------
|
|
||||||
|
|
||||||
@@ -101,8 +101,11 @@
|
|
||||||
tag = FreeImage_CreateTag();
|
|
||||||
if(!tag) return FALSE;
|
|
||||||
|
|
||||||
+#ifdef PNG_iTXt_SUPPORTED
|
|
||||||
DWORD tag_length = MAX(text_ptr[i].text_length, text_ptr[i].itxt_length);
|
|
||||||
-
|
|
||||||
+#else
|
|
||||||
+ DWORD tag_length = text_ptr[i].text_length;
|
|
||||||
+#endif
|
|
||||||
FreeImage_SetTagLength(tag, tag_length);
|
|
||||||
FreeImage_SetTagCount(tag, tag_length);
|
|
||||||
FreeImage_SetTagType(tag, FIDT_ASCII);
|
|
||||||
@@ -148,10 +151,11 @@
|
|
||||||
text_metadata.key = (char*)FreeImage_GetTagKey(tag); // keyword, 1-79 character description of "text"
|
|
||||||
text_metadata.text = (char*)FreeImage_GetTagValue(tag); // comment, may be an empty string (ie "")
|
|
||||||
text_metadata.text_length = FreeImage_GetTagLength(tag);// length of the text string
|
|
||||||
+#ifdef PNG_iTXt_SUPPORTED
|
|
||||||
text_metadata.itxt_length = FreeImage_GetTagLength(tag);// length of the itxt string
|
|
||||||
text_metadata.lang = 0; // language code, 0-79 characters or a NULL pointer
|
|
||||||
text_metadata.lang_key = 0; // keyword translated UTF-8 string, 0 or more chars or a NULL pointer
|
|
||||||
-
|
|
||||||
+#endif
|
|
||||||
// set the tag
|
|
||||||
png_set_text(png_ptr, info_ptr, &text_metadata, 1);
|
|
||||||
|
|
||||||
@@ -170,10 +174,11 @@
|
|
||||||
text_metadata.key = g_png_xmp_keyword; // keyword, 1-79 character description of "text"
|
|
||||||
text_metadata.text = (char*)FreeImage_GetTagValue(tag); // comment, may be an empty string (ie "")
|
|
||||||
text_metadata.text_length = FreeImage_GetTagLength(tag);// length of the text string
|
|
||||||
+#ifdef PNG_iTXt_SUPPORTED
|
|
||||||
text_metadata.itxt_length = FreeImage_GetTagLength(tag);// length of the itxt string
|
|
||||||
text_metadata.lang = 0; // language code, 0-79 characters or a NULL pointer
|
|
||||||
text_metadata.lang_key = 0; // keyword translated UTF-8 string, 0 or more chars or a NULL pointer
|
|
||||||
-
|
|
||||||
+#endif
|
|
||||||
// set the tag
|
|
||||||
png_set_text(png_ptr, info_ptr, &text_metadata, 1);
|
|
||||||
bResult &= TRUE;
|
|
||||||
--- FreeImage/Source/FreeImage/PluginTIFF.cpp 2007-08-15 04:01:02.000000000 +0200
|
|
||||||
+++ FreeImage.new/Source/FreeImage/PluginTIFF.cpp 2008-03-13 19:16:25.000000000 +0100
|
|
||||||
@@ -34,7 +34,7 @@
|
|
||||||
#undef __unix
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#include "../LibTIFF/tiffiop.h"
|
|
||||||
+#include <tiffio.h>
|
|
||||||
|
|
||||||
#include "FreeImage.h"
|
|
||||||
#include "Utilities.h"
|
|
||||||
@@ -172,8 +172,7 @@
|
|
||||||
// Open a TIFF file descriptor for read/writing.
|
|
||||||
// ----------------------------------------------------------
|
|
||||||
|
|
||||||
-TIFF *
|
|
||||||
-TIFFFdOpen(thandle_t handle, const char *name, const char *mode) {
|
|
||||||
+static TIFF *FdOpen(thandle_t handle, const char *name, const char *mode) {
|
|
||||||
TIFF *tif;
|
|
||||||
|
|
||||||
// Set up the callback for extended TIFF directory tag support
|
|
||||||
@@ -185,85 +184,10 @@
|
|
||||||
_tiffReadProc, _tiffWriteProc, _tiffSeekProc, _tiffCloseProc,
|
|
||||||
_tiffSizeProc, _tiffMapProc, _tiffUnmapProc);
|
|
||||||
|
|
||||||
- // Warning: tif_fd is declared as 'int' currently (see libTIFF),
|
|
||||||
- // may result in incorrect file pointers inside libTIFF on
|
|
||||||
- // 64bit machines (sizeof(int) != sizeof(long)).
|
|
||||||
- // Needs to be fixed within libTIFF.
|
|
||||||
- if (tif)
|
|
||||||
- tif->tif_fd = (long)handle;
|
|
||||||
-
|
|
||||||
return tif;
|
|
||||||
}
|
|
||||||
|
|
||||||
// ----------------------------------------------------------
|
|
||||||
-// Open a TIFF file for read/writing.
|
|
||||||
-// ----------------------------------------------------------
|
|
||||||
-
|
|
||||||
-TIFF*
|
|
||||||
-TIFFOpen(const char* name, const char* mode) {
|
|
||||||
- return 0;
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-// ----------------------------------------------------------
|
|
||||||
-// TIFF library FreeImage-specific routines.
|
|
||||||
-// ----------------------------------------------------------
|
|
||||||
-
|
|
||||||
-tdata_t
|
|
||||||
-_TIFFmalloc(tsize_t s) {
|
|
||||||
- return malloc(s);
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-void
|
|
||||||
-_TIFFfree(tdata_t p) {
|
|
||||||
- free(p);
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-tdata_t
|
|
||||||
-_TIFFrealloc(tdata_t p, tsize_t s) {
|
|
||||||
- return realloc(p, s);
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-void
|
|
||||||
-_TIFFmemset(tdata_t p, int v, tsize_t c) {
|
|
||||||
- memset(p, v, (size_t) c);
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-void
|
|
||||||
-_TIFFmemcpy(tdata_t d, const tdata_t s, tsize_t c) {
|
|
||||||
- memcpy(d, s, (size_t) c);
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-int
|
|
||||||
-_TIFFmemcmp(const tdata_t p1, const tdata_t p2, tsize_t c) {
|
|
||||||
- return (memcmp(p1, p2, (size_t) c));
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-// ----------------------------------------------------------
|
|
||||||
-// in FreeImage warnings and errors are disabled
|
|
||||||
-// ----------------------------------------------------------
|
|
||||||
-
|
|
||||||
-static void
|
|
||||||
-msdosWarningHandler(const char* module, const char* fmt, va_list ap) {
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-TIFFErrorHandler _TIFFwarningHandler = msdosWarningHandler;
|
|
||||||
-
|
|
||||||
-static void
|
|
||||||
-msdosErrorHandler(const char* module, const char* fmt, va_list ap) {
|
|
||||||
-
|
|
||||||
- // use this for diagnostic only (do not use otherwise, even in DEBUG mode)
|
|
||||||
- /*
|
|
||||||
- if (module != NULL) {
|
|
||||||
- char msg[1024];
|
|
||||||
- vsprintf(msg, fmt, ap);
|
|
||||||
- FreeImage_OutputMessageProc(s_format_id, "%s: %s", module, msg);
|
|
||||||
- }
|
|
||||||
- */
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-TIFFErrorHandler _TIFFerrorHandler = msdosErrorHandler;
|
|
||||||
-
|
|
||||||
-// ----------------------------------------------------------
|
|
||||||
|
|
||||||
#define CVT(x) (((x) * 255L) / ((1L<<16)-1))
|
|
||||||
#define SCALE(x) (((x)*((1L<<16)-1))/255)
|
|
||||||
@@ -988,9 +912,9 @@
|
|
||||||
fio->handle = handle;
|
|
||||||
|
|
||||||
if (read) {
|
|
||||||
- fio->tif = TIFFFdOpen((thandle_t)fio, "", "r");
|
|
||||||
+ fio->tif = FdOpen((thandle_t)fio, "", "r");
|
|
||||||
} else {
|
|
||||||
- fio->tif = TIFFFdOpen((thandle_t)fio, "", "w");
|
|
||||||
+ fio->tif = FdOpen((thandle_t)fio, "", "w");
|
|
||||||
}
|
|
||||||
if(fio->tif == NULL) {
|
|
||||||
free(fio);
|
|
||||||
--- FreeImage/Source/FreeImage/ZLibInterface.cpp 2007-11-14 16:01:44.000000000 +0100
|
|
||||||
+++ FreeImage.new/Source/FreeImage/ZLibInterface.cpp 2008-03-13 20:23:00.000000000 +0100
|
|
||||||
@@ -19,10 +19,9 @@
|
|
||||||
// Use at your own risk!
|
|
||||||
// ==========================================================
|
|
||||||
|
|
||||||
-#include "../ZLib/zlib.h"
|
|
||||||
+#include <zlib.h>
|
|
||||||
#include "FreeImage.h"
|
|
||||||
#include "Utilities.h"
|
|
||||||
-#include "../ZLib/zutil.h" /* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */
|
|
||||||
|
|
||||||
/**
|
|
||||||
Compresses a source buffer into a target buffer, using the ZLib library.
|
|
||||||
@@ -115,7 +114,7 @@
|
|
||||||
return 0;
|
|
||||||
case Z_OK: {
|
|
||||||
// patch header, setup crc and length (stolen from mod_trace_output)
|
|
||||||
- BYTE *p = target + 8; *p++ = 2; *p = OS_CODE; // xflags, os_code
|
|
||||||
+ BYTE *p = target + 8; *p++ = 2; *p = 0x03; // xflags, os_code (unix)
|
|
||||||
crc = crc32(crc, source, source_size);
|
|
||||||
memcpy(target + 4 + dest_len, &crc, 4);
|
|
||||||
memcpy(target + 8 + dest_len, &source_size, 4);
|
|
||||||
--- FreeImage/Source/FreeImage.h 2007-11-12 16:10:00.000000000 +0100
|
|
||||||
+++ FreeImage.new/Source/FreeImage.h 2008-03-18 13:24:14.000000000 +0100
|
|
||||||
@@ -406,7 +406,12 @@
|
|
||||||
FIF_DDS = 24,
|
|
||||||
FIF_GIF = 25,
|
|
||||||
FIF_HDR = 26,
|
|
||||||
+/* 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,
|
|
||||||
@@ -463,6 +468,11 @@
|
|
||||||
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
|
|
||||||
*/
|
|
||||||
@@ -477,6 +487,8 @@
|
|
||||||
FIJPEG_OP_ROTATE_270 = 7 // 270-degree clockwise (or 90 ccw)
|
|
||||||
};
|
|
||||||
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
/** Tone mapping operators.
|
|
||||||
Constants used in FreeImage_ToneMapping.
|
|
||||||
*/
|
|
||||||
@@ -998,7 +1010,12 @@
|
|
||||||
DLL_API FIBITMAP *DLL_CALLCONV FreeImage_RotateEx(FIBITMAP *dib, double angle, double x_shift, double y_shift, double x_origin, double y_origin, BOOL use_mask);
|
|
||||||
DLL_API BOOL DLL_CALLCONV FreeImage_FlipHorizontal(FIBITMAP *dib);
|
|
||||||
DLL_API BOOL DLL_CALLCONV FreeImage_FlipVertical(FIBITMAP *dib);
|
|
||||||
+/* 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(FALSE));
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
// upsampling / downsampling
|
|
||||||
DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Rescale(FIBITMAP *dib, int dst_width, int dst_height, FREE_IMAGE_FILTER filter);
|
|
||||||
@@ -1028,7 +1045,12 @@
|
|
||||||
DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Copy(FIBITMAP *dib, int left, int top, int right, int bottom);
|
|
||||||
DLL_API BOOL DLL_CALLCONV FreeImage_Paste(FIBITMAP *dst, FIBITMAP *src, int left, int top, int alpha);
|
|
||||||
DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Composite(FIBITMAP *fg, BOOL useFileBkg FI_DEFAULT(FALSE), RGBQUAD *appBkColor FI_DEFAULT(NULL), FIBITMAP *bg FI_DEFAULT(NULL));
|
|
||||||
+/* 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_JPEGCrop(const char *src_file, const char *dst_file, int left, int top, int right, int bottom);
|
|
||||||
+#endif
|
|
||||||
DLL_API BOOL DLL_CALLCONV FreeImage_PreMultiplyWithAlpha(FIBITMAP *dib);
|
|
||||||
|
|
||||||
// miscellaneous algorithms
|
|
||||||
--- FreeImage/Source/Metadata/Exif.cpp 2007-07-17 03:28:26.000000000 +0200
|
|
||||||
+++ FreeImage.new/Source/Metadata/Exif.cpp 2008-03-13 19:19:07.000000000 +0100
|
|
||||||
@@ -495,7 +495,7 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
// remember that we've visited this directory so that we don't visit it again later
|
|
||||||
- DWORD visited = (((DWORD)ifdp & 0xFFFF) << 16) | (DWORD)de;
|
|
||||||
+ DWORD visited = (((DWORD)((long)ifdp) & 0xFFFF) << 16) | (DWORD)de;
|
|
||||||
if(visitedIFD.find(visited) != visitedIFD.end()) {
|
|
||||||
continue;
|
|
||||||
} else {
|
|
||||||
--- FreeImage/Source/Metadata/XTIFF.cpp 2007-05-08 20:04:20.000000000 +0200
|
|
||||||
+++ FreeImage.new/Source/Metadata/XTIFF.cpp 2008-03-18 13:25:14.000000000 +0100
|
|
||||||
@@ -27,7 +27,7 @@
|
|
||||||
#pragma warning (disable : 4786) // identifier was truncated to 'number' characters
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#include "../LibTIFF/tiffiop.h"
|
|
||||||
+#include <tiffio.h>
|
|
||||||
|
|
||||||
#include "FreeImage.h"
|
|
||||||
#include "Utilities.h"
|
|
||||||
@@ -196,14 +196,21 @@
|
|
||||||
// EXIF tag reading
|
|
||||||
// ----------------------------------------------------------
|
|
||||||
|
|
||||||
+/*
|
|
||||||
+ * Caveat emperor this is a private libtiff functions which we need,
|
|
||||||
+ * there is no better solution I'm afraid
|
|
||||||
+ */
|
|
||||||
+extern "C"
|
|
||||||
+{
|
|
||||||
+ int _TIFFDataSize(TIFFDataType type);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
BOOL tiff_read_exif_tags(TIFF *tif, TagLib::MDMODEL md_model, FIBITMAP *dib) {
|
|
||||||
int i;
|
|
||||||
short count;
|
|
||||||
|
|
||||||
TagLib& tagLib = TagLib::instance();
|
|
||||||
|
|
||||||
- TIFFDirectory *td = &tif->tif_dir;
|
|
||||||
-
|
|
||||||
count = (short) TIFFGetTagListCount(tif);
|
|
||||||
for(i = 0; i < count; i++) {
|
|
||||||
ttag_t tag = TIFFGetTagListEntry(tif, i);
|
|
||||||
@@ -228,8 +235,12 @@
|
|
||||||
} else {
|
|
||||||
if (fip->field_readcount == TIFF_VARIABLE || fip->field_readcount == TIFF_VARIABLE2)
|
|
||||||
value_count = 1;
|
|
||||||
- else if (fip->field_readcount == TIFF_SPP)
|
|
||||||
- value_count = td->td_samplesperpixel;
|
|
||||||
+ else if (fip->field_readcount == TIFF_SPP) {
|
|
||||||
+ uint16 spp;
|
|
||||||
+ TIFFGetFieldDefaulted(tif,
|
|
||||||
+ TIFFTAG_SAMPLESPERPIXEL, &spp);
|
|
||||||
+ value_count = spp;
|
|
||||||
+ }
|
|
||||||
else
|
|
||||||
value_count = fip->field_readcount;
|
|
||||||
if (fip->field_type == TIFF_ASCII
|
|
||||||
--- FreeImage/gensrclist.sh 2007-08-11 03:09:24.000000000 +0200
|
|
||||||
+++ FreeImage.new/gensrclist.sh 2008-03-18 13:39:48.000000000 +0100
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
-DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG Source/LibMNG Source/LibPNG Source/LibTIFF Source/ZLib Source/LibOpenJPEG Source/OpenEXR Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf Source/OpenEXR/IlmThread Source/OpenEXR/Imath"
|
|
||||||
+DIRLIST=". Source Source/Metadata Source/FreeImageToolkit"
|
|
||||||
|
|
||||||
echo "VER_MAJOR = 3" > Makefile.srcs
|
|
||||||
echo "VER_MINOR = 10.0" >> Makefile.srcs
|
|
216
FreeImage-3.17.0_CVE-2015-0852.patch
Normal file
216
FreeImage-3.17.0_CVE-2015-0852.patch
Normal file
@ -0,0 +1,216 @@
|
|||||||
|
diff -rupN FreeImage/Source/FreeImage/PluginPCX.cpp FreeImage-new/Source/FreeImage/PluginPCX.cpp
|
||||||
|
--- FreeImage/Source/FreeImage/PluginPCX.cpp 2015-03-02 02:07:08.000000000 +0100
|
||||||
|
+++ FreeImage-new/Source/FreeImage/PluginPCX.cpp 2015-09-05 02:44:55.429436425 +0200
|
||||||
|
@@ -30,7 +30,7 @@
|
||||||
|
// Constants + headers
|
||||||
|
// ----------------------------------------------------------
|
||||||
|
|
||||||
|
-#define IO_BUF_SIZE 2048
|
||||||
|
+#define PCX_IO_BUF_SIZE 2048
|
||||||
|
|
||||||
|
// ----------------------------------------------------------
|
||||||
|
|
||||||
|
@@ -120,17 +120,17 @@ readline(FreeImageIO &io, fi_handle hand
|
||||||
|
|
||||||
|
while (length--) {
|
||||||
|
if (count == 0) {
|
||||||
|
- if (*ReadPos >= IO_BUF_SIZE - 1 ) {
|
||||||
|
- if (*ReadPos == IO_BUF_SIZE - 1) {
|
||||||
|
+ if (*ReadPos >= PCX_IO_BUF_SIZE - 1 ) {
|
||||||
|
+ if (*ReadPos == PCX_IO_BUF_SIZE - 1) {
|
||||||
|
// we still have one BYTE, copy it to the start pos
|
||||||
|
|
||||||
|
- *ReadBuf = ReadBuf[IO_BUF_SIZE - 1];
|
||||||
|
+ *ReadBuf = ReadBuf[PCX_IO_BUF_SIZE - 1];
|
||||||
|
|
||||||
|
- io.read_proc(ReadBuf + 1, 1, IO_BUF_SIZE - 1, handle);
|
||||||
|
+ io.read_proc(ReadBuf + 1, 1, PCX_IO_BUF_SIZE - 1, handle);
|
||||||
|
} else {
|
||||||
|
// read the complete buffer
|
||||||
|
|
||||||
|
- io.read_proc(ReadBuf, 1, IO_BUF_SIZE, handle);
|
||||||
|
+ io.read_proc(ReadBuf, 1, PCX_IO_BUF_SIZE, handle);
|
||||||
|
}
|
||||||
|
|
||||||
|
*ReadPos = 0;
|
||||||
|
@@ -346,19 +346,9 @@ Load(FreeImageIO *io, fi_handle handle,
|
||||||
|
BOOL header_only = (flags & FIF_LOAD_NOPIXELS) == FIF_LOAD_NOPIXELS;
|
||||||
|
|
||||||
|
try {
|
||||||
|
- // check PCX identifier
|
||||||
|
-
|
||||||
|
- long start_pos = io->tell_proc(handle);
|
||||||
|
- BOOL validated = pcx_validate(io, handle);
|
||||||
|
- io->seek_proc(handle, start_pos, SEEK_SET);
|
||||||
|
- if(!validated) {
|
||||||
|
- throw FI_MSG_ERROR_MAGIC_NUMBER;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- // process the header
|
||||||
|
-
|
||||||
|
PCXHEADER header;
|
||||||
|
|
||||||
|
+ // process the header
|
||||||
|
if(io->read_proc(&header, sizeof(PCXHEADER), 1, handle) != 1) {
|
||||||
|
throw FI_MSG_ERROR_PARSING;
|
||||||
|
}
|
||||||
|
@@ -366,20 +356,38 @@ Load(FreeImageIO *io, fi_handle handle,
|
||||||
|
SwapHeader(&header);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
- // allocate a new DIB
|
||||||
|
+ // process the window
|
||||||
|
+ const WORD *window = header.window; // left, upper, right,lower pixel coord.
|
||||||
|
+ const int left = window[0];
|
||||||
|
+ const int top = window[1];
|
||||||
|
+ const int right = window[2];
|
||||||
|
+ const int bottom = window[3];
|
||||||
|
|
||||||
|
- unsigned width = header.window[2] - header.window[0] + 1;
|
||||||
|
- unsigned height = header.window[3] - header.window[1] + 1;
|
||||||
|
- unsigned bitcount = header.bpp * header.planes;
|
||||||
|
-
|
||||||
|
- if (bitcount == 24) {
|
||||||
|
- dib = FreeImage_AllocateHeader(header_only, width, height, bitcount, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
|
||||||
|
- } else {
|
||||||
|
- dib = FreeImage_AllocateHeader(header_only, width, height, bitcount);
|
||||||
|
+ // check image size
|
||||||
|
+ if((left >= right) || (top >= bottom)) {
|
||||||
|
+ throw FI_MSG_ERROR_PARSING;
|
||||||
|
}
|
||||||
|
|
||||||
|
- // if the dib couldn't be allocated, throw an error
|
||||||
|
+ const unsigned width = right - left + 1;
|
||||||
|
+ const unsigned height = bottom - top + 1;
|
||||||
|
+ const unsigned bitcount = header.bpp * header.planes;
|
||||||
|
|
||||||
|
+ // allocate a new dib
|
||||||
|
+ switch(bitcount) {
|
||||||
|
+ case 1:
|
||||||
|
+ case 4:
|
||||||
|
+ case 8:
|
||||||
|
+ dib = FreeImage_AllocateHeader(header_only, width, height, bitcount);
|
||||||
|
+ break;
|
||||||
|
+ case 24:
|
||||||
|
+ dib = FreeImage_AllocateHeader(header_only, width, height, bitcount, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
|
||||||
|
+ break;
|
||||||
|
+ default:
|
||||||
|
+ throw FI_MSG_ERROR_DIB_MEMORY;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // if the dib couldn't be allocated, throw an error
|
||||||
|
if (!dib) {
|
||||||
|
throw FI_MSG_ERROR_DIB_MEMORY;
|
||||||
|
}
|
||||||
|
@@ -426,19 +434,23 @@ Load(FreeImageIO *io, fi_handle handle,
|
||||||
|
|
||||||
|
if (palette_id == 0x0C) {
|
||||||
|
BYTE *cmap = (BYTE*)malloc(768 * sizeof(BYTE));
|
||||||
|
- io->read_proc(cmap, 768, 1, handle);
|
||||||
|
|
||||||
|
- pal = FreeImage_GetPalette(dib);
|
||||||
|
- BYTE *pColormap = &cmap[0];
|
||||||
|
+ if(cmap) {
|
||||||
|
+ io->read_proc(cmap, 768, 1, handle);
|
||||||
|
|
||||||
|
- for(int i = 0; i < 256; i++) {
|
||||||
|
- pal[i].rgbRed = pColormap[0];
|
||||||
|
- pal[i].rgbGreen = pColormap[1];
|
||||||
|
- pal[i].rgbBlue = pColormap[2];
|
||||||
|
- pColormap += 3;
|
||||||
|
+ pal = FreeImage_GetPalette(dib);
|
||||||
|
+ BYTE *pColormap = &cmap[0];
|
||||||
|
+
|
||||||
|
+ for(int i = 0; i < 256; i++) {
|
||||||
|
+ pal[i].rgbRed = pColormap[0];
|
||||||
|
+ pal[i].rgbGreen = pColormap[1];
|
||||||
|
+ pal[i].rgbBlue = pColormap[2];
|
||||||
|
+ pColormap += 3;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ free(cmap);
|
||||||
|
}
|
||||||
|
|
||||||
|
- free(cmap);
|
||||||
|
}
|
||||||
|
|
||||||
|
// wrong palette ID, perhaps a gray scale is needed ?
|
||||||
|
@@ -463,12 +475,12 @@ Load(FreeImageIO *io, fi_handle handle,
|
||||||
|
return dib;
|
||||||
|
}
|
||||||
|
|
||||||
|
- // calculate the line length for the PCX and the DIB
|
||||||
|
+ // calculate the line length for the PCX and the dib
|
||||||
|
|
||||||
|
// length of raster line in bytes
|
||||||
|
- unsigned linelength = header.bytes_per_line * header.planes;
|
||||||
|
- // length of DIB line (rounded to DWORD) in bytes
|
||||||
|
- unsigned pitch = FreeImage_GetPitch(dib);
|
||||||
|
+ const unsigned linelength = header.bytes_per_line * header.planes;
|
||||||
|
+ // length of dib line (rounded to DWORD) in bytes
|
||||||
|
+ const unsigned pitch = FreeImage_GetPitch(dib);
|
||||||
|
|
||||||
|
// run-length encoding ?
|
||||||
|
|
||||||
|
@@ -478,14 +490,18 @@ Load(FreeImageIO *io, fi_handle handle,
|
||||||
|
// ---------------
|
||||||
|
|
||||||
|
line = (BYTE*)malloc(linelength * sizeof(BYTE));
|
||||||
|
- if(!line) throw FI_MSG_ERROR_MEMORY;
|
||||||
|
+ if(!line) {
|
||||||
|
+ throw FI_MSG_ERROR_MEMORY;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
- ReadBuf = (BYTE*)malloc(IO_BUF_SIZE * sizeof(BYTE));
|
||||||
|
- if(!ReadBuf) throw FI_MSG_ERROR_MEMORY;
|
||||||
|
+ ReadBuf = (BYTE*)malloc(PCX_IO_BUF_SIZE * sizeof(BYTE));
|
||||||
|
+ if(!ReadBuf) {
|
||||||
|
+ throw FI_MSG_ERROR_MEMORY;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
bits = FreeImage_GetScanLine(dib, height - 1);
|
||||||
|
|
||||||
|
- int ReadPos = IO_BUF_SIZE;
|
||||||
|
+ int ReadPos = PCX_IO_BUF_SIZE;
|
||||||
|
|
||||||
|
if ((header.planes == 1) && ((header.bpp == 1) || (header.bpp == 8))) {
|
||||||
|
BYTE skip;
|
||||||
|
@@ -497,7 +513,7 @@ Load(FreeImageIO *io, fi_handle handle,
|
||||||
|
// skip trailing garbage at the end of the scanline
|
||||||
|
|
||||||
|
for (unsigned count = written; count < linelength; count++) {
|
||||||
|
- if (ReadPos < IO_BUF_SIZE) {
|
||||||
|
+ if (ReadPos < PCX_IO_BUF_SIZE) {
|
||||||
|
ReadPos++;
|
||||||
|
} else {
|
||||||
|
io->read_proc(&skip, sizeof(BYTE), 1, handle);
|
||||||
|
@@ -513,7 +529,9 @@ Load(FreeImageIO *io, fi_handle handle,
|
||||||
|
unsigned x, y, written;
|
||||||
|
|
||||||
|
buffer = (BYTE*)malloc(width * sizeof(BYTE));
|
||||||
|
- if(!buffer) throw FI_MSG_ERROR_MEMORY;
|
||||||
|
+ if(!buffer) {
|
||||||
|
+ throw FI_MSG_ERROR_MEMORY;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
for (y = 0; y < height; y++) {
|
||||||
|
written = readline(*io, handle, line, linelength, bIsRLE, ReadBuf, &ReadPos);
|
||||||
|
@@ -532,7 +550,7 @@ Load(FreeImageIO *io, fi_handle handle,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- // then write the DIB row
|
||||||
|
+ // then write the dib row
|
||||||
|
|
||||||
|
for (x = 0; x < width / 2; x++) {
|
||||||
|
bits[x] = (buffer[2*x] << 4) | buffer[2*x+1];
|
||||||
|
@@ -541,7 +559,7 @@ Load(FreeImageIO *io, fi_handle handle,
|
||||||
|
// skip trailing garbage at the end of the scanline
|
||||||
|
|
||||||
|
for (unsigned count = written; count < linelength; count++) {
|
||||||
|
- if (ReadPos < IO_BUF_SIZE) {
|
||||||
|
+ if (ReadPos < PCX_IO_BUF_SIZE) {
|
||||||
|
ReadPos++;
|
||||||
|
} else {
|
||||||
|
io->read_proc(&skip, sizeof(BYTE), 1, handle);
|
24
FreeImage-3.17.0_CVE-2016-5684.patch
Normal file
24
FreeImage-3.17.0_CVE-2016-5684.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
diff -rupN FreeImage/Source/FreeImage/PluginXPM.cpp FreeImage-new/Source/FreeImage/PluginXPM.cpp
|
||||||
|
--- FreeImage/Source/FreeImage/PluginXPM.cpp 2015-03-02 02:07:08.000000000 +0100
|
||||||
|
+++ FreeImage-new/Source/FreeImage/PluginXPM.cpp 2016-10-04 16:40:11.975271194 +0200
|
||||||
|
@@ -181,6 +181,11 @@ Load(FreeImageIO *io, fi_handle handle,
|
||||||
|
}
|
||||||
|
free(str);
|
||||||
|
|
||||||
|
+ // check info string
|
||||||
|
+ if((width <= 0) || (height <= 0) || (colors <= 0) || (cpp <= 0)) {
|
||||||
|
+ throw "Improperly formed info string";
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (colors > 256) {
|
||||||
|
dib = FreeImage_AllocateHeader(header_only, width, height, 24, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
|
||||||
|
} else {
|
||||||
|
@@ -193,7 +198,7 @@ Load(FreeImageIO *io, fi_handle handle,
|
||||||
|
FILE_RGBA rgba;
|
||||||
|
|
||||||
|
str = ReadString(io, handle);
|
||||||
|
- if(!str)
|
||||||
|
+ if(!str || (strlen(str) < (size_t)cpp))
|
||||||
|
throw "Error reading color strings";
|
||||||
|
|
||||||
|
std::string chrs(str,cpp); //create a string for the color chars using the first cpp chars
|
31
FreeImage-3.17.0_doxygen.patch
Normal file
31
FreeImage-3.17.0_doxygen.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
diff -rupN FreeImage/Wrapper/FreeImagePlus/doc/FreeImagePlus.dox FreeImage-new/Wrapper/FreeImagePlus/doc/FreeImagePlus.dox
|
||||||
|
--- FreeImage/Wrapper/FreeImagePlus/doc/FreeImagePlus.dox 2011-07-30 19:02:48.000000000 +0200
|
||||||
|
+++ FreeImage-new/Wrapper/FreeImagePlus/doc/FreeImagePlus.dox 2015-09-05 02:10:36.890581408 +0200
|
||||||
|
@@ -51,7 +51,7 @@ PROJECT_LOGO =
|
||||||
|
# If a relative path is entered, it will be relative to the location
|
||||||
|
# where doxygen was started. If left blank the current directory will be used.
|
||||||
|
|
||||||
|
-OUTPUT_DIRECTORY = D:/Projects/FreeImage/Wrapper/FreeImagePlus/
|
||||||
|
+OUTPUT_DIRECTORY = .
|
||||||
|
|
||||||
|
# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
|
||||||
|
# 4096 sub-directories (in 2 levels) under the output directory of each output
|
||||||
|
@@ -598,7 +598,7 @@ WARN_FORMAT = "$file:$line: $
|
||||||
|
# and error messages should be written. If left blank the output is written
|
||||||
|
# to stderr.
|
||||||
|
|
||||||
|
-WARN_LOGFILE = D:\Projects\FreeImage\Wrapper\FreeImagePlus\doc\doxygen.log
|
||||||
|
+WARN_LOGFILE = ./doxygen.log
|
||||||
|
|
||||||
|
#---------------------------------------------------------------------------
|
||||||
|
# configuration options related to the input files
|
||||||
|
@@ -609,8 +609,7 @@ WARN_LOGFILE = D:\Projects\Fre
|
||||||
|
# directories like "/usr/src/myproject". Separate the files or directories
|
||||||
|
# with spaces.
|
||||||
|
|
||||||
|
-INPUT = D:/Projects/FreeImage/Source/FreeImage.h \
|
||||||
|
- D:/Projects/FreeImage/Wrapper/FreeImagePlus/FreeImagePlus.h
|
||||||
|
+INPUT = ../../../Source/FreeImage.h ../FreeImagePlus.h
|
||||||
|
|
||||||
|
# This tag can be used to specify the character encoding of the source files
|
||||||
|
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
|
548
FreeImage-3.17.0_unbundle.patch
Normal file
548
FreeImage-3.17.0_unbundle.patch
Normal file
@ -0,0 +1,548 @@
|
|||||||
|
diff -rupN FreeImage/genfipsrclist.sh FreeImage-new/genfipsrclist.sh
|
||||||
|
--- FreeImage/genfipsrclist.sh 2015-02-20 10:52:16.000000000 +0100
|
||||||
|
+++ FreeImage-new/genfipsrclist.sh 2015-09-05 02:13:52.041353305 +0200
|
||||||
|
@@ -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
|
||||||
|
|
||||||
|
diff -rupN FreeImage/gensrclist.sh FreeImage-new/gensrclist.sh
|
||||||
|
--- FreeImage/gensrclist.sh 2015-02-20 10:51:50.000000000 +0100
|
||||||
|
+++ FreeImage-new/gensrclist.sh 2015-09-05 02:13:52.041353305 +0200
|
||||||
|
@@ -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 = 17.0" >> Makefile.srcs
|
||||||
|
diff -rupN FreeImage/Makefile.fip FreeImage-new/Makefile.fip
|
||||||
|
--- FreeImage/Makefile.fip 2015-03-08 18:03:56.000000000 +0100
|
||||||
|
+++ FreeImage-new/Makefile.fip 2015-09-05 02:14:09.212684028 +0200
|
||||||
|
@@ -17,20 +17,22 @@ MODULES = $(SRCS:.c=.o)
|
||||||
|
MODULES := $(MODULES:.cpp=.o)
|
||||||
|
CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden
|
||||||
|
# OpenJPEG
|
||||||
|
-CFLAGS += -DOPJ_STATIC
|
||||||
|
+override CFLAGS += -DOPJ_STATIC
|
||||||
|
# LibRaw
|
||||||
|
-CFLAGS += -DNO_LCMS
|
||||||
|
+override CFLAGS += -DNO_LCMS
|
||||||
|
# LibJXR
|
||||||
|
-CFLAGS += -DDISABLE_PERF_MEASUREMENT -D__ANSI__
|
||||||
|
-CFLAGS += $(INCLUDE)
|
||||||
|
+override CFLAGS += -DDISABLE_PERF_MEASUREMENT -D__ANSI__
|
||||||
|
+override CFLAGS += $(INCLUDE)
|
||||||
|
CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
|
||||||
|
# LibJXR
|
||||||
|
-CXXFLAGS += -D__ANSI__
|
||||||
|
-CXXFLAGS += $(INCLUDE)
|
||||||
|
+override CXXFLAGS += -D__ANSI__
|
||||||
|
+override CXXFLAGS += $(INCLUDE)
|
||||||
|
+LDFLAGS ?=
|
||||||
|
+override LDFLAGS += -LDist -lfreeimage-$(VER_MAJOR).$(VER_MINOR)
|
||||||
|
|
||||||
|
ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
|
||||||
|
- CFLAGS += -fPIC
|
||||||
|
- CXXFLAGS += -fPIC
|
||||||
|
+ override CFLAGS += -fPIC
|
||||||
|
+ override CXXFLAGS += -fPIC
|
||||||
|
endif
|
||||||
|
|
||||||
|
TARGET = freeimageplus
|
||||||
|
@@ -68,7 +70,7 @@ $(STATICLIB): $(MODULES)
|
||||||
|
$(AR) r $@ $(MODULES)
|
||||||
|
|
||||||
|
$(SHAREDLIB): $(MODULES)
|
||||||
|
- $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
|
||||||
|
+ $(CC) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
|
||||||
|
|
||||||
|
install:
|
||||||
|
install -d $(INCDIR) $(INSTALLDIR)
|
||||||
|
diff -rupN FreeImage/Makefile.gnu FreeImage-new/Makefile.gnu
|
||||||
|
--- FreeImage/Makefile.gnu 2015-03-08 18:04:00.000000000 +0100
|
||||||
|
+++ FreeImage-new/Makefile.gnu 2015-09-05 02:14:04.810599259 +0200
|
||||||
|
@@ -16,21 +16,11 @@ LIBRARIES = -lstdc++
|
||||||
|
MODULES = $(SRCS:.c=.o)
|
||||||
|
MODULES := $(MODULES:.cpp=.o)
|
||||||
|
CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden
|
||||||
|
-# OpenJPEG
|
||||||
|
-CFLAGS += -DOPJ_STATIC
|
||||||
|
-# LibRaw
|
||||||
|
-CFLAGS += -DNO_LCMS
|
||||||
|
-# LibJXR
|
||||||
|
-CFLAGS += -DDISABLE_PERF_MEASUREMENT -D__ANSI__
|
||||||
|
-CFLAGS += $(INCLUDE)
|
||||||
|
-CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
|
||||||
|
-# LibJXR
|
||||||
|
-CXXFLAGS += -D__ANSI__
|
||||||
|
-CXXFLAGS += $(INCLUDE)
|
||||||
|
+override CFLAGS += $(INCLUDE) -D__ANSI__ -I/usr/include/jxrlib $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib)
|
||||||
|
+override LDFLAGS += -ljpeg -ljpegxr -ljxrglue $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib)
|
||||||
|
|
||||||
|
ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
|
||||||
|
- CFLAGS += -fPIC
|
||||||
|
- CXXFLAGS += -fPIC
|
||||||
|
+ override CFLAGS += -fPIC
|
||||||
|
endif
|
||||||
|
|
||||||
|
TARGET = freeimage
|
||||||
|
@@ -61,13 +51,13 @@ FreeImage: $(STATICLIB) $(SHAREDLIB)
|
||||||
|
$(CC) $(CFLAGS) -c $< -o $@
|
||||||
|
|
||||||
|
.cpp.o:
|
||||||
|
- $(CXX) $(CXXFLAGS) -c $< -o $@
|
||||||
|
+ $(CXX) $(CFLAGS) -c $< -o $@
|
||||||
|
|
||||||
|
$(STATICLIB): $(MODULES)
|
||||||
|
$(AR) r $@ $(MODULES)
|
||||||
|
|
||||||
|
$(SHAREDLIB): $(MODULES)
|
||||||
|
- $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
|
||||||
|
+ $(CC) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
|
||||||
|
|
||||||
|
install:
|
||||||
|
install -d $(INCDIR) $(INSTALLDIR)
|
||||||
|
diff -rupN FreeImage/Source/FreeImage/J2KHelper.cpp FreeImage-new/Source/FreeImage/J2KHelper.cpp
|
||||||
|
--- FreeImage/Source/FreeImage/J2KHelper.cpp 2015-03-02 02:07:08.000000000 +0100
|
||||||
|
+++ FreeImage-new/Source/FreeImage/J2KHelper.cpp 2015-09-05 02:13:52.042353324 +0200
|
||||||
|
@@ -21,7 +21,7 @@
|
||||||
|
|
||||||
|
#include "FreeImage.h"
|
||||||
|
#include "Utilities.h"
|
||||||
|
-#include "../LibOpenJPEG/openjpeg.h"
|
||||||
|
+#include <openjpeg.h>
|
||||||
|
#include "J2KHelper.h"
|
||||||
|
|
||||||
|
// --------------------------------------------------------------------------
|
||||||
|
diff -rupN FreeImage/Source/FreeImage/Plugin.cpp FreeImage-new/Source/FreeImage/Plugin.cpp
|
||||||
|
--- FreeImage/Source/FreeImage/Plugin.cpp 2015-03-02 02:07:08.000000000 +0100
|
||||||
|
+++ FreeImage-new/Source/FreeImage/Plugin.cpp 2015-09-05 02:13:52.042353324 +0200
|
||||||
|
@@ -263,7 +263,12 @@ FreeImage_Initialise(BOOL load_local_plu
|
||||||
|
s_plugins->AddNode(InitDDS);
|
||||||
|
s_plugins->AddNode(InitGIF);
|
||||||
|
s_plugins->AddNode(InitHDR);
|
||||||
|
- s_plugins->AddNode(InitG3);
|
||||||
|
+/* 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
|
||||||
|
+ s_plugins->AddNode(InitG3);
|
||||||
|
+#endif
|
||||||
|
s_plugins->AddNode(InitSGI);
|
||||||
|
s_plugins->AddNode(InitEXR);
|
||||||
|
s_plugins->AddNode(InitJ2K);
|
||||||
|
diff -rupN FreeImage/Source/FreeImage/PluginEXR.cpp FreeImage-new/Source/FreeImage/PluginEXR.cpp
|
||||||
|
--- FreeImage/Source/FreeImage/PluginEXR.cpp 2015-03-02 02:07:08.000000000 +0100
|
||||||
|
+++ FreeImage-new/Source/FreeImage/PluginEXR.cpp 2015-09-05 02:13:52.042353324 +0200
|
||||||
|
@@ -28,16 +28,16 @@
|
||||||
|
#pragma warning (disable : 4800) // ImfVersion.h - 'const int' : forcing value to bool 'true' or 'false' (performance warning)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-#include "../OpenEXR/IlmImf/ImfIO.h"
|
||||||
|
-#include "../OpenEXR/Iex/Iex.h"
|
||||||
|
-#include "../OpenEXR/IlmImf/ImfOutputFile.h"
|
||||||
|
-#include "../OpenEXR/IlmImf/ImfInputFile.h"
|
||||||
|
-#include "../OpenEXR/IlmImf/ImfRgbaFile.h"
|
||||||
|
-#include "../OpenEXR/IlmImf/ImfChannelList.h"
|
||||||
|
-#include "../OpenEXR/IlmImf/ImfRgba.h"
|
||||||
|
-#include "../OpenEXR/IlmImf/ImfArray.h"
|
||||||
|
-#include "../OpenEXR/IlmImf/ImfPreviewImage.h"
|
||||||
|
-#include "../OpenEXR/Half/half.h"
|
||||||
|
+#include <OpenEXR/ImfIO.h>
|
||||||
|
+#include <OpenEXR/Iex.h>
|
||||||
|
+#include <OpenEXR/ImfOutputFile.h>
|
||||||
|
+#include <OpenEXR/ImfInputFile.h>
|
||||||
|
+#include <OpenEXR/ImfRgbaFile.h>
|
||||||
|
+#include <OpenEXR/ImfChannelList.h>
|
||||||
|
+#include <OpenEXR/ImfRgba.h>
|
||||||
|
+#include <OpenEXR/ImfArray.h>
|
||||||
|
+#include <OpenEXR/ImfPreviewImage.h>
|
||||||
|
+#include <OpenEXR/half.h>
|
||||||
|
|
||||||
|
|
||||||
|
// ==========================================================
|
||||||
|
diff -rupN FreeImage/Source/FreeImage/PluginJ2K.cpp FreeImage-new/Source/FreeImage/PluginJ2K.cpp
|
||||||
|
--- FreeImage/Source/FreeImage/PluginJ2K.cpp 2015-03-02 02:07:08.000000000 +0100
|
||||||
|
+++ FreeImage-new/Source/FreeImage/PluginJ2K.cpp 2015-09-05 02:13:52.043353343 +0200
|
||||||
|
@@ -21,7 +21,7 @@
|
||||||
|
|
||||||
|
#include "FreeImage.h"
|
||||||
|
#include "Utilities.h"
|
||||||
|
-#include "../LibOpenJPEG/openjpeg.h"
|
||||||
|
+#include <openjpeg.h>
|
||||||
|
#include "J2KHelper.h"
|
||||||
|
|
||||||
|
// ==========================================================
|
||||||
|
diff -rupN FreeImage/Source/FreeImage/PluginJP2.cpp FreeImage-new/Source/FreeImage/PluginJP2.cpp
|
||||||
|
--- FreeImage/Source/FreeImage/PluginJP2.cpp 2015-03-02 02:07:08.000000000 +0100
|
||||||
|
+++ FreeImage-new/Source/FreeImage/PluginJP2.cpp 2015-09-05 02:13:52.043353343 +0200
|
||||||
|
@@ -21,7 +21,7 @@
|
||||||
|
|
||||||
|
#include "FreeImage.h"
|
||||||
|
#include "Utilities.h"
|
||||||
|
-#include "../LibOpenJPEG/openjpeg.h"
|
||||||
|
+#include <openjpeg.h>
|
||||||
|
#include "J2KHelper.h"
|
||||||
|
|
||||||
|
// ==========================================================
|
||||||
|
diff -rupN FreeImage/Source/FreeImage/PluginJPEG.cpp FreeImage-new/Source/FreeImage/PluginJPEG.cpp
|
||||||
|
--- FreeImage/Source/FreeImage/PluginJPEG.cpp 2015-03-02 02:07:08.000000000 +0100
|
||||||
|
+++ FreeImage-new/Source/FreeImage/PluginJPEG.cpp 2015-09-05 02:13:52.043353343 +0200
|
||||||
|
@@ -35,9 +35,9 @@ extern "C" {
|
||||||
|
#undef FAR
|
||||||
|
#include <setjmp.h>
|
||||||
|
|
||||||
|
-#include "../LibJPEG/jinclude.h"
|
||||||
|
-#include "../LibJPEG/jpeglib.h"
|
||||||
|
-#include "../LibJPEG/jerror.h"
|
||||||
|
+#include <stdio.h>
|
||||||
|
+#include <jpeglib.h>
|
||||||
|
+#include <jerror.h>
|
||||||
|
}
|
||||||
|
|
||||||
|
#include "FreeImage.h"
|
||||||
|
diff -rupN FreeImage/Source/FreeImage/PluginJXR.cpp FreeImage-new/Source/FreeImage/PluginJXR.cpp
|
||||||
|
--- FreeImage/Source/FreeImage/PluginJXR.cpp 2015-03-02 02:07:08.000000000 +0100
|
||||||
|
+++ FreeImage-new/Source/FreeImage/PluginJXR.cpp 2015-09-05 02:13:52.043353343 +0200
|
||||||
|
@@ -23,7 +23,7 @@
|
||||||
|
#include "Utilities.h"
|
||||||
|
#include "../Metadata/FreeImageTag.h"
|
||||||
|
|
||||||
|
-#include "../LibJXR/jxrgluelib/JXRGlue.h"
|
||||||
|
+#include <JXRGlue.h>
|
||||||
|
|
||||||
|
// ==========================================================
|
||||||
|
// Plugin Interface
|
||||||
|
diff -rupN FreeImage/Source/FreeImage/PluginPNG.cpp FreeImage-new/Source/FreeImage/PluginPNG.cpp
|
||||||
|
--- FreeImage/Source/FreeImage/PluginPNG.cpp 2015-03-10 20:16:12.000000000 +0100
|
||||||
|
+++ FreeImage-new/Source/FreeImage/PluginPNG.cpp 2015-09-05 02:13:52.044353363 +0200
|
||||||
|
@@ -40,8 +40,8 @@
|
||||||
|
|
||||||
|
// ----------------------------------------------------------
|
||||||
|
|
||||||
|
-#include "../ZLib/zlib.h"
|
||||||
|
-#include "../LibPNG/png.h"
|
||||||
|
+#include <zlib.h>
|
||||||
|
+#include <png.h>
|
||||||
|
|
||||||
|
// ----------------------------------------------------------
|
||||||
|
|
||||||
|
diff -rupN FreeImage/Source/FreeImage/PluginRAW.cpp FreeImage-new/Source/FreeImage/PluginRAW.cpp
|
||||||
|
--- FreeImage/Source/FreeImage/PluginRAW.cpp 2015-03-08 20:12:04.000000000 +0100
|
||||||
|
+++ FreeImage-new/Source/FreeImage/PluginRAW.cpp 2015-09-05 02:13:52.044353363 +0200
|
||||||
|
@@ -19,7 +19,7 @@
|
||||||
|
// Use at your own risk!
|
||||||
|
// ==========================================================
|
||||||
|
|
||||||
|
-#include "../LibRawLite/libraw/libraw.h"
|
||||||
|
+#include <libraw/libraw.h>
|
||||||
|
|
||||||
|
#include "FreeImage.h"
|
||||||
|
#include "Utilities.h"
|
||||||
|
diff -rupN FreeImage/Source/FreeImage/PluginTIFF.cpp FreeImage-new/Source/FreeImage/PluginTIFF.cpp
|
||||||
|
--- FreeImage/Source/FreeImage/PluginTIFF.cpp 2015-03-02 02:07:08.000000000 +0100
|
||||||
|
+++ FreeImage-new/Source/FreeImage/PluginTIFF.cpp 2015-09-05 02:13:52.044353363 +0200
|
||||||
|
@@ -37,9 +37,9 @@
|
||||||
|
|
||||||
|
#include "FreeImage.h"
|
||||||
|
#include "Utilities.h"
|
||||||
|
-#include "../LibTIFF4/tiffiop.h"
|
||||||
|
+#include <tiffio.h>
|
||||||
|
#include "../Metadata/FreeImageTag.h"
|
||||||
|
-#include "../OpenEXR/Half/half.h"
|
||||||
|
+#include <OpenEXR/half.h>
|
||||||
|
|
||||||
|
#include "FreeImageIO.h"
|
||||||
|
#include "PSDParser.h"
|
||||||
|
@@ -194,16 +194,6 @@ TIFFFdOpen(thandle_t handle, const char
|
||||||
|
return tif;
|
||||||
|
}
|
||||||
|
|
||||||
|
-/**
|
||||||
|
-Open a TIFF file for reading or writing
|
||||||
|
-@param name
|
||||||
|
-@param mode
|
||||||
|
-*/
|
||||||
|
-TIFF*
|
||||||
|
-TIFFOpen(const char* name, const char* mode) {
|
||||||
|
- return 0;
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
// ----------------------------------------------------------
|
||||||
|
// TIFF library FreeImage-specific routines.
|
||||||
|
// ----------------------------------------------------------
|
||||||
|
diff -rupN FreeImage/Source/FreeImage/PluginWebP.cpp FreeImage-new/Source/FreeImage/PluginWebP.cpp
|
||||||
|
--- FreeImage/Source/FreeImage/PluginWebP.cpp 2015-03-02 02:07:08.000000000 +0100
|
||||||
|
+++ FreeImage-new/Source/FreeImage/PluginWebP.cpp 2015-09-05 02:13:52.044353363 +0200
|
||||||
|
@@ -24,10 +24,10 @@
|
||||||
|
|
||||||
|
#include "../Metadata/FreeImageTag.h"
|
||||||
|
|
||||||
|
-#include "../LibWebP/src/webp/decode.h"
|
||||||
|
-#include "../LibWebP/src/webp/encode.h"
|
||||||
|
-#include "../LibWebP/src/enc/vp8enci.h"
|
||||||
|
-#include "../LibWebP/src/webp/mux.h"
|
||||||
|
+#include <webp/decode.h>
|
||||||
|
+#include <webp/encode.h>
|
||||||
|
+// #include "../LibWebP/src/enc/vp8enci.h"
|
||||||
|
+#include <webp/mux.h>
|
||||||
|
|
||||||
|
// ==========================================================
|
||||||
|
// Plugin Interface
|
||||||
|
diff -rupN FreeImage/Source/FreeImage/ZLibInterface.cpp FreeImage-new/Source/FreeImage/ZLibInterface.cpp
|
||||||
|
--- FreeImage/Source/FreeImage/ZLibInterface.cpp 2015-03-02 02:07:10.000000000 +0100
|
||||||
|
+++ FreeImage-new/Source/FreeImage/ZLibInterface.cpp 2015-09-05 02:13:52.044353363 +0200
|
||||||
|
@@ -19,10 +19,9 @@
|
||||||
|
// Use at your own risk!
|
||||||
|
// ==========================================================
|
||||||
|
|
||||||
|
-#include "../ZLib/zlib.h"
|
||||||
|
+#include <zlib.h>
|
||||||
|
#include "FreeImage.h"
|
||||||
|
#include "Utilities.h"
|
||||||
|
-#include "../ZLib/zutil.h" /* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */
|
||||||
|
|
||||||
|
/**
|
||||||
|
Compresses a source buffer into a target buffer, using the ZLib library.
|
||||||
|
@@ -115,7 +114,7 @@ FreeImage_ZLibGZip(BYTE *target, DWORD t
|
||||||
|
return 0;
|
||||||
|
case Z_OK: {
|
||||||
|
// patch header, setup crc and length (stolen from mod_trace_output)
|
||||||
|
- BYTE *p = target + 8; *p++ = 2; *p = OS_CODE; // xflags, os_code
|
||||||
|
+ BYTE *p = target + 8; *p++ = 2; *p = 0x03; // xflags, os_code (unix)
|
||||||
|
crc = crc32(crc, source, source_size);
|
||||||
|
memcpy(target + 4 + dest_len, &crc, 4);
|
||||||
|
memcpy(target + 8 + dest_len, &source_size, 4);
|
||||||
|
diff -rupN FreeImage/Source/FreeImage.h FreeImage-new/Source/FreeImage.h
|
||||||
|
--- FreeImage/Source/FreeImage.h 2015-03-04 02:17:54.000000000 +0100
|
||||||
|
+++ FreeImage-new/Source/FreeImage.h 2015-09-05 02:13:52.045353382 +0200
|
||||||
|
@@ -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.
|
||||||
|
@@ -1076,7 +1089,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);
|
||||||
|
@@ -1085,6 +1101,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
|
||||||
|
|
||||||
|
|
||||||
|
// --------------------------------------------------------------------------
|
||||||
|
diff -rupN FreeImage/Source/FreeImageToolkit/JPEGTransform.cpp FreeImage-new/Source/FreeImageToolkit/JPEGTransform.cpp
|
||||||
|
--- FreeImage/Source/FreeImageToolkit/JPEGTransform.cpp 2015-03-02 02:07:10.000000000 +0100
|
||||||
|
+++ FreeImage-new/Source/FreeImageToolkit/JPEGTransform.cpp 2015-09-05 02:13:52.045353382 +0200
|
||||||
|
@@ -26,10 +26,10 @@ extern "C" {
|
||||||
|
#undef FAR
|
||||||
|
#include <setjmp.h>
|
||||||
|
|
||||||
|
-#include "../LibJPEG/jinclude.h"
|
||||||
|
-#include "../LibJPEG/jpeglib.h"
|
||||||
|
-#include "../LibJPEG/jerror.h"
|
||||||
|
-#include "../LibJPEG/transupp.h"
|
||||||
|
+#include <jinclude.h>
|
||||||
|
+#include <jpeglib.h>
|
||||||
|
+#include <jerror.h>
|
||||||
|
+#include <transupp.h>
|
||||||
|
}
|
||||||
|
|
||||||
|
#include "FreeImage.h"
|
||||||
|
diff -rupN FreeImage/Source/Metadata/TagConversion.cpp FreeImage-new/Source/Metadata/TagConversion.cpp
|
||||||
|
--- FreeImage/Source/Metadata/TagConversion.cpp 2015-03-02 02:07:10.000000000 +0100
|
||||||
|
+++ FreeImage-new/Source/Metadata/TagConversion.cpp 2015-09-05 02:13:52.045353382 +0200
|
||||||
|
@@ -30,6 +30,11 @@
|
||||||
|
|
||||||
|
#define MAX_TEXT_EXTENT 512
|
||||||
|
|
||||||
|
+// These were in FreeImage.h, but are moved here to avoid conflicts (see note in FreeImage.h)
|
||||||
|
+typedef int64_t INT64;
|
||||||
|
+typedef uint64_t UINT64;
|
||||||
|
+
|
||||||
|
+
|
||||||
|
/**
|
||||||
|
Convert a tag to a C string
|
||||||
|
*/
|
||||||
|
diff -rupN FreeImage/Source/Metadata/XTIFF.cpp FreeImage-new/Source/Metadata/XTIFF.cpp
|
||||||
|
--- FreeImage/Source/Metadata/XTIFF.cpp 2015-03-02 02:07:10.000000000 +0100
|
||||||
|
+++ FreeImage-new/Source/Metadata/XTIFF.cpp 2015-09-05 02:13:52.045353382 +0200
|
||||||
|
@@ -29,13 +29,18 @@
|
||||||
|
#pragma warning (disable : 4786) // identifier was truncated to 'number' characters
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-#include "../LibTIFF4/tiffiop.h"
|
||||||
|
+#include <tiffio.h>
|
||||||
|
|
||||||
|
#include "FreeImage.h"
|
||||||
|
#include "Utilities.h"
|
||||||
|
#include "FreeImageTag.h"
|
||||||
|
#include "FIRational.h"
|
||||||
|
|
||||||
|
+extern "C"
|
||||||
|
+{
|
||||||
|
+ int _TIFFDataSize(TIFFDataType type);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
// ----------------------------------------------------------
|
||||||
|
// Extended TIFF Directory GEO Tag Support
|
||||||
|
// ----------------------------------------------------------
|
||||||
|
@@ -224,6 +229,33 @@ tiff_write_geotiff_profile(TIFF *tif, FI
|
||||||
|
// TIFF EXIF tag reading & writing
|
||||||
|
// ----------------------------------------------------------
|
||||||
|
|
||||||
|
+static uint32 exif_tag_ids[] = {
|
||||||
|
+ EXIFTAG_EXPOSURETIME, EXIFTAG_FNUMBER, EXIFTAG_EXPOSUREPROGRAM,
|
||||||
|
+ EXIFTAG_SPECTRALSENSITIVITY, EXIFTAG_ISOSPEEDRATINGS, EXIFTAG_OECF,
|
||||||
|
+ EXIFTAG_EXIFVERSION, EXIFTAG_DATETIMEORIGINAL, EXIFTAG_DATETIMEDIGITIZED,
|
||||||
|
+ EXIFTAG_COMPONENTSCONFIGURATION, EXIFTAG_COMPRESSEDBITSPERPIXEL,
|
||||||
|
+ EXIFTAG_SHUTTERSPEEDVALUE, EXIFTAG_APERTUREVALUE,
|
||||||
|
+ EXIFTAG_BRIGHTNESSVALUE, EXIFTAG_EXPOSUREBIASVALUE,
|
||||||
|
+ EXIFTAG_MAXAPERTUREVALUE, EXIFTAG_SUBJECTDISTANCE, EXIFTAG_METERINGMODE,
|
||||||
|
+ EXIFTAG_LIGHTSOURCE, EXIFTAG_FLASH, EXIFTAG_FOCALLENGTH,
|
||||||
|
+ EXIFTAG_SUBJECTAREA, EXIFTAG_MAKERNOTE, EXIFTAG_USERCOMMENT,
|
||||||
|
+ EXIFTAG_SUBSECTIME, EXIFTAG_SUBSECTIMEORIGINAL,
|
||||||
|
+ EXIFTAG_SUBSECTIMEDIGITIZED, EXIFTAG_FLASHPIXVERSION, EXIFTAG_COLORSPACE,
|
||||||
|
+ EXIFTAG_PIXELXDIMENSION, EXIFTAG_PIXELYDIMENSION,
|
||||||
|
+ EXIFTAG_RELATEDSOUNDFILE, EXIFTAG_FLASHENERGY,
|
||||||
|
+ EXIFTAG_SPATIALFREQUENCYRESPONSE, EXIFTAG_FOCALPLANEXRESOLUTION,
|
||||||
|
+ EXIFTAG_FOCALPLANEYRESOLUTION, EXIFTAG_FOCALPLANERESOLUTIONUNIT,
|
||||||
|
+ EXIFTAG_SUBJECTLOCATION, EXIFTAG_EXPOSUREINDEX, EXIFTAG_SENSINGMETHOD,
|
||||||
|
+ EXIFTAG_FILESOURCE, EXIFTAG_SCENETYPE, EXIFTAG_CFAPATTERN,
|
||||||
|
+ EXIFTAG_CUSTOMRENDERED, EXIFTAG_EXPOSUREMODE, EXIFTAG_WHITEBALANCE,
|
||||||
|
+ EXIFTAG_DIGITALZOOMRATIO, EXIFTAG_FOCALLENGTHIN35MMFILM,
|
||||||
|
+ EXIFTAG_SCENECAPTURETYPE, EXIFTAG_GAINCONTROL, EXIFTAG_CONTRAST,
|
||||||
|
+ EXIFTAG_SATURATION, EXIFTAG_SHARPNESS, EXIFTAG_DEVICESETTINGDESCRIPTION,
|
||||||
|
+ EXIFTAG_SUBJECTDISTANCERANGE, EXIFTAG_GAINCONTROL, EXIFTAG_GAINCONTROL,
|
||||||
|
+ EXIFTAG_IMAGEUNIQUEID
|
||||||
|
+};
|
||||||
|
+static int nExifTags = sizeof(exif_tag_ids) / sizeof(exif_tag_ids[0]);
|
||||||
|
+
|
||||||
|
/**
|
||||||
|
Read a single Exif tag
|
||||||
|
|
||||||
|
@@ -575,45 +607,11 @@ tiff_read_exif_tags(TIFF *tif, TagLib::M
|
||||||
|
|
||||||
|
// loop over all Core Directory Tags
|
||||||
|
// ### uses private data, but there is no other way
|
||||||
|
+ // -> Fedora: Best we can do without private headers is to hard-code a list of known EXIF tags and read those
|
||||||
|
if(md_model == TagLib::EXIF_MAIN) {
|
||||||
|
- const TIFFDirectory *td = &tif->tif_dir;
|
||||||
|
-
|
||||||
|
- uint32 lastTag = 0; //<- used to prevent reading some tags twice (as stored in tif_fieldinfo)
|
||||||
|
-
|
||||||
|
- for (int fi = 0, nfi = (int)tif->tif_nfields; nfi > 0; nfi--, fi++) {
|
||||||
|
- const TIFFField *fld = tif->tif_fields[fi];
|
||||||
|
-
|
||||||
|
- const uint32 tag_id = TIFFFieldTag(fld);
|
||||||
|
-
|
||||||
|
- if(tag_id == lastTag) {
|
||||||
|
- continue;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- // test if tag value is set
|
||||||
|
- // (lifted directly from LibTiff _TIFFWriteDirectory)
|
||||||
|
-
|
||||||
|
- if( fld->field_bit == FIELD_CUSTOM ) {
|
||||||
|
- int is_set = FALSE;
|
||||||
|
-
|
||||||
|
- for(int ci = 0; ci < td->td_customValueCount; ci++ ) {
|
||||||
|
- is_set |= (td->td_customValues[ci].info == fld);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- if( !is_set ) {
|
||||||
|
- continue;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- } else if(!TIFFFieldSet(tif, fld->field_bit)) {
|
||||||
|
- continue;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- // process *all* other tags (some will be ignored)
|
||||||
|
-
|
||||||
|
- tiff_read_exif_tag(tif, tag_id, dib, md_model);
|
||||||
|
-
|
||||||
|
- lastTag = tag_id;
|
||||||
|
+ for (int i = 0; i < nExifTags; ++i) {
|
||||||
|
+ tiff_read_exif_tag(tif, exif_tag_ids[i], dib, md_model);
|
||||||
|
}
|
||||||
|
-
|
||||||
|
}
|
||||||
|
|
||||||
|
return TRUE;
|
||||||
|
@@ -723,10 +721,9 @@ tiff_write_exif_tags(TIFF *tif, TagLib::
|
||||||
|
|
||||||
|
TagLib& tag_lib = TagLib::instance();
|
||||||
|
|
||||||
|
- for (int fi = 0, nfi = (int)tif->tif_nfields; nfi > 0; nfi--, fi++) {
|
||||||
|
- const TIFFField *fld = tif->tif_fields[fi];
|
||||||
|
-
|
||||||
|
- const uint32 tag_id = TIFFFieldTag(fld);
|
||||||
|
+ for (int fi = 0; fi < nExifTags; fi++) {
|
||||||
|
+ const uint32 tag_id = exif_tag_ids[fi];
|
||||||
|
+ const TIFFField *fld = TIFFFieldWithTag(tif, tag_id);
|
||||||
|
|
||||||
|
if(skip_write_field(tif, tag_id)) {
|
||||||
|
// skip tags that are already handled by the LibTIFF writing process
|
226
freeimage.spec
226
freeimage.spec
@ -1,23 +1,38 @@
|
|||||||
%define _version 3100
|
%define _version 3170
|
||||||
%define major 3
|
%define major 3
|
||||||
|
|
||||||
Name: freeimage
|
Name: freeimage
|
||||||
Version: 3.10.0
|
Version: 3.17.0
|
||||||
Release: 16%{?dist}
|
Release: 14%{?dist}
|
||||||
Summary: Multi-format image decoder library
|
Summary: Multi-format image decoder library
|
||||||
Group: System Environment/Libraries
|
|
||||||
# freeimage is dual-licensed, see Whatsnew.txt (search for license) or:
|
# freeimage is tripple-licensed, see
|
||||||
# http://freeimage.sourceforge.net/license.html
|
# http://freeimage.sourceforge.net/license.html
|
||||||
License: GPL+ or MPLv1.0
|
# https://lists.fedoraproject.org/pipermail/legal/2013-October/002271.html
|
||||||
|
License: GPLv2 or GPLv3 or MPLv1.0
|
||||||
URL: http://freeimage.sourceforge.net/
|
URL: http://freeimage.sourceforge.net/
|
||||||
Source0: http://downloads.sourceforge.net/%{name}/FreeImage%{_version}.zip
|
Source0: http://downloads.sourceforge.net/%{name}/FreeImage%{_version}.zip
|
||||||
Patch0: FreeImage-3.10.0-syslibs.patch
|
# Unbundle bundled libraries
|
||||||
Patch1: FreeImage-3.10.0-doxygen.patch
|
Patch0: FreeImage-3.17.0_unbundle.patch
|
||||||
Patch2: FreeImage-3.10.0-libpng15.patch
|
# Fix incorrect paths in doxyfile
|
||||||
Patch3: FreeImage-3.10.0-libtiff4.patch
|
Patch1: FreeImage-3.17.0_doxygen.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
# Fix CVE-2015-0852 (#1257859)
|
||||||
BuildRequires: libjpeg-devel libpng-devel libtiff-devel OpenEXR-devel
|
Patch2: FreeImage-3.17.0_CVE-2015-0852.patch
|
||||||
BuildRequires: libmng-devel openjpeg-devel doxygen
|
# Fix CVE-2016-5684 (#1381517)
|
||||||
|
Patch3: FreeImage-3.17.0_CVE-2016-5684.patch
|
||||||
|
|
||||||
|
BuildRequires: doxygen
|
||||||
|
BuildRequires: gcc-c++
|
||||||
|
BuildRequires: make
|
||||||
|
BuildRequires: jxrlib-devel
|
||||||
|
BuildRequires: libjpeg-devel
|
||||||
|
BuildRequires: libmng-devel
|
||||||
|
BuildRequires: libpng-devel
|
||||||
|
BuildRequires: libtiff-devel
|
||||||
|
BuildRequires: libwebp-devel
|
||||||
|
BuildRequires: LibRaw-devel
|
||||||
|
BuildRequires: OpenEXR-devel
|
||||||
|
BuildRequires: openjpeg2-devel
|
||||||
|
|
||||||
%description
|
%description
|
||||||
FreeImage is a library for developers who would like to support popular
|
FreeImage is a library for developers who would like to support popular
|
||||||
@ -27,48 +42,63 @@ today's multimedia applications.
|
|||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Development files for %{name}
|
Summary: Development files for %{name}
|
||||||
Group: Development/Libraries
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
Requires: %{name} = %{version}-%{release}
|
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
The %{name}-devel package contains libraries and header files for
|
The %{name}-devel package contains libraries and header files for
|
||||||
developing applications that use %{name}.
|
developing applications that use %{name}.
|
||||||
|
|
||||||
|
|
||||||
|
%package plus
|
||||||
|
Summary: C++ wrapper for FreeImage
|
||||||
|
|
||||||
|
%description plus
|
||||||
|
The %{name}-plus package contains the C++ wrapper library for %{name}.
|
||||||
|
|
||||||
|
|
||||||
|
%package plus-devel
|
||||||
|
Summary: Development files for %{name}-devel
|
||||||
|
Requires: %{name}-plus%{?_isa} = %{version}-%{release}
|
||||||
|
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
|
%description plus-devel
|
||||||
|
The %{name}-devel package contains libraries and header files for
|
||||||
|
developing applications that use %{name}-plus.
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n FreeImage
|
%setup -q -n FreeImage
|
||||||
%patch0 -p1 -z .syslibs
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p0
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
touch -r Source/FreeImage.h.syslibs Source/FreeImage.h
|
|
||||||
|
|
||||||
# remove all included libs to make sure these don't get used during compile
|
# remove all included libs to make sure these don't get used during compile
|
||||||
rm -r Source/Lib* Source/ZLib Source/OpenEXR
|
rm -r Source/Lib* Source/ZLib Source/OpenEXR
|
||||||
|
|
||||||
# some encoding / line ending cleanups
|
# clear files which cannot be built due to dependencies on private headers
|
||||||
iconv -f ISO-8859-1 -t UTF-8 Whatsnew.txt > Whatsnew.txt.tmp
|
# (see also unbundle patch)
|
||||||
touch -r Whatsnew.txt Whatsnew.txt.tmp
|
> Source/FreeImage/PluginG3.cpp
|
||||||
mv Whatsnew.txt.tmp Whatsnew.txt
|
> Source/FreeImageToolkit/JPEGTransform.cpp
|
||||||
sed -i 's/\r//g' Whatsnew.txt license-*.txt gensrclist.sh \
|
|
||||||
Wrapper/FreeImagePlus/WhatsNew_FIP.txt
|
# 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
|
||||||
|
iconv --from=ISO-8859-15 --to=UTF-8 $file > $file.new && \
|
||||||
|
sed -i 's|\r||g' $file.new && \
|
||||||
|
touch -r $file $file.new && mv $file.new $file
|
||||||
|
done
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
sh ./gensrclist.sh
|
sh ./gensrclist.sh
|
||||||
make %{?_smp_mflags} \
|
sh ./genfipsrclist.sh
|
||||||
COMPILERFLAGS="$RPM_OPT_FLAGS -fPIC -fvisibility=hidden `pkg-config --cflags OpenEXR`"
|
%ifarch %{power64} %{mips32}
|
||||||
|
%make_build -f Makefile.gnu CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" LDFLAGS="%{__global_ldflags}"
|
||||||
# build libfreeimageplus DIY, as the provided makefile makes libfreeimageplus
|
%make_build -f Makefile.fip CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" LDFLAGS="%{__global_ldflags}"
|
||||||
# contain a private copy of libfreeimage <sigh>
|
%else
|
||||||
FIP_OBJS=
|
%make_build -f Makefile.gnu CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}"
|
||||||
for i in Wrapper/FreeImagePlus/src/fip*.cpp; do
|
%make_build -f Makefile.fip CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}"
|
||||||
gcc -o $i.o $RPM_OPT_FLAGS -fPIC -fvisibility=hidden \
|
%endif
|
||||||
-ISource -IWrapper/FreeImagePlus -c $i
|
|
||||||
FIP_OBJS="$FIP_OBJS $i.o"
|
|
||||||
done
|
|
||||||
gcc -shared -LDist -o Dist/lib%{name}plus-%{version}.so \
|
|
||||||
-Wl,-soname,lib%{name}plus.so.%{major} $FIP_OBJS -lfreeimage-%{version}
|
|
||||||
|
|
||||||
pushd Wrapper/FreeImagePlus/doc
|
pushd Wrapper/FreeImagePlus/doc
|
||||||
doxygen FreeImagePlus.dox
|
doxygen FreeImagePlus.dox
|
||||||
@ -76,48 +106,122 @@ popd
|
|||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
install -Dpm 755 Dist/lib%{name}-%{version}.so %{buildroot}%{_libdir}/lib%{name}-%{version}.so
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_libdir}
|
ln -s lib%{name}-%{version}.so %{buildroot}%{_libdir}/lib%{name}.so
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_includedir}
|
|
||||||
|
|
||||||
install -m 755 Dist/lib%{name}-%{version}.so $RPM_BUILD_ROOT%{_libdir}
|
install -Dpm 755 Dist/lib%{name}plus-%{version}.so %{buildroot}%{_libdir}/lib%{name}plus-%{version}.so
|
||||||
ln -s lib%{name}-%{version}.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so.%{major}
|
ln -s lib%{name}plus-%{version}.so %{buildroot}%{_libdir}/lib%{name}plus.so
|
||||||
ln -s lib%{name}-%{version}.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so
|
|
||||||
|
|
||||||
install -m 755 Dist/lib%{name}plus-%{version}.so $RPM_BUILD_ROOT%{_libdir}
|
install -Dpm 644 Source/FreeImage.h %{buildroot}%{_includedir}/FreeImage.h
|
||||||
ln -s lib%{name}plus-%{version}.so \
|
install -Dpm 644 Wrapper/FreeImagePlus/FreeImagePlus.h %{buildroot}%{_includedir}/FreeImagePlus.h
|
||||||
$RPM_BUILD_ROOT%{_libdir}/lib%{name}plus.so.%{major}
|
|
||||||
ln -s lib%{name}plus-%{version}.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}plus.so
|
|
||||||
|
|
||||||
install -p -m 644 Source/FreeImage.h $RPM_BUILD_ROOT%{_includedir}
|
# install missing symlink (was giving no-ldconfig-symlink rpmlint errors)
|
||||||
install -p -m 644 Wrapper/FreeImagePlus/FreeImagePlus.h \
|
ldconfig -n %{buildroot}%{_libdir}
|
||||||
$RPM_BUILD_ROOT%{_includedir}
|
|
||||||
|
|
||||||
|
|
||||||
%clean
|
|
||||||
rm -rf $RPM_BUILD_ROOT
|
|
||||||
|
|
||||||
|
|
||||||
%post -p /sbin/ldconfig
|
%post -p /sbin/ldconfig
|
||||||
|
|
||||||
%postun -p /sbin/ldconfig
|
%postun -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%post plus -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%postun plus -p /sbin/ldconfig
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
%license license-*.txt
|
||||||
%doc Whatsnew.txt license-*.txt Wrapper/FreeImagePlus/WhatsNew_FIP.txt
|
%doc Whatsnew.txt
|
||||||
%{_libdir}/lib%{name}*-%{version}.so
|
%{_libdir}/lib%{name}-%{version}.so
|
||||||
%{_libdir}/lib%{name}*.so.%{major}
|
%{_libdir}/lib%{name}.so.%major
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root,-)
|
%doc Examples
|
||||||
%doc Wrapper/FreeImagePlus/doc/html
|
%{_includedir}/FreeImage.h
|
||||||
%{_includedir}/FreeImage*.h
|
|
||||||
%{_libdir}/lib%{name}.so
|
%{_libdir}/lib%{name}.so
|
||||||
|
|
||||||
|
%files plus
|
||||||
|
%doc Wrapper/FreeImagePlus/WhatsNew_FIP.txt
|
||||||
|
%{_libdir}/lib%{name}plus-%{version}.so
|
||||||
|
%{_libdir}/lib%{name}plus.so.%major
|
||||||
|
|
||||||
|
%files plus-devel
|
||||||
|
%doc Wrapper/FreeImagePlus/doc/html
|
||||||
|
%{_includedir}/FreeImagePlus.h
|
||||||
%{_libdir}/lib%{name}plus.so
|
%{_libdir}/lib%{name}plus.so
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Feb 18 2018 Sandro Mani <manisandro@gmail.coM> - 3.17.0-14
|
||||||
|
- Add missing BR: gcc-c++, make
|
||||||
|
|
||||||
|
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.17.0-13
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.17.0-12
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.17.0-11
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.17.0-10
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Feb 01 2017 Sandro Mani <manisandro@gmail.com> - 3.17.0-9
|
||||||
|
- Rebuild (libwebp)
|
||||||
|
|
||||||
|
* Tue Dec 27 2016 Jon Ciesla <limburgher@gmail.com> - 3.17.0-8
|
||||||
|
- Rebuild for new LibRaw.
|
||||||
|
|
||||||
|
* Tue Oct 04 2016 Sandro Mani <manisandro@gmail.com> - 3.17.0-7
|
||||||
|
- Fix CVE-2016-5684 (rhbz#1381517)
|
||||||
|
|
||||||
|
* Fri Aug 12 2016 Michal Toman <mtoman@fedoraproject.org> - 3.17.0-6
|
||||||
|
- -fPIC on 32-bit MIPS
|
||||||
|
|
||||||
|
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.17.0-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Dec 28 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 3.17.0-4
|
||||||
|
- Rebuilt for libwebp soname bump
|
||||||
|
|
||||||
|
* Thu Oct 15 2015 Karsten Hopp <karsten@redhat.com> 3.17.0-3
|
||||||
|
- ppc64 and ppc64le need -fPIC (rhbz#1272048)
|
||||||
|
|
||||||
|
* Wed Sep 30 2015 Sandro Mani <manisandro@gmail.com> - 3.17.0-2
|
||||||
|
- Fix under-linked library
|
||||||
|
|
||||||
|
* Thu Sep 17 2015 Sandro Mani <manisandro@gmail.com> - 3.17.0-1
|
||||||
|
- Update to 3.17.0
|
||||||
|
- Add fix for CVE-2015-0852 (#1257859)
|
||||||
|
- Put freeimage-plus in separate package
|
||||||
|
|
||||||
|
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.10.0-25
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 3.10.0-24
|
||||||
|
- Rebuilt for GCC 5 C++11 ABI change
|
||||||
|
|
||||||
|
* Thu Feb 19 2015 Rex Dieter <rdieter@fedoraproject.org> 3.10.0-23
|
||||||
|
- rebuild (gcc5)
|
||||||
|
|
||||||
|
* Wed Nov 26 2014 Rex Dieter <rdieter@fedoraproject.org> 3.10.0-22
|
||||||
|
- rebuild (openexr), tighten subpkg deps via %%{?_isa}
|
||||||
|
|
||||||
|
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.10.0-21
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.10.0-20
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Nov 27 2013 Rex Dieter <rdieter@fedoraproject.org> - 3.10.0-19
|
||||||
|
- rebuild (openexr)
|
||||||
|
|
||||||
|
* Mon Sep 09 2013 Bruno Wolff III <bruno@wolff.to> 3.10.0-18
|
||||||
|
- Rebuild for ilmbase related soname bumps
|
||||||
|
|
||||||
|
* Mon Aug 26 2013 Jon Ciesla <limburgher@gmail.com> - 3.10.0-17
|
||||||
|
- libmng rebuild.
|
||||||
|
|
||||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.10.0-16
|
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.10.0-16
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user