Merge pull request #39 from dynarithmic/development

Update source to version 5.4.2
dynarithmic · Oct 14, 2023 · 4c089ed · 4c089ed
2 parents 726b45c + d2ff9f4
commit 4c089ed
Show file tree

Hide file tree

Showing 505 changed files with 63,029 additions and 44,654 deletions.
diff --git a/binaries/32bit/32bit_FullDemo.zip b/binaries/32bit/32bit_FullDemo.zip
diff --git a/binaries/32bit/32bit_FullDemo_hash.txt b/binaries/32bit/32bit_FullDemo_hash.txt
@@ -1,4 +1,4 @@
-MD5: 4ba228394a030b581180fdadb17fa305
-SHA1: 6300ca68f47e5098035ccd0cb6ad9d04f4d7b103
-SHA256: 1e2329080a53e88170b074020ade1c1b000d7a446758788ce79d3f8ab596a428
-SHA512: d182225e97a98b67f8c25667493a3c4eda1bf0d390f5e6b1c081c56a5040f78dd2547ed88c41c385afae8c2ebc87feed5f124b1ed41d8016add5ef9ef8426360
+MD5: 13f91f94248536a0a4b74c0000419483
+SHA1: b3a884cd67bf0d87e030b387a3289afe70c6d880
+SHA256: 71afe10b44f579e19cc863a9d5b38aeaad06dfb8a55974bf8f7e5161c4add5c1
+SHA512: 5d6e6bdf6874154cf8bc15a9df80a32e671fd48436dfda6e9c42a42c18fbc703ff83f5cf9e9492474f67cc4c95eb43bdebb4a1e00fd6d189d3d74c94fc72c446
diff --git a/binaries/32bit/release_libraries.zip b/binaries/32bit/release_libraries.zip
diff --git a/binaries/32bit/release_ziphashes32.txt b/binaries/32bit/release_ziphashes32.txt
@@ -1,4 +1,4 @@
-MD5 hash of "release_libraries.zip" (16 bytes) = 39d8d5f7ed93e7eb0bd72225558e4c19
-SHA1 hash of "release_libraries.zip" (20 bytes) = 4702a0bfd643e0683ba7fac04f7476f8812ac64f
-SHA256 hash of "release_libraries.zip" (32 bytes) = 184538858562c71261b0b44a061e70e0947e51826de03a62173c08d014e93f7f
+MD5 hash of "release_libraries.zip" (16 bytes) = e96ff56ca3366d35bb31579cdb9ccc69
+SHA1 hash of "release_libraries.zip" (20 bytes) = fd10cab57aa3723f8dc5f75ded86bee6d74ed275
+SHA256 hash of "release_libraries.zip" (32 bytes) = 522501ee6ed69b311bd203557e205d7d95a1c6f596e201ff1c3f7de1b0b8e05c
 
diff --git a/binaries/32bit_debug/debug_libraries.zip b/binaries/32bit_debug/debug_libraries.zip
diff --git a/binaries/32bit_debug/debug_ziphashes32.txt b/binaries/32bit_debug/debug_ziphashes32.txt
@@ -1,4 +1,4 @@
-MD5 hash of "debug_libraries.zip" (16 bytes) = 50b8ff8ddb6750a5716bc9e6e7728278
-SHA1 hash of "debug_libraries.zip" (20 bytes) = d74e8a6e32bfc7f5100327233a23724e2b018acc
-SHA256 hash of "debug_libraries.zip" (32 bytes) = 2b0307aeda14999b8d84409abcf4cffe002d2aca52cc63c8fbc70c3fe0598861
+MD5 hash of "debug_libraries.zip" (16 bytes) = 5323eda46f9391b6ec149976b8625b15
+SHA1 hash of "debug_libraries.zip" (20 bytes) = e2b4c9e217894fa0acbe76e2cabe2c5ce3593c84
+SHA256 hash of "debug_libraries.zip" (32 bytes) = 8dcdbb376bdc7c0d6606a82af531edd04725e9f3dd1c2f1d038ddf2454ea7996
 
