libs/tiff/patches/114-TIFFFaxTabEnt_bugfix.patch

   1 commit 8c9dbee088d8b43cdae47b9c5f711058bd1f17f1
   2 Author: erouault <erouault>
   3 Date:   Tue Dec 13 18:15:48 2016 +0000
   4
   5     * libtiff/tif_fax3.h: revert change done on 2016-01-09 that made
   6     Param member of TIFFFaxTabEnt structure a uint16 to reduce size of
   7     the binary. It happens that the Hylafax software uses the tables that
   8     follow this typedef (TIFFFaxMainTable, TIFFFaxWhiteTable,
   9     TIFFFaxBlackTable), also they are not in a public libtiff header.
  10     Raised by Lee Howard.
  11     Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2636
  12
  13 diff --git a/ChangeLog b/ChangeLog
  14 index ee6fd802..558db20e 100644
  15 --- a/ChangeLog
  16 +++ b/ChangeLog
  17 @@ -1,3 +1,13 @@
  18 +2016-12-13 Even Rouault <even.rouault at spatialys.com>
  19 +
  20 +       * libtiff/tif_fax3.h: revert change done on 2016-01-09 that made
  21 +       Param member of TIFFFaxTabEnt structure a uint16 to reduce size of
  22 +       the binary. It happens that the Hylafax software uses the tables that
  23 +       follow this typedef (TIFFFaxMainTable, TIFFFaxWhiteTable,
  24 +       TIFFFaxBlackTable), also they are not in a public libtiff header.
  25 +       Raised by Lee Howard.
  26 +       Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2636
  27 +
  28  2016-12-03 Even Rouault <even.rouault at spatialys.com>
  29
  30         * tools/tiffcp.c: replace assert( (bps % 8) == 0 ) by a non assert check.
  31 diff --git a/libtiff/tif_fax3.h b/libtiff/tif_fax3.h
  32 index e0b2ca6b..45ce43f1 100644
  33 --- a/libtiff/tif_fax3.h
  34 +++ b/libtiff/tif_fax3.h
  35 @@ -1,4 +1,4 @@
  36 -/* $Id: tif_fax3.h,v 1.11 2016-01-23 21:20:34 erouault Exp $ */
  37 +/* $Id: tif_fax3.h,v 1.12 2016-12-13 18:15:48 erouault Exp $ */
  38
  39  /*
  40   * Copyright (c) 1990-1997 Sam Leffler
  41 @@ -81,10 +81,12 @@ extern void _TIFFFax3fillruns(unsigned char*, uint32*, uint32*, uint32);
  42  #define S_MakeUp   11
  43  #define S_EOL      12
  44
  45 +/* WARNING: do not change the layout of this structure as the Halyfax software */
  46 +/* really depends on it. See http://bugzilla.maptools.org/show_bug.cgi?id=2636 */
  47  typedef struct {                /* state table entry */
  48         unsigned char State;    /* see above */
  49         unsigned char Width;    /* width of code in bits */
  50 -       uint16 Param;           /* unsigned 16-bit run length in bits */
  51 +       uint32 Param;           /* unsigned 32-bit run length in bits (holds on 16 bit actually, but cannot be changed. See above warning) */
  52  } TIFFFaxTabEnt;
  53
  54  extern const TIFFFaxTabEnt TIFFFaxMainTable[];