io: add support for JXL images

Author: cdcseacave

.github/workflows/continuous_integration.yml

@@ -42,7 +42,7 @@ jobs:
         uses: lukka/run-vcpkg@v11
         with:
           vcpkgDirectory: '${{ github.workspace }}/vcpkg'
-          vcpkgGitCommitId: 'd5ec528843d29e3a52d745a64b469f810b2cedbf'
+          vcpkgGitCommitId: 'ef7dbf94b9198bc58f45951adcf1f041fcbc5ea0'
 
       - name: Install Ubuntu dependencies
         if: matrix.os == 'ubuntu-latest'

apps/InterfaceCOLMAP/InterfaceCOLMAP.cpp

@@ -187,7 +187,7 @@ bool Application::Initialize(size_t argc, LPCTSTR* argv)
 	const String strInputFileNameExt(Util::getFileExt(OPT::strInputFileName).ToLower());
 	OPT::bFromOpenMVS = (strInputFileNameExt == MVS_EXT);
 	if (OPT::bFromOpenMVS) {
-        OPT::strImageFolder = MAKE_PATH_SAFE(OPT::strImageFolder);
+        OPT::strImageFolder = MAKE_PATH_FULL(WORKING_FOLDER_FULL, OPT::strImageFolder);
 		if (OPT::strOutputFileName.empty())
 			OPT::strOutputFileName = Util::getFilePath(OPT::strInputFileName);
 	} else {

apps/InterfaceMetashape/InterfaceMetashape.cpp

@@ -674,7 +674,7 @@ bool UndistortBrown(Image& imageData, uint32_t ID, const DistCoeff& dc, const St
 
 	// save undistorted image
 	imageData.image = imgUndist;
-	imageData.name = pathData + String::FormatString(_T("%05u.jpg"), ID);
+	imageData.name = pathData + String::FormatString(_T("%05u.jxl"), ID);
 	Util::ensureFolder(imageData.name);
 	return imageData.image.Save(imageData.name);
 }

build/Templates/ConfigLocal.h.in

@@ -33,6 +33,9 @@
 // JPEG codec
 #cmakedefine _USE_JPG
 
+// JPEG-XL codec
+#cmakedefine _USE_JXL
+
 // PNG codec
 #cmakedefine _USE_PNG
 

libs/Common/Types.inl

@@ -3117,6 +3117,10 @@ bool TImage<TYPE>::Save(const String& fileName) const
 		compression_params.push_back(cv::IMWRITE_JPEG_QUALITY);
 		compression_params.push_back(95);
 	} else