diff --git a/binaries/64bit/64bit_FullDemo.zip b/binaries/64bit/64bit_FullDemo.zip
diff --git a/binaries/64bit/64bit_FullDemo_hash.txt b/binaries/64bit/64bit_FullDemo_hash.txt
@@ -1,4 +1,4 @@
-MD5: 33cf9cb3e747468db43f49c7d5da41c4
-SHA1: 683d3ad3b2c4c360ce1f479a109467c63171a76b
-SHA256: 1477c96cd644d8a0aaf662091fe385719cb6466e281e98f46e0a3eceadbe161e
-SHA512: 19b4588e948b1e59e9f9f7782253f0632c9bbb250d408dcc0c9ed12288bfd51a3053b31b655f7a271b2d8ba2fa0332c1c238b44142d0f3a4b5f573548998bc50
+MD5: 39d9689d424ccacf590adec5a035ac23
+SHA1: 56143dcc736d1b94cf21d7d9bb0c8d066c974eff
+SHA256: 184591ef544caa5704843b6fcfe2933165fb143f294904a0fa293a31f9d504b1
+SHA512: 99d903f652aa41f4752ea9cf2c3d3003ee9fcb3cc711c7aa0e0a360d0690f10ae58cf222fab17c1c653fbb856b76c1dafb7b7713bb7aa8bcb059d2837f17c2c9
diff --git a/binaries/64bit/release_libraries.zip b/binaries/64bit/release_libraries.zip
diff --git a/binaries/64bit/release_ziphashes64.txt b/binaries/64bit/release_ziphashes64.txt
@@ -1,4 +1,4 @@
-MD5 hash of "release_libraries.zip" (16 bytes) = 3763899a7cea3279ac417ca009a03833
-SHA1 hash of "release_libraries.zip" (20 bytes) = 57f41a80f4e85b836c5bea203bac9dd9722dc4d1
-SHA256 hash of "release_libraries.zip" (32 bytes) = dbee22d1123609836a2a2b9660555f720fe6c7df5d83ddf1aa542d7f97735e06
+MD5 hash of "release_libraries.zip" (16 bytes) = c0bf11c8b94120777b9f598af19679b4
+SHA1 hash of "release_libraries.zip" (20 bytes) = 89e39ef0ee464d215e0f1d3228c21e65587695e5
+SHA256 hash of "release_libraries.zip" (32 bytes) = 0e33840f681ed0f8e45cd40bb90a5e93ee9f7d26b509e72f6840745ce70f3e02
 
diff --git a/binaries/64bit_debug/debug_libraries.zip b/binaries/64bit_debug/debug_libraries.zip
diff --git a/binaries/64bit_debug/debug_ziphashes64.txt b/binaries/64bit_debug/debug_ziphashes64.txt
@@ -1,4 +1,4 @@
-MD5 hash of "debug_libraries.zip" (16 bytes) = 6f56cec380b7cc552c2b5311731428a9
-SHA1 hash of "debug_libraries.zip" (20 bytes) = ee1207c3700cbfb477ed3b04e0a1f88c5d991293
-SHA256 hash of "debug_libraries.zip" (32 bytes) = 48dfa7ee61ba9154acca8c3d64f4698d32559d4a536deee76853170e261f31eb
+MD5 hash of "debug_libraries.zip" (16 bytes) = b8a1ebf166655ad708134d30aae1eab4
+SHA1 hash of "debug_libraries.zip" (20 bytes) = fa8752a1fb7039e860a95a9e021ce9d7a0a527c5
+SHA256 hash of "debug_libraries.zip" (32 bytes) = 2114b8ea9e5b8c4719aab64b5af4068de0fd5e57b048344b96246d7e015d9664
 
diff --git a/demos/c_cpp_includes/dtwain_version.h b/demos/c_cpp_includes/dtwain_version.h
@@ -23,7 +23,7 @@
 
 #define DTWAIN_MAJOR_VERSION           5
 #define DTWAIN_MINOR_VERSION           4
-#define DTWAIN_PATCHLEVEL_VERSION      1
+#define DTWAIN_PATCHLEVEL_VERSION      2
 
 #define DTWAIN_STRINGER_2_(x) #x
 #define DTWAIN_STRINGER_(x) DTWAIN_STRINGER_2_(x)

