From b7c6c6619cbe1660d52dc95c13649dc922bff8a7 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 9 Jul 2012 23:23:49 +0000 Subject: [PATCH] 2012-07-10 01:23 UTC+0200 Viktor Szakats (harbour syenar.net) * src/3rd/tiff/read.c * src/3rd/tiff/tiff.dif ! another correction to local patch --- harbour/ChangeLog | 5 ++++ harbour/src/3rd/tiff/read.c | 2 +- harbour/src/3rd/tiff/tiff.dif | 50 +++++++++++++++++------------------ 3 files changed, 31 insertions(+), 26 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 049ad6bfb7..cdc5a38c00 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,11 @@ The license applies to all entries newer than 2009-04-28. */ +2012-07-10 01:23 UTC+0200 Viktor Szakats (harbour syenar.net) + * src/3rd/tiff/read.c + * src/3rd/tiff/tiff.dif + ! another correction to local patch + 2012-07-10 01:17 UTC+0200 Viktor Szakats (harbour syenar.net) * src/3rd/tiff/print.c * src/3rd/tiff/tiff.dif diff --git a/harbour/src/3rd/tiff/read.c b/harbour/src/3rd/tiff/read.c index 9910bc1103..b224e838e4 100644 --- a/harbour/src/3rd/tiff/read.c +++ b/harbour/src/3rd/tiff/read.c @@ -126,7 +126,7 @@ TIFFFillStripPartial( TIFF *tif, int strip, tmsize_t read_ahead, int restart ) if (cc != to_read) { TIFFErrorExt(tif->tif_clientdata, module, - "Read error at scanline %lu; got " TIFF_UINT64_FORMAT " bytes, expected %I64u", + "Read error at scanline %lu; got " TIFF_UINT64_FORMAT " bytes, expected " TIFF_UINT64_FORMAT, (unsigned long) tif->tif_row, (TIFF_UINT64_T) cc, (TIFF_UINT64_T) to_read); diff --git a/harbour/src/3rd/tiff/tiff.dif b/harbour/src/3rd/tiff/tiff.dif index faf688052f..a52a77c3ba 100644 --- a/harbour/src/3rd/tiff/tiff.dif +++ b/harbour/src/3rd/tiff/tiff.dif @@ -1,6 +1,6 @@ diff -urN tiff.orig\dirread.c tiff\dirread.c ---- tiff.orig\dirread.c Tue Jul 10 01:16:50 2012 -+++ tiff\dirread.c Tue Jul 10 01:16:50 2012 +--- tiff.orig\dirread.c Tue Jul 10 01:22:55 2012 ++++ tiff\dirread.c Tue Jul 10 01:22:55 2012 @@ -2216,7 +2216,7 @@ case TIFF_FLOAT: if (tif->tif_flags&TIFF_SWAB) @@ -37,8 +37,8 @@ diff -urN tiff.orig\dirread.c tiff\dirread.c static enum TIFFReadDirEntryErr TIFFReadDirEntryCheckRangeSlong8Long8(uint64 value) diff -urN tiff.orig\dirwrite.c tiff\dirwrite.c ---- tiff.orig\dirwrite.c Tue Jul 10 01:16:50 2012 -+++ tiff\dirwrite.c Tue Jul 10 01:16:50 2012 +--- tiff.orig\dirwrite.c Tue Jul 10 01:22:55 2012 ++++ tiff\dirwrite.c Tue Jul 10 01:22:55 2012 @@ -2238,7 +2238,7 @@ { assert(count<0x40000000); @@ -58,8 +58,8 @@ diff -urN tiff.orig\dirwrite.c tiff\dirwrite.c TIFFSwabArrayOfDouble(value,count); return(TIFFWriteDirectoryTagData(tif,ndir,dir,tag,TIFF_DOUBLE,count,count*8,value)); diff -urN tiff.orig\dumpmode.c tiff\dumpmode.c ---- tiff.orig\dumpmode.c Tue Jul 10 01:16:50 2012 -+++ tiff\dumpmode.c Tue Jul 10 01:16:50 2012 +--- tiff.orig\dumpmode.c Tue Jul 10 01:22:55 2012 ++++ tiff\dumpmode.c Tue Jul 10 01:22:55 2012 @@ -80,19 +80,11 @@ static const char module[] = "DumpModeDecode"; (void) s; @@ -84,8 +84,8 @@ diff -urN tiff.orig\dumpmode.c tiff\dumpmode.c } /* diff -urN tiff.orig\luv.c tiff\luv.c ---- tiff.orig\luv.c Tue Jul 10 01:16:50 2012 -+++ tiff\luv.c Tue Jul 10 01:16:50 2012 +--- tiff.orig\luv.c Tue Jul 10 01:22:55 2012 ++++ tiff\luv.c Tue Jul 10 01:22:55 2012 @@ -224,17 +224,10 @@ tp[i++] |= (int16)*bp++ << shft; } @@ -147,8 +147,8 @@ diff -urN tiff.orig\luv.c tiff\luv.c tif->tif_rawcc = cc; return (0); diff -urN tiff.orig\lzw.c tiff\lzw.c ---- tiff.orig\lzw.c Tue Jul 10 01:16:50 2012 -+++ tiff\lzw.c Tue Jul 10 01:16:50 2012 +--- tiff.orig\lzw.c Tue Jul 10 01:22:55 2012 ++++ tiff\lzw.c Tue Jul 10 01:22:55 2012 @@ -549,15 +549,9 @@ sp->dec_maxcodep = maxcodep; @@ -186,8 +186,8 @@ diff -urN tiff.orig\lzw.c tiff\lzw.c } return (1); diff -urN tiff.orig\print.c tiff\print.c ---- tiff.orig\print.c Tue Jul 10 01:16:50 2012 -+++ tiff\print.c Tue Jul 10 01:16:50 2012 +--- tiff.orig\print.c Tue Jul 10 01:22:55 2012 ++++ tiff\print.c Tue Jul 10 01:22:55 2012 @@ -96,27 +96,13 @@ || fip->field_type == TIFF_FLOAT) fprintf(fd, "%f", ((float *) raw_data)[j]); @@ -278,8 +278,8 @@ diff -urN tiff.orig\print.c tiff\print.c } diff -urN tiff.orig\read.c tiff\read.c ---- tiff.orig\read.c Tue Jul 10 01:16:50 2012 -+++ tiff\read.c Tue Jul 10 01:16:50 2012 +--- tiff.orig\read.c Tue Jul 10 01:22:55 2012 ++++ tiff\read.c Tue Jul 10 01:22:55 2012 @@ -125,19 +125,11 @@ cc = TIFFReadFile(tif, tif->tif_rawdata + unused_data, to_read); @@ -287,7 +287,7 @@ diff -urN tiff.orig\read.c tiff\read.c -#if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) TIFFErrorExt(tif->tif_clientdata, module, - "Read error at scanline %lu; got %I64u bytes, expected %I64u", -+ "Read error at scanline %lu; got " TIFF_UINT64_FORMAT " bytes, expected %I64u", ++ "Read error at scanline %lu; got " TIFF_UINT64_FORMAT " bytes, expected " TIFF_UINT64_FORMAT, (unsigned long) tif->tif_row, - (unsigned __int64) cc, - (unsigned __int64) to_read); @@ -491,8 +491,8 @@ diff -urN tiff.orig\read.c tiff\read.c } if (isMapped(tif) && diff -urN tiff.orig\strip.c tiff\strip.c ---- tiff.orig\strip.c Tue Jul 10 01:16:50 2012 -+++ tiff\strip.c Tue Jul 10 01:16:50 2012 +--- tiff.orig\strip.c Tue Jul 10 01:22:55 2012 ++++ tiff\strip.c Tue Jul 10 01:22:55 2012 @@ -154,17 +154,10 @@ if (bytecount == 0) @@ -514,8 +514,8 @@ diff -urN tiff.orig\strip.c tiff\strip.c } diff -urN tiff.orig\thunder.c tiff\thunder.c ---- tiff.orig\thunder.c Tue Jul 10 01:16:50 2012 -+++ tiff\thunder.c Tue Jul 10 01:16:50 2012 +--- tiff.orig\thunder.c Tue Jul 10 01:22:55 2012 ++++ tiff\thunder.c Tue Jul 10 01:22:55 2012 @@ -143,21 +143,12 @@ tif->tif_rawcp = (uint8*) bp; tif->tif_rawcc = cc; @@ -542,8 +542,8 @@ diff -urN tiff.orig\thunder.c tiff\thunder.c } diff -urN tiff.orig\tiffconf.h tiff\tiffconf.h ---- tiff.orig\tiffconf.h Tue Jul 10 01:16:51 2012 -+++ tiff\tiffconf.h Tue Jul 10 01:16:51 2012 +--- tiff.orig\tiffconf.h Tue Jul 10 01:22:55 2012 ++++ tiff\tiffconf.h Tue Jul 10 01:22:55 2012 @@ -7,44 +7,62 @@ #ifndef _TIFFCONF_ #define _TIFFCONF_ @@ -702,8 +702,8 @@ diff -urN tiff.orig\tiffconf.h tiff\tiffconf.h #endif /* _TIFFCONF_ */ diff -urN tiff.orig\tiffiop.h tiff\tiffiop.h ---- tiff.orig\tiffiop.h Tue Jul 10 01:16:51 2012 -+++ tiff\tiffiop.h Tue Jul 10 01:16:51 2012 +--- tiff.orig\tiffiop.h Tue Jul 10 01:22:55 2012 ++++ tiff\tiffiop.h Tue Jul 10 01:22:55 2012 @@ -30,7 +30,7 @@ * ``Library-private'' definitions. */ @@ -714,8 +714,8 @@ diff -urN tiff.orig\tiffiop.h tiff\tiffiop.h #ifdef HAVE_FCNTL_H # include diff -urN tiff.orig\unix.c tiff\unix.c ---- tiff.orig\unix.c Tue Jul 10 01:16:51 2012 -+++ tiff\unix.c Tue Jul 10 01:16:51 2012 +--- tiff.orig\unix.c Tue Jul 10 01:22:55 2012 ++++ tiff\unix.c Tue Jul 10 01:22:55 2012 @@ -29,7 +29,7 @@ * Windows Common RunTime Library. */