+	if (ext == ".jxl") {
+		compression_params.push_back(cv::IMWRITE_JPEGXL_QUALITY);
+		compression_params.push_back(95);
+	} else
 	if (ext == ".pfm") {
 		if (Base::depth() != CV_32F)
 			return false;

libs/IO/CMakeLists.txt

@@ -1,3 +1,48 @@
+# Macro to check pkg-config modules and produce a full-path library list
+macro(pkg_check_modules_fullpath_libs PREFIX MODULE_NAME)
+	# Call pkg_check_modules
+	pkg_check_modules(${PREFIX} REQUIRED IMPORTED_TARGET ${MODULE_NAME})
+	if(${PREFIX}_FOUND)
+		set(${PREFIX}_FULLPATH_LIBRARIES "" PARENT_SCOPE)
+		foreach(lib ${${PREFIX}_LIBRARIES})
+			set(lib_path "")
+			set(lib_prefix "")
+			set(lib_ext "")
+			if(WIN32)
+				set(lib_ext ".lib")
+			else()
+				set(lib_prefix "lib")
+				set(lib_ext ".a")
+			endif()
+			# Skip system libraries like 'm' on Windows
+			if(WIN32 AND (lib STREQUAL "m"))
+				continue()
+			endif()
+			# If lib already has a path, use as is
+			if(EXISTS "${lib_prefix}${lib}${lib_ext}")
+				set(lib_path "${lib_prefix}${lib}${lib_ext}")
+			else()
+				foreach(dir ${${PREFIX}_LIBRARY_DIRS})
+					if(EXISTS "${dir}/${lib_prefix}${lib}${lib_ext}")
+						set(lib_path "${dir}/${lib_prefix}${lib}${lib_ext}")
+						break()
+					endif()
+				endforeach()
+			endif()
+			if(NOT lib_path STREQUAL "")
+				list(APPEND ${PREFIX}_FULLPATH_LIBRARIES "${lib_path}")
+			else()
+				list(APPEND ${PREFIX}_FULLPATH_LIBRARIES "${lib}")
+			endif()
+		endforeach()
+		set(${PREFIX}_FULLPATH_LIBRARIES "${${PREFIX}_FULLPATH_LIBRARIES}" PARENT_SCOPE)
+		message(STATUS "Found ${MODULE_NAME}: ${${PREFIX}_VERSION} libs: ${${PREFIX}_FULLPATH_LIBRARIES}")
+	else()
+		set(${PREFIX}_FULLPATH_LIBRARIES "" PARENT_SCOPE)
+		message(STATUS "${MODULE_NAME} not found, support will be disabled")
+	endif()
+endmacro()
+
 # Find required packages
 FIND_PACKAGE(PNG QUIET)
 if(PNG_FOUND)
@@ -15,6 +60,14 @@ if(JPEG_FOUND)
 else()
 	SET(JPEG_LIBRARIES "")
 endif()
+FIND_PACKAGE(PkgConfig REQUIRED)
+pkg_check_modules_fullpath_libs(JPEGXL libjxl)
+if(JPEGXL_FOUND)
+	SET(_USE_JXL TRUE CACHE INTERNAL "")
+	set(JPEGXL_LIBRARIES ${JPEGXL_FULLPATH_LIBRARIES})
+else()
+	SET(JPEGXL_LIBRARIES "")
+endif()
 FIND_PACKAGE(TIFF QUIET)
 if(TIFF_FOUND)
 	INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR})
@@ -38,7 +91,7 @@ IF(CMAKE_VERSION VERSION_GREATER_EQUAL 3.16.0)
 endif()
 
 # Link its dependencies
-TARGET_LINK_LIBRARIES(IO Common ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} ${EXIV2_LIBS})
+TARGET_LINK_LIBRARIES(IO Common ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${JPEGXL_LIBRARIES} ${TIFF_LIBRARIES} ${EXIV2_LIBS})
 
 # Install
 SET_TARGET_PROPERTIES(IO PROPERTIES

libs/IO/Common.h

@@ -33,6 +33,9 @@
 #ifdef _USE_JPG
 #define _IMAGE_JPG		// add JPG support
 #endif
+#ifdef _USE_JXL
+#define _IMAGE_JXL		// add JpegXL support
+#endif
 #ifdef _USE_TIFF
 #define _IMAGE_TIFF		// add TIFF support
 #endif
@@ -56,6 +59,9 @@
 #ifdef _IMAGE_TIFF
 #include "ImageTIFF.h"
 #endif
+#ifdef _IMAGE_JXL
+#include "ImageJXL.h"
+#endif
 #include "PLY.h"
 #include "OBJ.h"
 /*----------------------------------------------------------------*/

libs/IO/Image.cpp

@@ -896,6 +896,10 @@ CImage* CImage::Create(LPCTSTR szName, IMCREATE mode)
 	else if (_tcsncicmp(fext, _T(".jpg"), 4) == 0 || _tcsncicmp(fext, _T(".jpeg"), 5) == 0)
 		pImage = new CImageJPG();
 	#endif
+	#ifdef _IMAGE_JXL
+	else if (_tcsncicmp(fext, _T(".jxl"), 4) == 0)
+		pImage = new CImageJXL();
+	#endif
 	#ifdef _IMAGE_TIFF
 	else if (_tcsncicmp(fext, _T(".tif"), 4) == 0 || _tcsncicmp(fext, _T(".tiff"), 5) == 0)
 		pImage = new CImageTIFF();

libs/IO/Image.h

@@ -32,6 +32,7 @@ typedef enum PIXELFORMAT_TYPE {
 	// gray
 	PF_A8,
 	PF_GRAY8,
+	PF_GRAY32F, // 1 channel, 32-bit float (depth map)
 	// uncompressed RGB
 	PF_R5G6B5,
 	PF_R8G8B8,