diff --git a/demos/cpp_wrapper/PDFDemo/PDFDemo.cpp b/demos/cpp_wrapper/PDFDemo/PDFDemo.cpp
@@ -59,7 +59,7 @@ int Runner::Run()
 
             // Set the file transfer options
             fileOptions.
-                set_name("c:\\dtwain_ctest\\PDFDemo.pdf").  // File name
+                set_name("PDFDemo.pdf").  // File name
                 set_type(filetype_value::pdf);  // set the file type to PDF
 
             // Start the acquisition process

diff --git a/source/FreeImage/Source/FreeImage/PluginJ2K.cpp b/source/FreeImage/Source/FreeImage/PluginJ2K.cpp
@@ -23,6 +23,9 @@
 #include "Utilities.h"
 #include "../LibOpenJPEG/openjpeg.h"
 #include "J2KHelper.h"
+#include <string>
+
+#define MAX_BYTES_IN_MARKER 65533L
 
 // ==========================================================
 // Plugin Interface
@@ -47,6 +50,9 @@ static void j2k_warning_callback(const char *msg, void *client_data) {
 	FreeImage_OutputMessageProc(s_format_id, "Warning: %s", msg);
 }
 
+static BOOL
+j2k_write_comment(opj_cparameters_t* cinfo, FIBITMAP* dib, std::string& comment);
+
 // ==========================================================
 // Plugin Implementation
 // ==========================================================
@@ -269,6 +275,8 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void
 			opj_set_error_handler(c_codec, j2k_error_callback, NULL);
 
 			// setup the encoder parameters using the current image and using user parameters
+			std::string comment;
+			j2k_write_comment(&parameters, dib, comment);
 			opj_setup_encoder(c_codec, &parameters, image);
 
 			// encode the image
@@ -326,3 +334,22 @@ InitJ2K(Plugin *plugin, int format_id) {
 	plugin->supports_export_type_proc = SupportsExportType;
 	plugin->supports_icc_profiles_proc = NULL;
 }
+
+static BOOL j2k_write_comment(opj_cparameters_t* cinfo, FIBITMAP* dib, std::string& comment)
+{
+    FITAG* tag = NULL;
+
+    // write user comment as a JPEG_COM marker
+    FreeImage_GetMetadata(FIMD_COMMENTS, dib, "Comment", &tag);
+    if (tag) 
+	{
+        const char* tag_value = (char*)FreeImage_GetTagValue(tag);
+        if (NULL != tag_value) 
+		{
+			comment = (const char *)tag_value;
+			cinfo->cp_comment = &comment[0];
+			return TRUE;
+        }
+    }
+    return FALSE;
+}
diff --git a/source/FreeImage/Source/LibJPEG/README b/source/FreeImage/Source/LibJPEG/README
@@ -1,7 +1,7 @@
 The Independent JPEG Group's JPEG software
 ==========================================
 
-README for release 9c of 14-Jan-2018
+README for release 9e of 16-Jan-2022
 ====================================
 
 This distribution contains the ninth public release of the Independent JPEG
@@ -10,8 +10,8 @@ to use it for any purpose, subject to the conditions under LEGAL ISSUES, below.
 
 This software is the work of Tom Lane, Guido Vollbeding, Philip Gladstone,
 Bill Allombert, Jim Boucher, Lee Crocker, Bob Friesenhahn, Ben Jackson,
-Julian Minguillon, Luis Ortiz, George Phillips, Davide Rossi, Ge' Weijers,
-and other members of the Independent JPEG Group.
+John Korejwa, Julian Minguillon, Luis Ortiz, George Phillips, Davide Rossi,
+Ge' Weijers, and other members of the Independent JPEG Group.
 
 IJG is not affiliated with the ISO/IEC JTC1/SC29/WG1 standards committee
 (previously known as JPEG, together with ITU-T SG16).
@@ -38,6 +38,7 @@ User documentation:
                     rdjpgcom, and wrjpgcom.
   *.1               Unix-style man pages for programs (same info as usage.txt).
   wizard.txt        Advanced usage instructions for JPEG wizards only.
+  cdaltui.txt       Description of alternate user interface for cjpeg/djpeg.
   change.log        Version-to-version change highlights.
 Programmer and internal documentation:
   libjpeg.txt       How to use the JPEG library in your own programs.
