From 56869aeb8d0f716670232e4f20b4acf350b3efdc Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 8 Jan 2011 15:25:44 +0000 Subject: [PATCH] 2011-01-08 16:25 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + src/3rd/png/png.dif * src/3rd/png/Makefile + Added new .dif for png to cover recent local changes. * src/3rd/jpeg/jpeg.dif * src/3rd/jpeg/README ! Minor fix to .dif. ; Both patches sent by Tamas. --- harbour/ChangeLog | 11 +++++++++++ harbour/src/3rd/jpeg/README | 9 +++++---- harbour/src/3rd/jpeg/jpeg.dif | 37 ++--------------------------------- harbour/src/3rd/png/Makefile | 2 +- harbour/src/3rd/png/png.dif | 28 ++++++++++++++++++++++++++ 5 files changed, 47 insertions(+), 40 deletions(-) create mode 100644 harbour/src/3rd/png/png.dif diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7b3e4da1e6..c765da824e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,17 @@ The license applies to all entries newer than 2009-04-28. */ +2011-01-08 16:25 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + + src/3rd/png/png.dif + * src/3rd/png/Makefile + + Added new .dif for png to cover recent local changes. + + * src/3rd/jpeg/jpeg.dif + * src/3rd/jpeg/README + ! Minor fix to .dif. + + ; Both patches sent by Tamas. + 2011-01-08 13:52 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * src/3rd/png/pnglconf.h ! Fix for watcom compilers. Patch by Tamas. diff --git a/harbour/src/3rd/jpeg/README b/harbour/src/3rd/jpeg/README index da0c488f6d..e923a32004 100644 --- a/harbour/src/3rd/jpeg/README +++ b/harbour/src/3rd/jpeg/README @@ -1,7 +1,7 @@ The Independent JPEG Group's JPEG software ========================================== -README for release 8a of 28-Feb-2010 +README for release 8b of 16-May-2010 ==================================== This distribution contains the eighth public release of the Independent JPEG @@ -254,8 +254,8 @@ ARCHIVE LOCATIONS The "official" archive site for this software is www.ijg.org. The most recent released version can always be found there in directory "files". This particular version will be archived as -http://www.ijg.org/files/jpegsrc.v8a.tar.gz, and in Windows-compatible -"zip" archive format as http://www.ijg.org/files/jpegsr8a.zip. +http://www.ijg.org/files/jpegsrc.v8b.tar.gz, and in Windows-compatible +"zip" archive format as http://www.ijg.org/files/jpegsr8b.zip. The JPEG FAQ (Frequently Asked Questions) article is a source of some general information about JPEG. @@ -285,7 +285,8 @@ Thank to John Korejwa and Massimo Ballerini for inviting me to fruitful consultations in Boston, MA and Milan, Italy. Thank to Hendrik Elstner, Roland Fassauer, Simone Zuck, Guenther -Maier-Gerber, and Walter Stoeber for corresponding business development. +Maier-Gerber, Walter Stoeber, and Fred Schmitz for corresponding +business development. Thank to Nico Zschach and Dirk Stelling of the technical support team at the Digital Images company in Halle for providing me with extra diff --git a/harbour/src/3rd/jpeg/jpeg.dif b/harbour/src/3rd/jpeg/jpeg.dif index ad0928dd5b..b0b3b578f6 100644 --- a/harbour/src/3rd/jpeg/jpeg.dif +++ b/harbour/src/3rd/jpeg/jpeg.dif @@ -1,6 +1,6 @@ diff -urN jpeg.orig/jmorecfg.h jpeg/jmorecfg.h ---- jpeg.orig/jmorecfg.h 2010-07-15 17:16:26.470234033 +0200 -+++ jpeg/jmorecfg.h 2010-07-15 17:16:26.470234033 +0200 +--- jpeg.orig/jmorecfg.h 2011-01-08 14:50:04.826240653 +0100 ++++ jpeg/jmorecfg.h 2011-01-08 14:50:04.826240653 +0100 @@ -138,7 +138,9 @@ #ifdef CHAR_IS_UNSIGNED typedef char UINT8; @@ -45,36 +45,3 @@ diff -urN jpeg.orig/jmorecfg.h jpeg/jmorecfg.h #define LOCAL(type) static type /* a function referenced thru EXTERNs: */ #define GLOBAL(type) type -diff -urN jpeg.orig/README jpeg/README ---- jpeg.orig/README 2010-07-15 17:16:22.240234269 +0200 -+++ jpeg/README 2010-07-15 17:16:22.240234269 +0200 -@@ -1,7 +1,7 @@ - The Independent JPEG Group's JPEG software - ========================================== - --README for release 8b of 16-May-2010 -+README for release 8a of 28-Feb-2010 - ==================================== - - This distribution contains the eighth public release of the Independent JPEG -@@ -254,8 +254,8 @@ - The "official" archive site for this software is www.ijg.org. - The most recent released version can always be found there in - directory "files". This particular version will be archived as --http://www.ijg.org/files/jpegsrc.v8b.tar.gz, and in Windows-compatible --"zip" archive format as http://www.ijg.org/files/jpegsr8b.zip. -+http://www.ijg.org/files/jpegsrc.v8a.tar.gz, and in Windows-compatible -+"zip" archive format as http://www.ijg.org/files/jpegsr8a.zip. - - The JPEG FAQ (Frequently Asked Questions) article is a source of some - general information about JPEG. -@@ -285,8 +285,7 @@ - fruitful consultations in Boston, MA and Milan, Italy. - - Thank to Hendrik Elstner, Roland Fassauer, Simone Zuck, Guenther --Maier-Gerber, Walter Stoeber, and Fred Schmitz for corresponding --business development. -+Maier-Gerber, and Walter Stoeber for corresponding business development. - - Thank to Nico Zschach and Dirk Stelling of the technical support team - at the Digital Images company in Halle for providing me with extra diff --git a/harbour/src/3rd/png/Makefile b/harbour/src/3rd/png/Makefile index 3492b642e1..d8230fe5a0 100644 --- a/harbour/src/3rd/png/Makefile +++ b/harbour/src/3rd/png/Makefile @@ -74,7 +74,7 @@ endif # ORIGIN http://www.libpng.org/pub/png/libpng.html # VER 1.5.0 # URL http://prdownloads.sourceforge.net/libpng/libpng-1.5.0.tar.gz?download -# DIFF +# DIFF png.dif # # MAP LICENSE # MAP png.c diff --git a/harbour/src/3rd/png/png.dif b/harbour/src/3rd/png/png.dif new file mode 100644 index 0000000000..58e6bc7f72 --- /dev/null +++ b/harbour/src/3rd/png/png.dif @@ -0,0 +1,28 @@ +diff -urN png.orig/png.h png/png.h +--- png.orig/png.h 2011-01-08 14:45:07.826240493 +0100 ++++ png/png.h 2011-01-08 14:45:07.826240493 +0100 +@@ -398,7 +398,7 @@ + /* If pnglibconf.h is missing, you can + * copy scripts/pnglibconf.h.prebuilt to pnglibconf.h + */ +-# include "pnglibconf.h" ++# include "pnglconf.h" + #endif + + #ifndef PNG_VERSION_INFO_ONLY +diff -urN png.orig/pnglconf.h png/pnglconf.h +--- png.orig/pnglconf.h 2011-01-08 14:45:07.746241210 +0100 ++++ png/pnglconf.h 2011-01-08 14:45:07.746241210 +0100 +@@ -22,7 +22,11 @@ + #define PNG_QUANTIZE_RED_BITS 5 + #define PNG_USER_WIDTH_MAX 1000000L + #define PNG_QUANTIZE_GREEN_BITS 5 +-#define PNG_API_RULE 0 ++#if defined( __WATCOMC__ ) ++# define PNG_API_RULE 2 ++#else ++# define PNG_API_RULE 0 ++#endif + #define PNG_QUANTIZE_BLUE_BITS 5 + #define PNG_USER_CHUNK_CACHE_MAX 0 + #define PNG_USER_HEIGHT_MAX 1000000L