diff --git a/TesseractOCR/Makefile b/TesseractOCR/Makefile index 7bd131de..bc87d934 100644 --- a/TesseractOCR/Makefile +++ b/TesseractOCR/Makefile @@ -1,5 +1,5 @@ LEPTON_NAME = leptonica-1.72 -PNG_NAME = libpng-1.6.20 +PNG_NAME = libpng-1.6.34 JPEG_NAME = jpeg-9a TIFF_NAME = tiff-4.0.4 diff --git a/TesseractOCR/include/tesseract/genericvector.h b/TesseractOCR/include/tesseract/genericvector.h index 595e1e06..5f053aac 100644 --- a/TesseractOCR/include/tesseract/genericvector.h +++ b/TesseractOCR/include/tesseract/genericvector.h @@ -335,7 +335,7 @@ inline bool LoadDataFromFile(const STRING& filename, size_t size = ftell(fp); fseek(fp, 0, SEEK_SET); // Pad with a 0, just in case we treat the result as a string. - data->init_to_size(int(size) + 1, 0); + data->init_to_size(size + 1, 0); bool result = fread(&(*data)[0], 1, size, fp) == size; fclose(fp); return result; diff --git a/TesseractOCR/include/tesseract/helpers.h b/TesseractOCR/include/tesseract/helpers.h index 9afba41f..a913eb82 100644 --- a/TesseractOCR/include/tesseract/helpers.h +++ b/TesseractOCR/include/tesseract/helpers.h @@ -30,7 +30,7 @@ // Remove newline (if any) at the end of the string. inline void chomp_string(char *str) { - int last_index = int(strlen(str)) - 1; + int last_index = strlen(str) - 1; while (last_index >= 0 && (str[last_index] == '\n' || str[last_index] == '\r')) { str[last_index--] = '\0'; diff --git a/TesseractOCR/include/tiff.h b/TesseractOCR/include/tiff.h index fb39634c..bc46acd0 100644 --- a/TesseractOCR/include/tiff.h +++ b/TesseractOCR/include/tiff.h @@ -1,4 +1,4 @@ -/* $Id: tiff.h,v 1.70 2016-01-23 21:20:34 erouault Exp $ */ +/* $Id: tiff.h,v 1.69 2014-04-02 17:23:06 fwarmerdam Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -279,7 +279,7 @@ typedef enum { #define PREDICTOR_FLOATINGPOINT 3 /* floating point predictor */ #define TIFFTAG_WHITEPOINT 318 /* image white point */ #define TIFFTAG_PRIMARYCHROMATICITIES 319 /* !primary chromaticities */ -#define TIFFTAG_COLORMAP 320 /* RGB map for palette image */ +#define TIFFTAG_COLORMAP 320 /* RGB map for pallette image */ #define TIFFTAG_HALFTONEHINTS 321 /* !highlight+shadow info */ #define TIFFTAG_TILEWIDTH 322 /* !tile width in pixels */ #define TIFFTAG_TILELENGTH 323 /* !tile height in pixels */ @@ -358,7 +358,7 @@ typedef enum { #define TIFFTAG_JPEGRESTARTINTERVAL 515 /* !restart interval length */ #define TIFFTAG_JPEGLOSSLESSPREDICTORS 517 /* !lossless proc predictor */ #define TIFFTAG_JPEGPOINTTRANSFORM 518 /* !lossless point transform */ -#define TIFFTAG_JPEGQTABLES 519 /* !Q matrix offsets */ +#define TIFFTAG_JPEGQTABLES 519 /* !Q matrice offsets */ #define TIFFTAG_JPEGDCTABLES 520 /* !DCT table offsets */ #define TIFFTAG_JPEGACTABLES 521 /* !AC coefficient offsets */ #define TIFFTAG_YCBCRCOEFFICIENTS 529 /* !RGB -> YCbCr transform */ diff --git a/TesseractOCR/include/tiffio.h b/TesseractOCR/include/tiffio.h index ef61b5c0..038b6701 100644 --- a/TesseractOCR/include/tiffio.h +++ b/TesseractOCR/include/tiffio.h @@ -1,4 +1,4 @@ -/* $Id: tiffio.h,v 1.94 2017-01-11 19:02:49 erouault Exp $ */ +/* $Id: tiffio.h,v 1.91 2012-07-29 15:45:29 tgl Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -208,7 +208,7 @@ struct _TIFFRGBAImage { uint16 orientation; /* image orientation */ uint16 req_orientation; /* requested orientation */ uint16 photometric; /* image photometric interp */ - uint16* redcmap; /* colormap palette */ + uint16* redcmap; /* colormap pallete */ uint16* greencmap; uint16* bluecmap; /* get image data routine */ @@ -225,7 +225,7 @@ struct _TIFFRGBAImage { TIFFYCbCrToRGB* ycbcr; /* YCbCr conversion state */ TIFFCIELabToRGB* cielab; /* CIE L*a*b conversion state */ - uint8* UaToAa; /* Unassociated alpha to associated alpha conversion LUT */ + uint8* UaToAa; /* Unassociated alpha to associated alpha convertion LUT */ uint8* Bitdepth16To8; /* LUT for conversion from 16bit to 8bit values */ int row_offset; @@ -293,7 +293,6 @@ extern TIFFCodec* TIFFGetConfiguredCODECs(void); */ extern void* _TIFFmalloc(tmsize_t s); -extern void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz); extern void* _TIFFrealloc(void* p, tmsize_t s); extern void _TIFFmemset(void* p, int v, tmsize_t c); extern void _TIFFmemcpy(void* d, const void* s, tmsize_t c); @@ -431,8 +430,6 @@ extern int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*, int, int); extern int TIFFReadRGBAStrip(TIFF*, uint32, uint32 * ); extern int TIFFReadRGBATile(TIFF*, uint32, uint32, uint32 * ); -extern int TIFFReadRGBAStripExt(TIFF*, uint32, uint32 *, int stop_on_error ); -extern int TIFFReadRGBATileExt(TIFF*, uint32, uint32, uint32 *, int stop_on_error ); extern int TIFFRGBAImageOK(TIFF*, char [1024]); extern int TIFFRGBAImageBegin(TIFFRGBAImage*, TIFF*, int, char [1024]); extern int TIFFRGBAImageGet(TIFFRGBAImage*, uint32*, uint32, uint32); diff --git a/TesseractOCR/include/tiffvers.h b/TesseractOCR/include/tiffvers.h index 890e433d..1ed5b8f3 100644 --- a/TesseractOCR/include/tiffvers.h +++ b/TesseractOCR/include/tiffvers.h @@ -1,4 +1,4 @@ -#define TIFFLIB_VERSION_STR "LIBTIFF, Version 4.0.8\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc." +#define TIFFLIB_VERSION_STR "LIBTIFF, Version 4.0.4\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc." /* * This define can be used in code that requires * compilation-related definitions specific to a @@ -6,4 +6,4 @@ * version checking should be done based on the * string returned by TIFFGetVersion. */ -#define TIFFLIB_VERSION 20170521 +#define TIFFLIB_VERSION 20150621 diff --git a/TesseractOCR/lib/libjpeg.a b/TesseractOCR/lib/libjpeg.a index 08f21292..2739dded 100644 Binary files a/TesseractOCR/lib/libjpeg.a and b/TesseractOCR/lib/libjpeg.a differ diff --git a/TesseractOCR/lib/libjpeg_all.a b/TesseractOCR/lib/libjpeg_all.a new file mode 100644 index 00000000..2739dded Binary files /dev/null and b/TesseractOCR/lib/libjpeg_all.a differ diff --git a/TesseractOCR/lib/liblept.a b/TesseractOCR/lib/liblept.a index ad1909d2..cd08ab96 100644 Binary files a/TesseractOCR/lib/liblept.a and b/TesseractOCR/lib/liblept.a differ diff --git a/TesseractOCR/lib/liblept_all.a b/TesseractOCR/lib/liblept_all.a new file mode 100644 index 00000000..cd08ab96 Binary files /dev/null and b/TesseractOCR/lib/liblept_all.a differ diff --git a/TesseractOCR/lib/libpng.a b/TesseractOCR/lib/libpng.a index 51a2662f..fe0ac2fe 100644 Binary files a/TesseractOCR/lib/libpng.a and b/TesseractOCR/lib/libpng.a differ diff --git a/TesseractOCR/lib/libpng_all.a b/TesseractOCR/lib/libpng_all.a new file mode 100644 index 00000000..fe0ac2fe Binary files /dev/null and b/TesseractOCR/lib/libpng_all.a differ diff --git a/TesseractOCR/lib/libtesseract.a b/TesseractOCR/lib/libtesseract.a index ee822d81..78ca3592 100644 Binary files a/TesseractOCR/lib/libtesseract.a and b/TesseractOCR/lib/libtesseract.a differ diff --git a/TesseractOCR/lib/libtesseract_all.a b/TesseractOCR/lib/libtesseract_all.a new file mode 100644 index 00000000..78ca3592 Binary files /dev/null and b/TesseractOCR/lib/libtesseract_all.a differ diff --git a/TesseractOCR/lib/libtiff.a b/TesseractOCR/lib/libtiff.a index feba6891..c404a0f5 100644 Binary files a/TesseractOCR/lib/libtiff.a and b/TesseractOCR/lib/libtiff.a differ diff --git a/TesseractOCR/lib/libtiff_all.a b/TesseractOCR/lib/libtiff_all.a new file mode 100644 index 00000000..c404a0f5 Binary files /dev/null and b/TesseractOCR/lib/libtiff_all.a differ