@@ -115,7 +116,7 @@ with respect to this software, its quality, accuracy, merchantability, or
 fitness for a particular purpose.  This software is provided "AS IS", and you,
 its user, assume the entire risk as to its quality and accuracy.
 
-This software is copyright (C) 1991-2018, Thomas G. Lane, Guido Vollbeding.
+This software is copyright (C) 1991-2022, Thomas G. Lane, Guido Vollbeding.
 All Rights Reserved except as specified below.
 
 Permission is hereby granted to use, copy, modify, and distribute this
@@ -152,13 +153,6 @@ The same holds for its supporting scripts (config.guess, config.sub,
 ltmain.sh).  Another support script, install-sh, is copyright by X Consortium
 but is also freely distributable.
 
-The IJG distribution formerly included code to read and write GIF files.
-To avoid entanglement with the Unisys LZW patent (now expired), GIF reading
-support has been removed altogether, and the GIF writer has been simplified
-to produce "uncompressed GIFs".  This technique does not use the LZW
-algorithm; the resulting GIF files are larger than usual, but are readable
-by all standard GIF decoders.
-
 
 REFERENCES
 ==========
@@ -172,7 +166,7 @@ The best short technical introduction to the JPEG compression algorithm is
 (Adjacent articles in that issue discuss MPEG motion picture compression,
 applications of JPEG, and related topics.)  If you don't have the CACM issue
 handy, a PDF file containing a revised version of Wallace's article is
-available at http://www.ijg.org/files/Wallace.JPEG.pdf.  The file (actually
+available at https://www.ijg.org/files/Wallace.JPEG.pdf.  The file (actually
 a preprint for an article that appeared in IEEE Trans. Consumer Electronics)
 omits the sample images that appeared in CACM, but it includes corrections
 and some added material.  Note: the Wallace article is copyright ACM and IEEE,
@@ -216,25 +210,24 @@ document is Revision 3.  And a contributed document ISO/IEC JTC1/SC29/WG1 N
 5799 with title "Evolution of JPEG", June/July 2011, Berlin, Germany.
 IJG JPEG 9 introduces a reversible color transform for improved lossless
 compression which is described in a contributed document ISO/IEC JTC1/SC29/
-WG1 N 6080 with title "JPEG 9 Lossless Coding", June/July 2012, Paris,
-France.
+WG1 N 6080 with title "JPEG 9 Lossless Coding", June/July 2012, Paris, France.
 
 The JPEG standard does not specify all details of an interchangeable file
 format.  For the omitted details we follow the "JFIF" conventions, version 2.
 JFIF version 1 has been adopted as Recommendation ITU-T T.871 (05/2011) :
 Information technology - Digital compression and coding of continuous-tone
 still images: JPEG File Interchange Format (JFIF).  It is available as a
-free download in PDF file format from http://www.itu.int/rec/T-REC-T.871.
+free download in PDF file format from https://www.itu.int/rec/T-REC-T.871.
 A PDF file of the older JFIF document is available at
-http://www.w3.org/Graphics/JPEG/jfif3.pdf.
+https://www.w3.org/Graphics/JPEG/jfif3.pdf.
 
 The TIFF 6.0 file format specification can be obtained by FTP from
 ftp://ftp.sgi.com/graphics/tiff/TIFF6.ps.gz.  The JPEG incorporation scheme
 found in the TIFF 6.0 spec of 3-June-92 has a number of serious problems.
 IJG does not recommend use of the TIFF 6.0 design (TIFF Compression tag 6).
 Instead, we recommend the JPEG design proposed by TIFF Technical Note #2
 (Compression tag 7).  Copies of this Note can be obtained from
-http://www.ijg.org/files/.  It is expected that the next revision
+https://www.ijg.org/files/.  It is expected that the next revision
 of the TIFF spec will replace the 6.0 JPEG design with the Note's design.
 Although IJG's own code does not support TIFF/JPEG, the free libtiff library
 uses our library to implement TIFF/JPEG per the Note.
@@ -245,9 +238,11 @@ ARCHIVE LOCATIONS
 
 The "official" archive site for this software is www.ijg.org.
 The most recent released version can always be found there in
