Update FreeImage up to 3.18

Author: Wohlstand

.gitignore

@@ -6,7 +6,7 @@ Makefile*
 *.pdb
 *.lib
 *.lai
-*.user
+*.user*
 build-*
 debug/
 release/

CMakeLists.txt

@@ -19,7 +19,7 @@ set(FreeImage_Defs)
 ####### DEFINES
 list(APPEND FreeImage_Defs
     "-DVER_MAJOR=3"
-    "-DVER_MINOR=17.0"
+    "-DVER_MINOR=18.0"
     -DFREEIMAGE_LITE
 )
 
@@ -163,36 +163,36 @@ if(NOT FREEIMAGE_USE_SYSTEM_LIBPNG)
         FREEIMAGE_USE_INTERNAL_LIBPNG
     )
     list(APPEND FREEIMAGE_SRC
-        Source/LibPNG/png.c
-        Source/LibPNG/pngerror.c
-        Source/LibPNG/pngget.c
-        Source/LibPNG/pngmem.c
-        Source/LibPNG/pngpread.c
-        Source/LibPNG/pngread.c
-        Source/LibPNG/pngrio.c
-        Source/LibPNG/pngrtran.c
-        Source/LibPNG/pngrutil.c
-        Source/LibPNG/pngset.c
-        Source/LibPNG/pngtrans.c
-        Source/LibPNG/pngwio.c
-        Source/LibPNG/pngwrite.c
-        Source/LibPNG/pngwtran.c
-        Source/LibPNG/pngwutil.c
-        Source/ZLib/adler32.c
-        Source/ZLib/compress.c
-        Source/ZLib/crc32.c
-        Source/ZLib/deflate.c
-        Source/ZLib/gzclose.c
-        Source/ZLib/gzlib.c
-        Source/ZLib/gzread.c
-        Source/ZLib/gzwrite.c
-        Source/ZLib/infback.c
-        Source/ZLib/inffast.c
-        Source/ZLib/inflate.c
-        Source/ZLib/inftrees.c
-        Source/ZLib/trees.c
-        Source/ZLib/uncompr.c
-        Source/ZLib/zutil.c
+        Source/3rdParty/LibPNG/png.c
+        Source/3rdParty/LibPNG/pngerror.c
+        Source/3rdParty/LibPNG/pngget.c
+        Source/3rdParty/LibPNG/pngmem.c
+        Source/3rdParty/LibPNG/pngpread.c
+        Source/3rdParty/LibPNG/pngread.c
+        Source/3rdParty/LibPNG/pngrio.c
+        Source/3rdParty/LibPNG/pngrtran.c
+        Source/3rdParty/LibPNG/pngrutil.c
+        Source/3rdParty/LibPNG/pngset.c
+        Source/3rdParty/LibPNG/pngtrans.c
+        Source/3rdParty/LibPNG/pngwio.c
+        Source/3rdParty/LibPNG/pngwrite.c
+        Source/3rdParty/LibPNG/pngwtran.c
+        Source/3rdParty/LibPNG/pngwutil.c
+        Source/3rdParty/ZLib/adler32.c
+        Source/3rdParty/ZLib/compress.c
+        Source/3rdParty/ZLib/crc32.c
+        Source/3rdParty/ZLib/deflate.c
+        Source/3rdParty/ZLib/gzclose.c
+        Source/3rdParty/ZLib/gzlib.c
+        Source/3rdParty/ZLib/gzread.c
+        Source/3rdParty/ZLib/gzwrite.c
+        Source/3rdParty/ZLib/infback.c
+        Source/3rdParty/ZLib/inffast.c
+        Source/3rdParty/ZLib/inflate.c
+        Source/3rdParty/ZLib/inftrees.c
+        Source/3rdParty/ZLib/trees.c
+        Source/3rdParty/ZLib/uncompr.c
+        Source/3rdParty/ZLib/zutil.c
     )
 endif()
 

FreeImage.rc

@@ -6,8 +6,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,17,0,0
- PRODUCTVERSION 3,17,0,0
+ FILEVERSION 3,18,0,0
+ PRODUCTVERSION 3,18,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -18,27 +18,26 @@ VS_VERSION_INFO VERSIONINFO
  FILETYPE 0x2L
  FILESUBTYPE 0x0L
 BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904e2"
