Add JPEG XL file format support

Introduces JPEG XL as a selectable file format throughout the UI, settings, and processing logic. Updates file format handling, extension mapping, and compression attributes to support JPEG XL, and adjusts related format indices and lists.

Author: ssh4net

Solidify/src/UI.CPP

@@ -186,7 +186,8 @@ MainWindow::MainWindow() {
     frmt_Jpg = createAction("JPEG", FrmtGroup, fmt_submenu, true, (settings.fileFormat == 3));
     frmt_Jp2 = createAction("JPEG-2000", FrmtGroup, fmt_submenu, true, (settings.fileFormat == 4));
     frmt_Hic = createAction("HEIC", FrmtGroup, fmt_submenu, true, (settings.fileFormat == 5));
-    frmt_Ppm = createAction("PPM", FrmtGroup, fmt_submenu, true, (settings.fileFormat == 6));
+	frmt_Jxl = createAction("JPEGXL", FrmtGroup, fmt_submenu, true, (settings.fileFormat == 6));
+    frmt_Ppm = createAction("PPM", FrmtGroup, fmt_submenu, true, (settings.fileFormat == 7));
 
     // Bits Depth
     bit_orig = createAction("Original", BitsGroup, bit_submenu, true, (settings.bitDepth == -1));
@@ -253,7 +254,7 @@ MainWindow::MainWindow() {
     for (QAction* action : rng_act) {
         connect(action, &QAction::triggered, this, &MainWindow::rngSettings);
     }
-    QList<QAction*> format_act = { frmt_Org, frmt_Tif, frmt_Exr, frmt_Png, frmt_Jpg, frmt_Jp2, frmt_Hic, frmt_Ppm };
+    QList<QAction*> format_act = { frmt_Org, frmt_Tif, frmt_Exr, frmt_Png, frmt_Jpg, frmt_Jp2, frmt_Hic, frmt_Jxl, frmt_Ppm };
     for (QAction* action : format_act) {
         connect(action, &QAction::triggered, this, &MainWindow::frmtSettings);
     }
@@ -360,8 +361,13 @@ void MainWindow::frmtSettings() {
         emit updateTextSignal("File format set to HEIC");
         qDebug() << "File format set to HEIC";
     }
-    else if (action == frmt_Ppm) {
+    else if (action == frmt_Jxl) {
         settings.fileFormat = 6;
+        emit updateTextSignal("File format set to JPEG XL");
+        qDebug() << "File format set to JPEG XL";
+	}
+    else if (action == frmt_Ppm) {
+        settings.fileFormat = 7;
         emit updateTextSignal("File format set to PPM");
         qDebug() << "File format set to PPM";
     }

Solidify/src/processing.cpp

@@ -86,7 +86,9 @@ QString getExtension(const QString& fileName, Settings* settings) {
         return ".jp2";
     case 5:
         return ".heic";
-    case 6:
+	case 6:
+		return ".jxl";
+    case 7:
         return ".ppm";
     }
     getWritableExt(&extension, settings);

Solidify/src/settings.cpp

@@ -119,7 +119,7 @@ bool loadSettings(Settings& settings, const std::string& filename) {
         }
         if (!check("Export", "FileFormat")) return false;
         settings.fileFormat = parsed["Export"]["FileFormat"].as_integer();
-        if (settings.fileFormat < -1 || settings.fileFormat > 6) {
+        if (settings.fileFormat < -1 || settings.fileFormat > 7) {
             spdlog::error("Error parsing settings file: [Export] section: \"FileFormat\" key value is out of range.");
             return false;
         }
@@ -195,7 +195,11 @@ void printSettings(Settings& settings) {
             return QString("JPEG");
         case 4:
             return QString("JPEG-2000");
-        case 5:
+		case 5:
+			return QString("HEIC");
+        case 6:
+			return QString("JPEG XL");
+        case 7:
             return QString("PPM");
         default:
             return QString("Same as input");

Solidify/src/settings.h

@@ -56,15 +56,15 @@ struct Settings {
 		repairMode = 0;		// Repair mode: 0 - disabled, 1 - Z, 2 - Y, 3 - X, 4 - -Z, 5 - -Y, 6 - -X
 
 		rangeMode = 0;		// Float type: 0 - unsigned, 1 - signed, 2 - unsigned -> signed, 3 - signed -> unsigned
-		fileFormat = -1;	// File format: -1 - original, 0 - TIFF, 1 - OpenEXR, 2 - PNG, 3 - JPEG, 4 - JPEG-2000, 5 - HEIC, 6 - PPM
+		fileFormat = -1;	// File format: -1 - original, 0 - TIFF, 1 - OpenEXR, 2 - PNG, 3 - JPEG, 4 - JPEG-2000, 5 - HEIC, 6 - JPEGXL 7 - PPM
 		defFormat = 0;		// Default file format = TIFF
 		bitDepth = -1;		// Bit depth: -1 - Original, 0 - uint8, 1 - uint16, 2 - uint32, 3 - uint64, 4 - half, 5 - float, 6 - double
 		defBDepth = 1;		// Default bit depth = uint16
 		rawRot = -1;		// Raw rotation: -1 - Auto EXIF, 0 - Unrotated/Horisontal, 3 - 180 Horisontal, 5 - 90 CW Vertical, 6 - 90 CCW Vertical
 
 		normNames = { "normal", "tangent", "object", "world" };
 		mask_substr = { "_mask.", "_mask_", "_alpha.", "_alpha_" };
-		out_formats = { "tif", "exr", "png", "jpg", "jp2", "heic", "ppm" };
+		out_formats = { "tif", "exr", "png", "jpg", "jp2", "heic", "jxl", "ppm" };
 	}
 
 	// get bit depth in bytes

Solidify/src/solidify.cpp

@@ -468,6 +468,8 @@ bool solidify_main(const std::string& inputFileName, const std::string& outputFi
     ospec.attribute("Compression", "jpeg:100");
     if (settings.fileFormat == 5)
         ospec.attribute("Compression", "heic:100");
+    if (settings.fileFormat == 6)
+		ospec.attribute("Compression", "jpegxl:100");
 
     ospec.attribute("png:compressionLevel", 4);
     //ospec.attribute("tiff:write_exif", 0);

Solidify/src/ui.h

@@ -125,6 +125,7 @@ private slots:
     QAction* frmt_Exr; // OpenEXR
     QAction* frmt_Jp2; // JPEG 2000
     QAction* frmt_Hic; // HEIC
+	QAction* frmt_Jxl;  // JPEG XL
     QAction* frmt_Ppm; // PPM
 
     //std::vector<QAction*> bitActions;