-directory "files".  This particular version will be archived as
-http://www.ijg.org/files/jpegsrc.v9c.tar.gz, and in Windows-compatible
-"zip" archive format as http://www.ijg.org/files/jpegsr9c.zip.
+directory "files".  This particular version will be archived
+in Windows-compatible "zip" archive format as
+https://www.ijg.org/files/jpegsr9e.zip, and
+in Unix-compatible "tar.gz" archive format as
+https://www.ijg.org/files/jpegsrc.v9e.tar.gz.
 
 The JPEG FAQ (Frequently Asked Questions) article is a source of some
 general information about JPEG.
@@ -293,11 +288,12 @@ communication about JPEG configuration in Sigma Photo Pro software.
 
 Thank to Andrew Finkenstadt for hosting the ijg.org site.
 
-Thank to Thomas G. Lane for the original design and development of
-this singular software package.
+Thank to Thomas G. Lane for the original design and development
+of this singular software package.
 
-Thank to Lars Goehler, Andreas Heinecke, Sebastian Fuss, Yvonne Roebert,
-Andrej Werner, and Ulf-Dietrich Braumann for support and public relations.
+Thank to Lars Goehler, Andreas Heinecke, Sebastian Fuss,
+Yvonne Roebert, Andrej Werner, Ulf-Dietrich Braumann,
+and Nina Ssymank for support and public relations.
 
 
 FILE FORMAT WARS

diff --git a/source/FreeImage/Source/LibJPEG/cderror.h b/source/FreeImage/Source/LibJPEG/cderror.h
@@ -2,7 +2,7 @@
  * cderror.h
  *
  * Copyright (C) 1994-1997, Thomas G. Lane.
- * Modified 2009-2017 by Guido Vollbeding.
+ * Modified 2009-2020 by Guido Vollbeding.
  * This file is part of the Independent JPEG Group's software.
  * For conditions of distribution and use, see the accompanying README file.
  *
@@ -60,6 +60,7 @@ JMESSAGE(JERR_GIF_CODESIZE, "Bogus GIF codesize %d")
 JMESSAGE(JERR_GIF_COLORSPACE, "GIF output must be grayscale or RGB")
 JMESSAGE(JERR_GIF_IMAGENOTFOUND, "Too few images in GIF file")
 JMESSAGE(JERR_GIF_NOT, "Not a GIF file")
+JMESSAGE(JERR_GIF_OUTOFRANGE, "Numeric value out of range in GIF file")
 JMESSAGE(JTRC_GIF, "%ux%ux%d GIF image")
 JMESSAGE(JTRC_GIF_BADVERSION,
 	 "Warning: unexpected GIF version number '%c%c%c'")

diff --git a/source/FreeImage/Source/LibJPEG/cdjpeg.h b/source/FreeImage/Source/LibJPEG/cdjpeg.h
@@ -2,6 +2,7 @@
  * cdjpeg.h
  *
  * Copyright (C) 1994-1997, Thomas G. Lane.
+ * Modified 2019 by Guido Vollbeding.
  * This file is part of the Independent JPEG Group's software.
  * For conditions of distribution and use, see the accompanying README file.
  *
@@ -121,7 +122,8 @@ EXTERN(cjpeg_source_ptr) jinit_read_bmp JPP((j_compress_ptr cinfo));
 EXTERN(djpeg_dest_ptr) jinit_write_bmp JPP((j_decompress_ptr cinfo,
 					    boolean is_os2));
 EXTERN(cjpeg_source_ptr) jinit_read_gif JPP((j_compress_ptr cinfo));
-EXTERN(djpeg_dest_ptr) jinit_write_gif JPP((j_decompress_ptr cinfo));
+EXTERN(djpeg_dest_ptr) jinit_write_gif JPP((j_decompress_ptr cinfo,
+					    boolean is_lzw));
 EXTERN(cjpeg_source_ptr) jinit_read_ppm JPP((j_compress_ptr cinfo));
 EXTERN(djpeg_dest_ptr) jinit_write_ppm JPP((j_decompress_ptr cinfo));
 EXTERN(cjpeg_source_ptr) jinit_read_rle JPP((j_compress_ptr cinfo));