You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
54 lines
2.3 KiB
54 lines
2.3 KiB
commit 8c9dbee088d8b43cdae47b9c5f711058bd1f17f1
|
|
Author: erouault <erouault>
|
|
Date: Tue Dec 13 18:15:48 2016 +0000
|
|
|
|
* libtiff/tif_fax3.h: revert change done on 2016-01-09 that made
|
|
Param member of TIFFFaxTabEnt structure a uint16 to reduce size of
|
|
the binary. It happens that the Hylafax software uses the tables that
|
|
follow this typedef (TIFFFaxMainTable, TIFFFaxWhiteTable,
|
|
TIFFFaxBlackTable), also they are not in a public libtiff header.
|
|
Raised by Lee Howard.
|
|
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2636
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
index ee6fd802..558db20e 100644
|
|
--- a/ChangeLog
|
|
+++ b/ChangeLog
|
|
@@ -1,3 +1,13 @@
|
|
+2016-12-13 Even Rouault <even.rouault at spatialys.com>
|
|
+
|
|
+ * libtiff/tif_fax3.h: revert change done on 2016-01-09 that made
|
|
+ Param member of TIFFFaxTabEnt structure a uint16 to reduce size of
|
|
+ the binary. It happens that the Hylafax software uses the tables that
|
|
+ follow this typedef (TIFFFaxMainTable, TIFFFaxWhiteTable,
|
|
+ TIFFFaxBlackTable), also they are not in a public libtiff header.
|
|
+ Raised by Lee Howard.
|
|
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2636
|
|
+
|
|
2016-12-03 Even Rouault <even.rouault at spatialys.com>
|
|
|
|
* tools/tiffcp.c: replace assert( (bps % 8) == 0 ) by a non assert check.
|
|
diff --git a/libtiff/tif_fax3.h b/libtiff/tif_fax3.h
|
|
index e0b2ca6b..45ce43f1 100644
|
|
--- a/libtiff/tif_fax3.h
|
|
+++ b/libtiff/tif_fax3.h
|
|
@@ -1,4 +1,4 @@
|
|
-/* $Id: tif_fax3.h,v 1.11 2016-01-23 21:20:34 erouault Exp $ */
|
|
+/* $Id: tif_fax3.h,v 1.12 2016-12-13 18:15:48 erouault Exp $ */
|
|
|
|
/*
|
|
* Copyright (c) 1990-1997 Sam Leffler
|
|
@@ -81,10 +81,12 @@ extern void _TIFFFax3fillruns(unsigned char*, uint32*, uint32*, uint32);
|
|
#define S_MakeUp 11
|
|
#define S_EOL 12
|
|
|
|
+/* WARNING: do not change the layout of this structure as the Halyfax software */
|
|
+/* really depends on it. See http://bugzilla.maptools.org/show_bug.cgi?id=2636 */
|
|
typedef struct { /* state table entry */
|
|
unsigned char State; /* see above */
|
|
unsigned char Width; /* width of code in bits */
|
|
- uint16 Param; /* unsigned 16-bit run length in bits */
|
|
+ uint32 Param; /* unsigned 32-bit run length in bits (holds on 16 bit actually, but cannot be changed. See above warning) */
|
|
} TIFFFaxTabEnt;
|
|
|
|
extern const TIFFFaxTabEnt TIFFFaxMainTable[];
|