Skip to content

Commit

Permalink
Draft: feat: upgrade bundled libtiff to 4.6 (#227)
Browse files Browse the repository at this point in the history 
* feat: upgrade bundled libtiff to 4.6

* feat: upgrade bundled libtiff to 4.6

* put back the way it was, lets try having clients that need C++ do independent imports

* lets put back cmake version too, so we don't even break this part

* update binding gyp as well for node

---------

Co-authored-by: Gal Kahana <galk@ziprecruiter.com>
  • Loading branch information
@galkahana
galkahana and galkahana authored Oct 15, 2023
1 parent 8753bab commit 333d31d
Show file tree
Hide file tree
Showing 63 changed files with 44,240 additions and 24,160 deletions.
11 changes: 11 additions & 0 deletions LibTiff/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ tif_fax3.c
tif_fax3sm.c
tif_flush.c
tif_getimage.c
tif_hash_set.c
tif_jbig.c
tif_jpeg.c
tif_luv.c
Expand Down Expand Up @@ -51,6 +52,7 @@ tiffvers.h
tif_config.h
tif_dir.h
tif_fax3.h
tif_hash_set.h
tif_predict.h
uvcode.h

Expand All @@ -66,6 +68,15 @@ target_include_directories(LibTiff
$<INSTALL_INTERFACE:include/LibTiff>
)

#
# Check for unistd.h
#
include(CheckIncludeFile)
check_include_file(unistd.h T_HAVE_UNISTD_H)
if(T_HAVE_UNISTD_H)
target_compile_definitions(LibTiff PUBLIC HAVE_UNISTD_H=1)
endif(T_HAVE_UNISTD_H)

target_compile_definitions(LibTiff PUBLIC
_CRT_SECURE_NO_DEPRECATE=1
AVOID_WIN32_FILEIO=1
Expand Down
14 changes: 12 additions & 2 deletions LibTiff/binding.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
'type': 'static_library',
'dependencies': [
'<(module_root_dir)/src/deps/Zlib/binding.gyp:zlib'
],
],
'defines': [
'_CRT_SECURE_NO_DEPRECATE=1',
'AVOID_WIN32_FILEIO=1',
Expand All @@ -24,7 +24,15 @@
'TIF_PLATFORM_CONSOLE=1',
'FILLODER_LSB2MSB=1'
],
'include_dirs': [
'conditions': [
['OS == "win"', {
}, {
"defines": [
'HAVE_UNISTD_H=1'
]
}]
],
'include_dirs': [
'<(module_root_dir)/src/deps/Zlib',
],
'sources': [
Expand All @@ -44,6 +52,7 @@
'tif_fax3sm.c',
'tif_flush.c',
'tif_getimage.c',
'tif_hash_set.c',
'tif_jbig.c',
'tif_jpeg.c',
'tif_luv.c',
Expand Down Expand Up @@ -76,6 +85,7 @@
'tif_config.h',
'tif_dir.h',
'tif_fax3.h',
'tif_hash_set.h',
'tif_predict.h',
'uvcode.h'
]
Expand Down
272 changes: 272 additions & 0 deletions LibTiff/mkg3states.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,272 @@
/*
* Copyright (c) 1991-1997 Sam Leffler
* Copyright (c) 1991-1997 Silicon Graphics, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and
* its documentation for any purpose is hereby granted without fee, provided
* that (i) the above copyright notices and this permission notice appear in
* all copies of the software and related documentation, and (ii) the names of
* Sam Leffler and Silicon Graphics may not be used in any advertising or
* publicity relating to the software without the specific, prior written
* permission of Sam Leffler and Silicon Graphics.
*
* THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
* EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
* WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
*
* IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
* ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
* OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
* WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
* LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THIS SOFTWARE.
*/

/* Initialise fax decoder tables
* Decoder support is derived, with permission, from the code
* in Frank Cringle's viewfax program;
* Copyright (C) 1990, 1995 Frank D. Cringle.
*/
#include "libport.h"
#include "tif_config.h"

#include <stdio.h>
#include <stdlib.h>
#include <string.h>

#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

#include "tif_fax3.h"

#define streq(a, b) (strcmp(a, b) == 0)

/* NB: can't use names in tif_fax3.h 'cuz they are declared const */
TIFFFaxTabEnt MainTable[128];
TIFFFaxTabEnt WhiteTable[4096];
TIFFFaxTabEnt BlackTable[8192];

struct proto
{
uint16_t code; /* right justified, lsb-first, zero filled */
uint16_t val; /* (pixel count)<<4 + code width */
};

static struct proto Pass[] = {{0x0008, 4}, {0, 0}};

static struct proto Horiz[] = {{0x0004, 3}, {0, 0}};

static struct proto V0[] = {{0x0001, 1}, {0, 0}};

static struct proto VR[] = {{0x0006, (1 << 4) + 3},
{0x0030, (2 << 4) + 6},
{0x0060, (3 << 4) + 7},
{0, 0}};

static struct proto VL[] = {{0x0002, (1 << 4) + 3},
{0x0010, (2 << 4) + 6},
{0x0020, (3 << 4) + 7},
{0, 0}};

static struct proto Ext[] = {{0x0040, 7}, {0, 0}};

static struct proto EOLV[] = {{0x0000, 7}, {0, 0}};

static struct proto MakeUpW[] = {
{0x001b, 1029}, {0x0009, 2053}, {0x003a, 3078}, {0x0076, 4103},
{0x006c, 5128}, {0x00ec, 6152}, {0x0026, 7176}, {0x00a6, 8200},
{0x0016, 9224}, {0x00e6, 10248}, {0x0066, 11273}, {0x0166, 12297},
{0x0096, 13321}, {0x0196, 14345}, {0x0056, 15369}, {0x0156, 16393},
{0x00d6, 17417}, {0x01d6, 18441}, {0x0036, 19465}, {0x0136, 20489},
{0x00b6, 21513}, {0x01b6, 22537}, {0x0032, 23561}, {0x0132, 24585},
{0x00b2, 25609}, {0x0006, 26630}, {0x01b2, 27657}, {0, 0}};

static struct proto MakeUpB[] = {
{0x03c0, 1034}, {0x0130, 2060}, {0x0930, 3084}, {0x0da0, 4108},
{0x0cc0, 5132}, {0x02c0, 6156}, {0x0ac0, 7180}, {0x06c0, 8205},
{0x16c0, 9229}, {0x0a40, 10253}, {0x1a40, 11277}, {0x0640, 12301},
{0x1640, 13325}, {0x09c0, 14349}, {0x19c0, 15373}, {0x05c0, 16397},
{0x15c0, 17421}, {0x0dc0, 18445}, {0x1dc0, 19469}, {0x0940, 20493},
{0x1940, 21517}, {0x0540, 22541}, {0x1540, 23565}, {0x0b40, 24589},
{0x1b40, 25613}, {0x04c0, 26637}, {0x14c0, 27661}, {0, 0}};

static struct proto MakeUp[] = {
{0x0080, 28683}, {0x0180, 29707}, {0x0580, 30731}, {0x0480, 31756},
{0x0c80, 32780}, {0x0280, 33804}, {0x0a80, 34828}, {0x0680, 35852},
{0x0e80, 36876}, {0x0380, 37900}, {0x0b80, 38924}, {0x0780, 39948},
{0x0f80, 40972}, {0, 0}};

static struct proto TermW[] = {
{0x00ac, 8}, {0x0038, 22}, {0x000e, 36}, {0x0001, 52}, {0x000d, 68},
{0x0003, 84}, {0x0007, 100}, {0x000f, 116}, {0x0019, 133}, {0x0005, 149},
{0x001c, 165}, {0x0002, 181}, {0x0004, 198}, {0x0030, 214}, {0x000b, 230},
{0x002b, 246}, {0x0015, 262}, {0x0035, 278}, {0x0072, 295}, {0x0018, 311},
{0x0008, 327}, {0x0074, 343}, {0x0060, 359}, {0x0010, 375}, {0x000a, 391},
{0x006a, 407}, {0x0064, 423}, {0x0012, 439}, {0x000c, 455}, {0x0040, 472},
{0x00c0, 488}, {0x0058, 504}, {0x00d8, 520}, {0x0048, 536}, {0x00c8, 552},
{0x0028, 568}, {0x00a8, 584}, {0x0068, 600}, {0x00e8, 616}, {0x0014, 632},
{0x0094, 648}, {0x0054, 664}, {0x00d4, 680}, {0x0034, 696}, {0x00b4, 712},
{0x0020, 728}, {0x00a0, 744}, {0x0050, 760}, {0x00d0, 776}, {0x004a, 792},
{0x00ca, 808}, {0x002a, 824}, {0x00aa, 840}, {0x0024, 856}, {0x00a4, 872},
{0x001a, 888}, {0x009a, 904}, {0x005a, 920}, {0x00da, 936}, {0x0052, 952},
{0x00d2, 968}, {0x004c, 984}, {0x00cc, 1000}, {0x002c, 1016}, {0, 0}};

static struct proto TermB[] = {
{0x03b0, 10}, {0x0002, 19}, {0x0003, 34}, {0x0001, 50}, {0x0006, 67},
{0x000c, 84}, {0x0004, 100}, {0x0018, 117}, {0x0028, 134}, {0x0008, 150},
{0x0010, 167}, {0x0050, 183}, {0x0070, 199}, {0x0020, 216}, {0x00e0, 232},
{0x0030, 249}, {0x03a0, 266}, {0x0060, 282}, {0x0040, 298}, {0x0730, 315},
{0x00b0, 331}, {0x01b0, 347}, {0x0760, 363}, {0x00a0, 379}, {0x0740, 395},
{0x00c0, 411}, {0x0530, 428}, {0x0d30, 444}, {0x0330, 460}, {0x0b30, 476},
{0x0160, 492}, {0x0960, 508}, {0x0560, 524}, {0x0d60, 540}, {0x04b0, 556},
{0x0cb0, 572}, {0x02b0, 588}, {0x0ab0, 604}, {0x06b0, 620}, {0x0eb0, 636},
{0x0360, 652}, {0x0b60, 668}, {0x05b0, 684}, {0x0db0, 700}, {0x02a0, 716},
{0x0aa0, 732}, {0x06a0, 748}, {0x0ea0, 764}, {0x0260, 780}, {0x0a60, 796},
{0x04a0, 812}, {0x0ca0, 828}, {0x0240, 844}, {0x0ec0, 860}, {0x01c0, 876},
{0x0e40, 892}, {0x0140, 908}, {0x01a0, 924}, {0x09a0, 940}, {0x0d40, 956},
{0x0340, 972}, {0x05a0, 988}, {0x0660, 1004}, {0x0e60, 1020}, {0, 0}};

static struct proto EOLH[] = {{0x0000, 11}, {0, 0}};

static void FillTable(TIFFFaxTabEnt *T, int Size, struct proto *P, int State)
{
int limit = 1 << Size;

while (P->val)
{
int width = P->val & 15;
int param = P->val >> 4;
int incr = 1 << width;
int code;
for (code = P->code; code < limit; code += incr)
{
TIFFFaxTabEnt *E = T + code;
E->State = State;
E->Width = width;
E->Param = param;
}
P++;
}
}

static char *storage_class = "";
static char *const_class = "";
static int packoutput = 1;
static char *prebrace = "";
static char *postbrace = "";

void WriteTable(FILE *fd, const TIFFFaxTabEnt *T, int Size, const char *name)
{
int i;
char *sep;

fprintf(fd, "%s %s TIFFFaxTabEnt %s[%d] = {", storage_class, const_class,
name, Size);
if (packoutput)
{
sep = "\n";
for (i = 0; i < Size; i++)
{
fprintf(fd, "%s%s%d,%d,%d%s", sep, prebrace, T->State, T->Width,
(int)T->Param, postbrace);
if (((i + 1) % 10) == 0)
sep = ",\n";
else
sep = ",";
T++;
}
}
else
{
sep = "\n ";
for (i = 0; i < Size; i++)
{
fprintf(fd, "%s%s%3d,%3d,%4d%s", sep, prebrace, T->State, T->Width,
(int)T->Param, postbrace);
if (((i + 1) % 6) == 0)
sep = ",\n ";
else
sep = ",";
T++;
}
}
fprintf(fd, "\n};\n");
}

/* initialise the huffman code tables */
int main(int argc, char *argv[])
{
FILE *fd;
char *outputfile;
int c;

#if !HAVE_DECL_OPTARG
extern int optind;
extern char *optarg;
#endif

while ((c = getopt(argc, argv, "c:s:bp")) != -1)
switch (c)
{
case 'c':
const_class = optarg;
break;
case 's':
storage_class = optarg;
break;
case 'p':
packoutput = 0;
break;
case 'b':
prebrace = "{";
postbrace = "}";
break;
case '?':
fprintf(stderr,
"usage: %s [-c const] [-s storage] [-p] [-b] file\n",
argv[0]);
return (-1);
}
outputfile = optind < argc ? argv[optind] : "g3states.h";
fd = fopen(outputfile, "w");
if (fd == NULL)
{
fprintf(stderr, "%s: %s: Cannot create output file.\n", argv[0],
outputfile);
return (-2);
}
FillTable(MainTable, 7, Pass, S_Pass);
FillTable(MainTable, 7, Horiz, S_Horiz);
FillTable(MainTable, 7, V0, S_V0);
FillTable(MainTable, 7, VR, S_VR);
FillTable(MainTable, 7, VL, S_VL);
FillTable(MainTable, 7, Ext, S_Ext);
FillTable(MainTable, 7, EOLV, S_EOL);
FillTable(WhiteTable, 12, MakeUpW, S_MakeUpW);
FillTable(WhiteTable, 12, MakeUp, S_MakeUp);
FillTable(WhiteTable, 12, TermW, S_TermW);
FillTable(WhiteTable, 12, EOLH, S_EOL);
FillTable(BlackTable, 13, MakeUpB, S_MakeUpB);
FillTable(BlackTable, 13, MakeUp, S_MakeUp);
FillTable(BlackTable, 13, TermB, S_TermB);
FillTable(BlackTable, 13, EOLH, S_EOL);

fprintf(fd, "/* WARNING, this file was automatically generated by the\n");
fprintf(fd, " mkg3states program */\n");
fprintf(fd, "#include <stdint.h>\n");
fprintf(fd, "#include \"tiff.h\"\n");
fprintf(fd, "#include \"tif_fax3.h\"\n");
WriteTable(fd, MainTable, 128, "TIFFFaxMainTable");
WriteTable(fd, WhiteTable, 4096, "TIFFFaxWhiteTable");
WriteTable(fd, BlackTable, 8192, "TIFFFaxBlackTable");
fprintf(fd, "/*\n"
" * Local Variables:\n"
" * mode: c\n"
" * c-basic-offset: 8\n"
" * fill-column: 78\n"
" * End:\n"
" */\n");
fclose(fd);
return (0);
}
Loading

0 comments on commit 333d31d

Please sign in to comment.