add basic jxl encoder&decoder

Author: nyfair

.github/workflows/build.yml

@@ -7,6 +7,7 @@ on:
 jobs:
   build:
     strategy:
+      fail-fast: false
       matrix:
         include:
         - os: win32
@@ -25,7 +26,7 @@ jobs:
       run: |
         md build
         cd build
-        cmake .. -G "Visual Studio 17 2022" -A ${{ matrix.cos }} -DAWK=off
+        cmake .. -G "Visual Studio 17 2022" -A ${{ matrix.cos }} -DCMAKE_MSVC_RUNTIME_LIBRARY="$<$<NOT:$<CONFIG:Debug>>:MultiThreaded>"
         cmake --build . --config Release
         move Release\*.dll .
         move plugin\Release\*.${{ matrix.ext }} .

CMakeLists.txt

@@ -38,6 +38,7 @@ ENDIF()
 OPTION(QT_PLUGIN "Build QT plugin" OFF)
 OPTION(CONV_TEST "Build a simple convert test program" OFF)
 
+SET(AWK OFF)
 SET(BUILD_SHARED_LIBS OFF)
 SET(WITH_GTEST OFF)
 SET(ZLIB_ENABLE_TESTS OFF)
@@ -93,7 +94,7 @@ ADD_SUBDIRECTORY(${3RDPARTY_DIR}/libtiff)
 ADD_SUBDIRECTORY(${3RDPARTY_DIR}/libwebp)
 ADD_SUBDIRECTORY(${3RDPARTY_DIR}/libjxl)
 
-TARGET_LINK_LIBRARIES(freeimage libjxr zlibstatic png_static jpegli-static jpegli-libjpeg-obj libtiff webpdecoder webp libwebpmux webpdemux)
+TARGET_LINK_LIBRARIES(freeimage libjxr zlibstatic png_static jpegli-static jpegli-libjpeg-obj libtiff webpdecoder webp libwebpmux webpdemux jxl jxl_threads)
 
 INCLUDE_DIRECTORIES(
 	${PROJECT_DIR}
@@ -109,6 +110,7 @@ INCLUDE_DIRECTORIES(
 	${3RDPARTY_DIR}/libwebp/src
 	${CMAKE_BINARY_DIR}/3rdparty/zlib-ng
 	${CMAKE_BINARY_DIR}/3rdparty/libpng
+	${CMAKE_BINARY_DIR}/3rdparty/libjxl/lib/include
 	${CMAKE_BINARY_DIR}/3rdparty/libjxl/lib/include/jpegli
 	${CMAKE_BINARY_DIR}/3rdparty/libtiff
 )

README.md

@@ -21,7 +21,7 @@
 |libjxl 0.11.1|https://github.com/libjxl/libjxl|
 
 ## 3rd Parties CMakeLists.txt Modification
-libpng - include zlib-ng directory
+libpng - include zlib-ng directory  
 libjxl - remove add_subdirectory(tools) | third-party find lcms2 | jpegli.cmake allow win32 JPEGXL_ENABLE_JPEGLI_LIBJPEG and configure_file
 
 # Windows Context Menu Previewer

src/FreeImage.h

@@ -376,13 +376,14 @@ FI_ENUM(FREE_IMAGE_FORMAT) {
 	FIF_GIF			= 3,
 	FIF_TARGA		= 4,
 	FIF_WEBP		= 5,
-	FIF_JXR			= 6,
-	FIF_TIFF		= 7,
-	FIF_PSD			= 8,
-	FIF_ICO			= 9,
-	FIF_DDS			= 10,
-	FIF_HDR			= 11,
-	FIF_PNM			= 12
+	FIF_JXL			= 6,
+	FIF_JXR			= 7,
+	FIF_TIFF		= 8,
+	FIF_PSD			= 9,
+	FIF_ICO			= 10,
+	FIF_DDS			= 11,
+	FIF_HDR			= 12,
+	FIF_PNM			= 13
 };
 
 /** Image type used in FreeImage.
@@ -593,8 +594,8 @@ typedef void (DLL_CALLCONV *FI_InitProc)(Plugin *plugin, int format_id);
 #define PNG_IGNOREGAMMA		1			// loading: avoid gamma correction
 #define PNG_INTERLACED		0x0200		// save using Adam7 interlacing (use | to combine with other save flags)
 #define PNM_DEFAULT         0
-#define PNM_SAVE_RAW        0       //! if set the writer saves in RAW format (i.e. P4, P5 or P6)
-#define PNM_SAVE_ASCII      1       //! if set the writer saves in ASCII format (i.e. P1, P2 or P3)
+#define PNM_SAVE_RAW        0       	//! if set the writer saves in RAW format (i.e. P4, P5 or P6)
+#define PNM_SAVE_ASCII      1       	//! if set the writer saves in ASCII format (i.e. P1, P2 or P3)
 #define PSD_DEFAULT		 	0
 #define PSD_NONE			0x0100		// save without any compression
 #define PSD_RLE				0x0200		// save using RLE compression
@@ -617,8 +618,14 @@ typedef void (DLL_CALLCONV *FI_InitProc)(Plugin *plugin, int format_id);
 #define JXR_PROGRESSIVE		0x4000		// save as a progressive-JXR (use | to combine with other save flags)
 #define WEBP_DEFAULT		0			// save with quality 75 & 4:2:0
 #define WEBP_LOSSLESS		100			// save lossless vp8 photo
-#define WEBP_SHARPYUV		0x0100			// use sharper (and slower) RGB->YUV conversion for vp8 photo
+#define WEBP_SHARPYUV		0x0100		// use sharper (and slower) RGB->YUV conversion for vp8 photo
 #define DDS_DEFAULT			0
+#define JXL_DEFAULT			0			// save with quality 90, use 12bit depth for hdr image
+#define JXL_LOSSLESS		100			// save lossless jpeg-xl
+#define JXL_BITDEPTH_10		0x0100		// save jpeg-xl with 10bit depth for hdr image
+#define JXL_BITDEPTH_12		0x0200		// save jpeg-xl with 12bit depth for hdr image
+#define JXL_BITDEPTH_16		0x0400		// save jpeg-xl with 16bit depth for hdr image
+#define JXL_BITDEPTH_32		0x0800		// save jpeg-xl with 32bit depth for hdr image
 
 // Background filling options ---------------------------------------------------------
 // Constants used in FreeImage_FillBackground and FreeImage_EnlargeCanvas

src/FreeImage/Plugin.cpp

@@ -238,6 +238,7 @@ FreeImage_Initialise(BOOL load_local_plugins_only) {
 			s_plugins->AddNode(InitGIF);
 			s_plugins->AddNode(InitTARGA);
 			s_plugins->AddNode(InitWEBP);
+			s_plugins->AddNode(InitJXL);
 			s_plugins->AddNode(InitJXR);
 			s_plugins->AddNode(InitTIFF);
 			s_plugins->AddNode(InitPSD);