[freeimage] 38/47: Refreshed patches (line endings had to change); Lintian fixes: S-V 3.9.5, DM-Upload-Allowed removed
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Sat Sep 26 22:27:33 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository freeimage.
commit 33a48d9f219433a2a1ed46142bc3d3a32cc619aa
Author: Scott Howard <showard314 at gmail.com>
Date: Mon Jan 13 20:40:54 2014 -0500
Refreshed patches (line endings had to change); Lintian fixes: S-V 3.9.5, DM-Upload-Allowed removed
---
.gitignore | 1 +
Dist/delete.me | 0
debian/changelog | 4 +-
debian/control | 3 +-
debian/patches/disable_embedded_libraries.patch | 554 ++++++++++--------------
debian/patches/document-mode.patch | 77 ----
debian/patches/fix_ftbfs_amd64.patch | 16 +-
debian/patches/makefile_modifications.patch | 16 +-
debian/patches/series | 1 -
9 files changed, 252 insertions(+), 420 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..845ca06
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc
diff --git a/Dist/delete.me b/Dist/delete.me
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/changelog b/debian/changelog
index 2a5c17d..89dd3ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-freeimage (3.15.4-1) unstable; urgency=low
+freeimage (3.15.4-1) UNRELEASED; urgency=low
* QA Upload
* New upstream minor release
- Includes fix to build on !linux (Closes: #650485)
+ * Refreshed patches (line endings had to change)
+ * Lintian fixes: S-V 3.9.5, DM-Upload-Allowed removed
-- Scott Howard <showard at debian.org> Mon, 13 Jan 2014 17:10:33 -0500
diff --git a/debian/control b/debian/control
index 8b3f547..b6469d0 100644
--- a/debian/control
+++ b/debian/control
@@ -14,9 +14,8 @@ Build-Depends:
pkg-config,
tofrodos,
zlib1g-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.5
Section: libs
-DM-Upload-Allowed: yes
Homepage: http://freeimage.sourceforge.net/
Vcs-Git: git://git.debian.org/git/collab-maint/freeimage.git
Vcs-Browser: http://git.debian.org/?p=collab-maint/freeimage.git
diff --git a/debian/patches/disable_embedded_libraries.patch b/debian/patches/disable_embedded_libraries.patch
index fdb3fdf..97bb76e 100644
--- a/debian/patches/disable_embedded_libraries.patch
+++ b/debian/patches/disable_embedded_libraries.patch
@@ -17,175 +17,142 @@ Last-Update: 2011-12-04
Index: freeimage/gensrclist.sh
===================================================================
---- freeimage.orig/gensrclist.sh 2011-12-04 11:58:25.253788363 -0800
-+++ freeimage/gensrclist.sh 2011-12-04 19:29:25.151410188 -0800
+--- freeimage.orig/gensrclist.sh 2014-01-13 18:37:38.469158413 -0500
++++ freeimage/gensrclist.sh 2014-01-13 18:37:38.453158412 -0500
@@ -1,6 +1,7 @@
- #!/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 Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal Source/LibRawLite/libraw Source/LibRawLite/src"
-+DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibTIFF"
-+DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibTIFF"
-
- echo "VER_MAJOR = 3" > Makefile.srcs
- echo "VER_MINOR = 15.1" >> Makefile.srcs
+ #!/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/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal Source/LibRawLite/libraw Source/LibRawLite/src"
++DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibTIFF"
++DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibTIFF"
+
+ echo "VER_MAJOR = 3" > Makefile.srcs
+ echo "VER_MINOR = 15.4" >> Makefile.srcs
@@ -12,15 +13,17 @@
- egrep 'RelativePath=.*\.(c|cpp)' $DIR/*.2008.vcproj | cut -d'"' -f2 | tr '\\' '/' | awk '{print "'$DIR'/"$0}' | tr '\r\n' ' ' | tr -s ' ' >> Makefile.srcs
- fi
- done
-+echo -n ' Source/LibJPEG/transupp.c' >> Makefile.srcs
- echo >> Makefile.srcs
-
- echo -n "INCLS = " >> Makefile.srcs
--find . -name "*.h" -print | xargs echo >> Makefile.srcs
-+find . \( \( -name 'Lib*' -and -not -name 'LibTIFF' \) -or -name 'OpenEXR' -or -name 'ZLib' \) -prune -or -name '*.h' -print | sort | xargs echo -n >> Makefile.srcs
- echo >> Makefile.srcs
-
- echo -n "INCLUDE =" >> Makefile.srcs
- for DIR in $DIRLIST; do
- echo -n " -I$DIR" >> Makefile.srcs
- done
-+echo ' $(shell pkg-config --cflags zlib OpenEXR libraw libpng)' >> Makefile.srcs
- echo >> Makefile.srcs
-
+ egrep 'RelativePath=.*\.(c|cpp)' $DIR/*.2008.vcproj | cut -d'"' -f2 | tr '\\' '/' | awk '{print "'$DIR'/"$0}' | tr '\r\n' ' ' | tr -s ' ' >> Makefile.srcs
+ fi
+ done
++echo -n ' Source/LibJPEG/transupp.c' >> Makefile.srcs
+ echo >> Makefile.srcs
+
+ echo -n "INCLS = " >> Makefile.srcs
+-find . -name "*.h" -print | xargs echo >> Makefile.srcs
++find . \( \( -name 'Lib*' -and -not -name 'LibTIFF' \) -or -name 'OpenEXR' -or -name 'ZLib' \) -prune -or -name '*.h' -print | sort | xargs echo -n >> Makefile.srcs
+ echo >> Makefile.srcs
+
+ echo -n "INCLUDE =" >> Makefile.srcs
+ for DIR in $DIRLIST; do
+ echo -n " -I$DIR" >> Makefile.srcs
+ done
++echo ' $(shell pkg-config --cflags zlib OpenEXR libraw libpng)' >> Makefile.srcs
+ echo >> Makefile.srcs
+
Index: freeimage/genfipsrclist.sh
===================================================================
---- freeimage.orig/genfipsrclist.sh 2011-12-04 11:58:25.273788364 -0800
-+++ freeimage/genfipsrclist.sh 2011-12-04 12:09:55.297812870 -0800
+--- freeimage.orig/genfipsrclist.sh 2014-01-13 18:37:38.469158413 -0500
++++ freeimage/genfipsrclist.sh 2014-01-13 18:37:38.457158412 -0500
@@ -1,6 +1,7 @@
- #!/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 Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal Source/LibRawLite/libraw Source/LibRawLite/src Wrapper/FreeImagePlus"
-+DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibTIFF Wrapper/FreeImagePlus"
-+DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibTIFF Wrapper/FreeImagePlus"
-
-
- echo "VER_MAJOR = 3" > fipMakefile.srcs
+ #!/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/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal Source/LibRawLite/libraw Source/LibRawLite/src Wrapper/FreeImagePlus"
++DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibTIFF Wrapper/FreeImagePlus"
++DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibTIFF Wrapper/FreeImagePlus"
+
+
+ echo "VER_MAJOR = 3" > fipMakefile.srcs
@@ -13,11 +14,13 @@
- egrep 'RelativePath=.*\.(c|cpp)' $DIR/*.2008.vcproj | cut -d'"' -f2 | tr '\\' '/' | awk '{print "'$DIR'/"$0}' | tr '\r\n' ' ' | tr -s ' ' >> fipMakefile.srcs
- fi
- done
-+echo -n ' Source/LibJPEG/transupp.c' >> fipMakefile.srcs
- echo >> fipMakefile.srcs
-
- echo -n "INCLUDE =" >> fipMakefile.srcs
- for DIR in $DIRLIST; do
- echo -n " -I$DIR" >> fipMakefile.srcs
- done
-+echo ' $(shell pkg-config --cflags zlib OpenEXR libraw libpng)' >> fipMakefile.srcs
- echo >> fipMakefile.srcs
-
+ egrep 'RelativePath=.*\.(c|cpp)' $DIR/*.2008.vcproj | cut -d'"' -f2 | tr '\\' '/' | awk '{print "'$DIR'/"$0}' | tr '\r\n' ' ' | tr -s ' ' >> fipMakefile.srcs
+ fi
+ done
++echo -n ' Source/LibJPEG/transupp.c' >> fipMakefile.srcs
+ echo >> fipMakefile.srcs
+
+ echo -n "INCLUDE =" >> fipMakefile.srcs
+ for DIR in $DIRLIST; do
+ echo -n " -I$DIR" >> fipMakefile.srcs
+ done
++echo ' $(shell pkg-config --cflags zlib OpenEXR libraw libpng)' >> fipMakefile.srcs
+ echo >> fipMakefile.srcs
+
Index: freeimage/Source/FreeImage/ZLibInterface.cpp
===================================================================
---- freeimage.orig/Source/FreeImage/ZLibInterface.cpp 2011-12-04 11:58:25.313788366 -0800
-+++ freeimage/Source/FreeImage/ZLibInterface.cpp 2011-12-04 11:58:26.429788405 -0800
+--- freeimage.orig/Source/FreeImage/ZLibInterface.cpp 2014-01-13 18:37:38.469158413 -0500
++++ freeimage/Source/FreeImage/ZLibInterface.cpp 2014-01-13 18:37:38.457158412 -0500
@@ -19,10 +19,10 @@
- // 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) */
-+//#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.
+ // 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) */
++//#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 +115,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
- crc = crc32(crc, source, source_size);
- memcpy(target + 4 + dest_len, &crc, 4);
- memcpy(target + 8 + dest_len, &source_size, 4);
+ 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
+ crc = crc32(crc, source, source_size);
+ memcpy(target + 4 + dest_len, &crc, 4);
+ memcpy(target + 8 + dest_len, &source_size, 4);
Index: freeimage/Source/FreeImage/PluginJPEG.cpp
===================================================================
---- freeimage.orig/Source/FreeImage/PluginJPEG.cpp 2011-12-04 11:58:25.333788367 -0800
-+++ freeimage/Source/FreeImage/PluginJPEG.cpp 2011-12-04 11:58:26.429788405 -0800
+--- freeimage.orig/Source/FreeImage/PluginJPEG.cpp 2014-01-13 18:37:38.469158413 -0500
++++ freeimage/Source/FreeImage/PluginJPEG.cpp 2014-01-13 18:37:38.457158412 -0500
@@ -35,9 +35,10 @@
- #undef FAR
- #include <setjmp.h>
-
--#include "../LibJPEG/jinclude.h"
--#include "../LibJPEG/jpeglib.h"
--#include "../LibJPEG/jerror.h"
-+#include <sys/types.h>
-+#include <stdio.h>
-+#include <jpeglib.h>
-+#include <jerror.h>
- }
-
- #include "FreeImage.h"
-@@ -165,7 +166,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;
-@@ -354,12 +355,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
-@@ -387,7 +388,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;
+ #undef FAR
+ #include <setjmp.h>
+
+-#include "../LibJPEG/jinclude.h"
+-#include "../LibJPEG/jpeglib.h"
+-#include "../LibJPEG/jerror.h"
++#include <sys/types.h>
++#include <stdio.h>
++#include <jpeglib.h>
++#include <jerror.h>
+ }
+
+ #include "FreeImage.h"
Index: freeimage/Source/FreeImage/PluginEXR.cpp
===================================================================
---- freeimage.orig/Source/FreeImage/PluginEXR.cpp 2011-12-04 11:58:25.353788367 -0800
-+++ freeimage/Source/FreeImage/PluginEXR.cpp 2011-12-04 11:58:26.429788405 -0800
+--- freeimage.orig/Source/FreeImage/PluginEXR.cpp 2014-01-13 18:37:38.469158413 -0500
++++ freeimage/Source/FreeImage/PluginEXR.cpp 2014-01-13 18:37:38.457158412 -0500
@@ -22,16 +22,16 @@
-
- #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/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/ImfPreviewImage.h>
-+#include <OpenEXR/ImfChannelList.h>
-+#include <OpenEXR/ImfRgba.h>
-+#include <OpenEXR/ImfArray.h>
-+#include <OpenEXR/half.h>
-
-
- // ==========================================================
+
+ #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/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/ImfPreviewImage.h>
++#include <OpenEXR/ImfChannelList.h>
++#include <OpenEXR/ImfRgba.h>
++#include <OpenEXR/ImfArray.h>
++#include <OpenEXR/half.h>
+
+
+ // ==========================================================
Index: freeimage/Source/FreeImage/PluginJ2K.cpp
===================================================================
---- freeimage.orig/Source/FreeImage/PluginJ2K.cpp 2011-12-04 11:58:25.377788367 -0800
-+++ freeimage/Source/FreeImage/PluginJ2K.cpp 2011-12-04 11:58:26.429788405 -0800
+--- freeimage.orig/Source/FreeImage/PluginJ2K.cpp 2014-01-13 18:37:38.469158413 -0500
++++ freeimage/Source/FreeImage/PluginJ2K.cpp 2014-01-13 18:37:38.457158412 -0500
@@ -21,7 +21,7 @@
#include "FreeImage.h"
@@ -197,92 +164,94 @@ Index: freeimage/Source/FreeImage/PluginJ2K.cpp
// Plugin Interface
Index: freeimage/Source/FreeImage/PluginPNG.cpp
===================================================================
---- freeimage.orig/Source/FreeImage/PluginPNG.cpp 2011-12-04 11:58:25.397788368 -0800
-+++ freeimage/Source/FreeImage/PluginPNG.cpp 2011-12-04 11:58:26.433788406 -0800
+--- freeimage.orig/Source/FreeImage/PluginPNG.cpp 2014-01-13 18:37:38.469158413 -0500
++++ freeimage/Source/FreeImage/PluginPNG.cpp 2014-01-13 18:38:55.445160242 -0500
@@ -37,8 +37,7 @@
-
- // ----------------------------------------------------------
-
--#include "../ZLib/zlib.h"
--#include "../LibPNG/png.h"
-+#include <png.h>
-
- // ----------------------------------------------------------
-
-@@ -102,7 +101,10 @@
- tag = FreeImage_CreateTag();
- if(!tag) return FALSE;
-
-- DWORD tag_length = (DWORD) MAX(text_ptr[i].text_length, text_ptr[i].itxt_length);
-+ DWORD tag_length = text_ptr[i].text_length;
-+#ifdef PNG_iTXt_SUPPORTED
-+ tag_length = MAX(tag_length, text_ptr[i].itxt_length);
-+#endif
-
- FreeImage_SetTagLength(tag, tag_length);
- FreeImage_SetTagCount(tag, tag_length);
-@@ -145,13 +147,19 @@
- if(mdhandle) {
- do {
- memset(&text_metadata, 0, sizeof(png_text));
-+#ifdef PNG_iTXt_SUPPORTED
- text_metadata.compression = 1; // iTXt, none
-+#else
-+ text_metadata.compression = -1;
-+#endif
- 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);
-@@ -167,13 +175,19 @@
- FreeImage_GetMetadata(FIMD_XMP, dib, g_TagLib_XMPFieldName, &tag);
- if(tag && FreeImage_GetTagLength(tag)) {
- memset(&text_metadata, 0, sizeof(png_text));
-+#ifdef PNG_iTXt_SUPPORTED
- text_metadata.compression = 1; // iTXt, none
-+#else
-+ text_metadata.compression = -1;
-+#endif
- 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);
-@@ -554,7 +568,7 @@
-
- if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP)) {
- png_charp profile_name = NULL;
-- png_bytep profile_data = NULL;
-+ png_charp profile_data = NULL;
- png_uint_32 profile_length = 0;
- int compression_type;
-
-@@ -826,7 +840,7 @@
-
- FIICCPROFILE *iccProfile = FreeImage_GetICCProfile(dib);
- if (iccProfile->size && iccProfile->data) {
-- png_set_iCCP(png_ptr, info_ptr, "Embedded Profile", 0, (png_const_bytep)iccProfile->data, iccProfile->size);
-+ png_set_iCCP(png_ptr, info_ptr, "Embedded Profile", 0, (png_charp)iccProfile->data, iccProfile->size);
- }
-
- // write metadata
+
+ // ----------------------------------------------------------
+
+-#include "../ZLib/zlib.h"
+-#include "../LibPNG/png.h"
++#include <png.h>
+
+ // ----------------------------------------------------------
+
+@@ -106,7 +105,10 @@
+ tag = FreeImage_CreateTag();
+ if(!tag) return FALSE;
+
+- DWORD tag_length = (DWORD) MAX(text_ptr[i].text_length, text_ptr[i].itxt_length);
++ DWORD tag_length = text_ptr[i].text_length;
++#ifdef PNG_iTXt_SUPPORTED
++ tag_length = MAX(tag_length, text_ptr[i].itxt_length);
++#endif
+
+ FreeImage_SetTagLength(tag, tag_length);
+ FreeImage_SetTagCount(tag, tag_length);
+@@ -149,13 +151,19 @@
+ if(mdhandle) {
+ do {
+ memset(&text_metadata, 0, sizeof(png_text));
++#ifdef PNG_iTXt_SUPPORTED
+ text_metadata.compression = 1; // iTXt, none
++#else
++ text_metadata.compression = -1;
++#endif
+ 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);
+@@ -175,9 +183,11 @@
+ text_metadata.key = (char*)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);
+@@ -559,7 +569,7 @@
+
+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP)) {
+ png_charp profile_name = NULL;
+- png_bytep profile_data = NULL;
++ png_charp profile_data = NULL;
+ png_uint_32 profile_length = 0;
+ int compression_type;
+
+@@ -599,7 +609,9 @@
+ row_pointers[height - 1 - k] = FreeImage_GetScanLine(dib, k);
+ }
+
++#ifdef PNG_BENIGN_ERRORS_SUPPORTED
+ png_set_benign_errors(png_ptr, 1);
++#endif
+ png_read_image(png_ptr, row_pointers);
+
+ // check if the bitmap contains transparency, if so enable it in the header
+@@ -843,7 +855,7 @@
+
+ FIICCPROFILE *iccProfile = FreeImage_GetICCProfile(dib);
+ if (iccProfile->size && iccProfile->data) {
+- png_set_iCCP(png_ptr, info_ptr, "Embedded Profile", 0, (png_const_bytep)iccProfile->data, iccProfile->size);
++ png_set_iCCP(png_ptr, info_ptr, "Embedded Profile", 0, (png_charp)iccProfile->data, iccProfile->size);
+ }
+
+ // write metadata
Index: freeimage/Source/FreeImage/J2KHelper.cpp
===================================================================
---- freeimage.orig/Source/FreeImage/J2KHelper.cpp 2011-12-04 11:58:25.421788369 -0800
-+++ freeimage/Source/FreeImage/J2KHelper.cpp 2011-12-04 11:58:26.433788406 -0800
+--- freeimage.orig/Source/FreeImage/J2KHelper.cpp 2014-01-13 18:37:38.469158413 -0500
++++ freeimage/Source/FreeImage/J2KHelper.cpp 2014-01-13 18:37:38.461158412 -0500
@@ -21,7 +21,7 @@
#include "FreeImage.h"
@@ -292,43 +261,10 @@ Index: freeimage/Source/FreeImage/J2KHelper.cpp
/**
Divide an integer by a power of 2 and round upwards
-Index: freeimage/Source/FreeImage/PluginMNG.cpp
-===================================================================
---- freeimage.orig/Source/FreeImage/PluginMNG.cpp 2011-12-04 11:58:25.441788370 -0800
-+++ freeimage/Source/FreeImage/PluginMNG.cpp 2011-12-04 11:58:26.433788406 -0800
-@@ -22,14 +22,7 @@
- #include "FreeImage.h"
- #include "Utilities.h"
-
--#include "../LibMNG/libmng.h"
--//#include "../LibMNG/libmng_data.h"
--
--// ==========================================================
--// Plugin Interface
--// ==========================================================
--
--static int s_format_id;
-+#include <libmng.h>
-
- // ----------------------------------------------------------
- // Constants + headers
-@@ -41,6 +34,12 @@
- fi_handle file; // pointer to the file we're decoding
- } mngstuff;
-
-+// ==========================================================
-+// Plugin Interface
-+// ==========================================================
-+
-+static int s_format_id;
-+
- // ----------------------------------------------------------
- // Callbacks for the mng decoder
- // ----------------------------------------------------------
Index: freeimage/Source/FreeImage/PluginJP2.cpp
===================================================================
---- freeimage.orig/Source/FreeImage/PluginJP2.cpp 2011-12-04 11:58:25.465788371 -0800
-+++ freeimage/Source/FreeImage/PluginJP2.cpp 2011-12-04 11:58:26.433788406 -0800
+--- freeimage.orig/Source/FreeImage/PluginJP2.cpp 2014-01-13 18:37:38.469158413 -0500
++++ freeimage/Source/FreeImage/PluginJP2.cpp 2014-01-13 18:37:38.461158412 -0500
@@ -21,7 +21,7 @@
#include "FreeImage.h"
@@ -340,59 +276,39 @@ Index: freeimage/Source/FreeImage/PluginJP2.cpp
// Plugin Interface
Index: freeimage/Source/FreeImage/PluginRAW.cpp
===================================================================
---- freeimage.orig/Source/FreeImage/PluginRAW.cpp 2011-12-04 11:58:25.489788371 -0800
-+++ freeimage/Source/FreeImage/PluginRAW.cpp 2011-12-04 11:58:26.433788406 -0800
-@@ -23,7 +23,7 @@
- #include "Utilities.h"
- #include "../Metadata/FreeImageTag.h"
-
--#include "../LibRawLite/libraw/libraw.h"
-+#include <libraw/libraw.h>
-
- // ==========================================================
- // Plugin Interface
-@@ -115,6 +115,10 @@
-
- return sscanf(buffer.c_str(), fmt, val);
- }
-+ virtual void* make_jas_stream() {
-+ /* not implemented */
-+ return NULL;
-+ }
- };
-
- // ----------------------------------------------------------
-@@ -447,8 +451,6 @@
-
- // (-w) Use camera white balance, if possible (otherwise, fallback to auto_wb)
- RawProcessor.imgdata.params.use_camera_wb = 1;
-- // RAW data filtration mode during data unpacking and postprocessing
-- RawProcessor.imgdata.params.filtering_mode = LIBRAW_FILTERING_AUTOMATIC;
- // (-h) outputs the image in 50% size
- RawProcessor.imgdata.params.half_size = ((flags & RAW_HALFSIZE) == RAW_HALFSIZE) ? 1 : 0;
-
+--- freeimage.orig/Source/FreeImage/PluginRAW.cpp 2014-01-13 18:37:38.469158413 -0500
++++ freeimage/Source/FreeImage/PluginRAW.cpp 2014-01-13 18:37:38.461158412 -0500
+@@ -19,7 +19,7 @@
+ // Use at your own risk!
+ // ==========================================================
+
+-#include "../LibRawLite/libraw/libraw.h"
++#include <libraw/libraw.h>
+
+ #include "FreeImage.h"
+ #include "Utilities.h"
Index: freeimage/Source/FreeImageToolkit/JPEGTransform.cpp
===================================================================
---- freeimage.orig/Source/FreeImageToolkit/JPEGTransform.cpp 2011-12-04 11:58:25.517788373 -0800
-+++ freeimage/Source/FreeImageToolkit/JPEGTransform.cpp 2011-12-04 11:58:26.433788406 -0800
+--- freeimage.orig/Source/FreeImageToolkit/JPEGTransform.cpp 2014-01-13 18:37:38.469158413 -0500
++++ freeimage/Source/FreeImageToolkit/JPEGTransform.cpp 2014-01-13 18:37:38.461158412 -0500
@@ -25,9 +25,10 @@
- #undef FAR
- #include <setjmp.h>
-
--#include "../LibJPEG/jinclude.h"
--#include "../LibJPEG/jpeglib.h"
--#include "../LibJPEG/jerror.h"
-+#include <sys/types.h>
-+#include <stdio.h>
-+#include <jpeglib.h>
-+#include <jerror.h>
- #include "../LibJPEG/transupp.h"
- }
-
+ #undef FAR
+ #include <setjmp.h>
+
+-#include "../LibJPEG/jinclude.h"
+-#include "../LibJPEG/jpeglib.h"
+-#include "../LibJPEG/jerror.h"
++#include <sys/types.h>
++#include <stdio.h>
++#include <jpeglib.h>
++#include <jerror.h>
+ #include "../LibJPEG/transupp.h"
+ }
+
Index: freeimage/Makefile.fip
===================================================================
---- freeimage.orig/Makefile.fip 2011-12-04 11:58:25.209788361 -0800
-+++ freeimage/Makefile.fip 2011-12-04 19:27:18.935405706 -0800
+--- freeimage.orig/Makefile.fip 2014-01-13 18:37:38.469158413 -0500
++++ freeimage/Makefile.fip 2014-01-13 18:37:38.461158412 -0500
@@ -11,7 +11,7 @@
# Converts cr/lf to just lf
DOS2UNIX = dos2unix
@@ -404,8 +320,8 @@ Index: freeimage/Makefile.fip
MODULES := $(MODULES:.cpp=.o)
Index: freeimage/Makefile.gnu
===================================================================
---- freeimage.orig/Makefile.gnu 2011-12-04 11:58:25.189788361 -0800
-+++ freeimage/Makefile.gnu 2011-12-04 19:26:51.691404738 -0800
+--- freeimage.orig/Makefile.gnu 2014-01-13 18:37:38.469158413 -0500
++++ freeimage/Makefile.gnu 2014-01-13 18:37:38.461158412 -0500
@@ -11,7 +11,7 @@
# Converts cr/lf to just lf
DOS2UNIX = dos2unix
diff --git a/debian/patches/document-mode.patch b/debian/patches/document-mode.patch
deleted file mode 100644
index 32bf149..0000000
--- a/debian/patches/document-mode.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Index: freeimage-3.15.1/Source/FreeImage/PluginRAW.cpp
-===================================================================
---- freeimage-3.15.1.orig/Source/FreeImage/PluginRAW.cpp 2013-07-11 11:25:09.000000000 +0200
-+++ freeimage-3.15.1/Source/FreeImage/PluginRAW.cpp 2013-07-11 11:29:33.695264554 +0200
-@@ -44,42 +44,47 @@
- FreeImageIO *_io;
- fi_handle _handle;
- long _eof;
-+ INT64 _fsize;
-
- public:
- LibRaw_freeimage_datastream(FreeImageIO *io, fi_handle handle) : _io(io), _handle(handle) {
- long start_pos = io->tell_proc(handle);
- io->seek_proc(handle, 0, SEEK_END);
- _eof = io->tell_proc(handle);
-+ _fsize = _eof - start_pos;
- io->seek_proc(handle, start_pos, SEEK_SET);
- }
- ~LibRaw_freeimage_datastream() {
- }
-- virtual int valid() {
-+ int valid() {
- return (_io && _handle);
- }
-- virtual int read(void *buffer, size_t size, size_t count) {
-+ int read(void *buffer, size_t size, size_t count) {
- if(substream) return substream->read(buffer, size, count);
- return _io->read_proc(buffer, (unsigned)size, (unsigned)count, _handle);
- }
-- virtual int eof() {
-+ int eof() {
- if(substream) return substream->eof();
- return (_io->tell_proc(_handle) >= _eof);
- }
-- virtual int seek(INT64 offset, int origin) {
-+ int seek(INT64 offset, int origin) {
- if(substream) return substream->seek(offset, origin);
- return _io->seek_proc(_handle, (long)offset, origin);
- }
-- virtual INT64 tell() {
-+ INT64 tell() {
- if(substream) return substream->tell();
- return _io->tell_proc(_handle);
- }
-- virtual int get_char() {
-+ INT64 size() {
-+ return _fsize;
-+ }
-+ int get_char() {
- int c = 0;
- if(substream) return substream->get_char();
- if(!_io->read_proc(&c, 1, 1, _handle)) return -1;
- return c;
- }
-- virtual char* gets(char *buffer, int length) {
-+ char* gets(char *buffer, int length) {
- if (substream) return substream->gets(buffer, length);
- memset(buffer, 0, length);
- for(int i = 0; i < length; i++) {
-@@ -90,7 +95,7 @@
- }
- return buffer;
- }
-- virtual int scanf_one(const char *fmt, void* val) {
-+ int scanf_one(const char *fmt, void* val) {
- std::string buffer;
- char element = 0;
- bool bDone = false;
-@@ -115,7 +120,7 @@
-
- return sscanf(buffer.c_str(), fmt, val);
- }
-- virtual void* make_jas_stream() {
-+ void* make_jas_stream() {
- /* not implemented */
- return NULL;
- }
diff --git a/debian/patches/fix_ftbfs_amd64.patch b/debian/patches/fix_ftbfs_amd64.patch
index b2f6b83..722c88a 100644
--- a/debian/patches/fix_ftbfs_amd64.patch
+++ b/debian/patches/fix_ftbfs_amd64.patch
@@ -5,11 +5,11 @@ Index: freeimage/Source/FreeImage/PluginBMP.cpp
--- freeimage.orig/Source/FreeImage/PluginBMP.cpp 2011-12-03 21:40:26.000000000 -0800
+++ freeimage/Source/FreeImage/PluginBMP.cpp 2011-12-03 21:40:30.988882105 -0800
@@ -192,6 +192,8 @@
- return TRUE;
- }
-
-+#define MIN(a, b) ( ((a) < (b))? (a):(b) )
-+
- /**
- Load image pixels for 4-bit RLE compressed dib
- @param io FreeImage IO
+ return TRUE;
+ }
+
++#define MIN(a, b) ( ((a) < (b))? (a):(b) )
++
+ /**
+ Load image pixels for 4-bit RLE compressed dib
+ @param io FreeImage IO
diff --git a/debian/patches/makefile_modifications.patch b/debian/patches/makefile_modifications.patch
index c6d5b9f..b4d5cf2 100644
--- a/debian/patches/makefile_modifications.patch
+++ b/debian/patches/makefile_modifications.patch
@@ -4,8 +4,8 @@ options we're using by default, debugging should still be possible.
==========================================================================
Index: freeimage/Makefile.fip
===================================================================
---- freeimage.orig/Makefile.fip 2011-12-04 11:43:19.000000000 -0800
-+++ freeimage/Makefile.fip 2011-12-04 11:49:31.245769399 -0800
+--- freeimage.orig/Makefile.fip 2014-01-13 17:29:48.737061690 -0500
++++ freeimage/Makefile.fip 2014-01-13 17:29:48.729061689 -0500
@@ -15,10 +15,12 @@
MODULES = $(SRCS:.c=.o)
@@ -43,8 +43,8 @@ Index: freeimage/Makefile.fip
rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
Index: freeimage/Makefile.gnu
===================================================================
---- freeimage.orig/Makefile.gnu 2011-12-04 11:44:21.000000000 -0800
-+++ freeimage/Makefile.gnu 2011-12-04 11:49:10.365768658 -0800
+--- freeimage.orig/Makefile.gnu 2014-01-13 17:29:48.737061690 -0500
++++ freeimage/Makefile.gnu 2014-01-13 17:29:48.729061689 -0500
@@ -15,10 +15,12 @@
MODULES = $(SRCS:.c=.o)
@@ -71,11 +71,3 @@ Index: freeimage/Makefile.gnu
install:
install -d $(INCDIR) $(INSTALLDIR)
-@@ -67,7 +69,6 @@
- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
- ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
- ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
-- ldconfig
-
- clean:
- rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
diff --git a/debian/patches/series b/debian/patches/series
index b939270..c08a501 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
disable_embedded_libraries.patch
fix_ftbfs_amd64.patch
makefile_modifications.patch
-document-mode.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freeimage.git
More information about the debian-science-commits
mailing list