-        BEGIN
-            VALUE "Comments", "FreeImage is an Open Source library project for developers who would like to support popular graphics image formats like PNG, BMP, JPEG, TIFF and others as needed by today's multimedia applications.\0"
-            VALUE "CompanyName", "FreeImage\0"
-            VALUE "FileDescription", "FreeImage library\0"
-            VALUE "FileVersion", "3, 17, 0, 0\0"
-            VALUE "InternalName", "FreeImage\0"
-            VALUE "LegalCopyright", "Copyright � 2003-2015 by FreeImage\0"
-            VALUE "LegalTrademarks", "See http://freeimage.sourceforge.net\0"
-            VALUE "OriginalFilename", "FreeImage.dll\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "FreeImage\0"
-            VALUE "ProductVersion", "3, 17, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1250
-    END
+	BLOCK "StringFileInfo"
+	BEGIN
+		BLOCK "040904e2"
+		BEGIN
+			VALUE "Comments", "FreeImage is an Open Source library project for developers who would like to support popular graphics image formats like PNG, BMP, JPEG, TIFF and others as needed by today's multimedia applications.\0"
+			VALUE "CompanyName", "FreeImage\0"
+			VALUE "FileDescription", "FreeImage library\0"
+			VALUE "FileVersion", "3, 18, 0, 0\0"
+			VALUE "InternalName", "FreeImage\0"
+			VALUE "LegalCopyright", "Copyright � 2003-2018 by FreeImage\0"
+			VALUE "LegalTrademarks", "See http://freeimage.sourceforge.net\0"
+			VALUE "OriginalFilename", "FreeImage.dll\0"
+			VALUE "PrivateBuild", "\0"
+			VALUE "ProductName", "FreeImage\0"
+			VALUE "ProductVersion", "3, 18, 0, 0\0"
+			VALUE "SpecialBuild", "\0"
+		END
+	END
+	BLOCK "VarFileInfo"
+	BEGIN
+		VALUE "Translation", 0x409, 1250
+	END
 END
-

Source/3rdParty/LibPNG/ANNOUNCE

@@ -0,0 +1,48 @@
+Libpng 1.6.35 - July 15, 2018
+
+This is a public release of libpng, intended for use in production code.
+
+Files available for download:
+
+Source files with LF line endings (for Unix/Linux):
+
+   libpng-1.6.35.tar.xz (LZMA-compressed, recommended)
+   libpng-1.6.35.tar.gz
+
+Source files with CRLF line endings (for Windows):
+
+   lp1635.7z  (LZMA-compressed, recommended)
+   lp1635.zip
+
+Other information:
+
+   libpng-1.6.35-README.txt
+   libpng-1.6.35-LICENSE.txt
+
+Changes since the last public release (1.6.34):
+
+  Restored 21 of the contrib/pngsuite/i*.png, which do not cause test
+    failures. Placed the remainder in contrib/pngsuite/interlaced/i*.png.
+  Added calls to png_set_*() transforms commonly used by browsers to
+    the fuzzer.
+  Removed some unnecessary brackets in pngrtran.c
+  Fixed miscellaneous typos (Patch by github user "luzpaz").
+  Change "ASM C" to "C ASM" in CMakeLists.txt
+  Fixed incorrect handling of bKGD chunk in sub-8-bit files (Cosmin)
+  Added hardware optimization directories to zip and 7z distributions.
+  Fixed incorrect bitmask for options.
+  Fixed many spelling typos.
+  Make png_get_iCCP consistent with man page (allow compression-type argument
+    to be NULL, bug report by Lenard Szolnoki).
+  Replaced the remaining uses of png_size_t with size_t (Cosmin)
+  Fixed the calculation of row_factor in png_check_chunk_length
+    (reported by Thuan Pham in SourceForge issue #278)
+  Added missing parentheses to a macro definition
+    (suggested by "irwir" in GitHub issue #216)
+
+Send comments/corrections/commendations to png-mng-implement at lists.sf.net
+(subscription required; visit
+https://lists.sourceforge.net/lists/listinfo/png-mng-implement
+to subscribe).
+
+Glenn R-P