Merge branch 'master' of https://github.com/SatDump/SatDump

schaferk · May 12, 2024 · b2d3792 · b2d3792
2 parents 72eccf0 + b11517e
commit b2d3792
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/satdump_cfg.json b/satdump_cfg.json
@@ -140,7 +140,7 @@
                 "pbm",
                 "qoi"
             ],
-            "description": "Image format for raw image products\n\npng: PNG Image (recommended)\n\nj2k: JPEG 2000\n\njpg: JPEG Image (not recommended; may result\nin low-quality composites and projections)\n\npbm : Really fast, but will result is very big files"
+            "description": "Image format for raw image products\n\npng: PNG Image (recommended)\n\nj2k: JPEG 2000\n\njpg: JPEG Image (not recommended; may result\nin low-quality composites and projections)\n\npbm : Really fast, but will result is very big files\n\nqoi: A very fast image format with compression"
         },
         "image_format": {
             "type": "options",

diff --git a/src-core/common/image/io.cpp b/src-core/common/image/io.cpp
@@ -83,7 +83,7 @@ namespace image
             return false;
         }
 
-        if (image_format != "png" && image_format != "jpg" && image_format != "j2k" && image_format != "pbm" && image_format != "tif")
+        if (image_format != "png" && image_format != "jpg" && image_format != "j2k" && image_format != "pbm" && image_format != "tif" && image_format != "qoi")
         {
             logger->error("Image format not specified, and default format is invalid!");
             return false;

diff --git a/src-core/common/image/io/qoiio.cpp b/src-core/common/image/io/qoiio.cpp
@@ -44,7 +44,7 @@ namespace image
         desc.width = d_width;
         desc.height = d_height;
         desc.channels = final_channels;
-        desc.colorspace = QOI_SRGB;
+        desc.colorspace = QOI_LINEAR;
         qoi_write(file.c_str(), qoi_buffer, &desc);
 
         // Custom marker for single-channel files
@@ -74,12 +74,12 @@ namespace image
                 {
                     fclose(fin);
                     is_single_channel = lastByte == 0xAA;
-                    logger->info("TRAILER");
+                    // logger->info("TRAILER");
                 }
             }
         }
 
-        logger->critical("isSingle %d", (int)is_single_channel);
+        // logger->critical("isSingle %d", (int)is_single_channel);
 
         qoi_desc desc;
         uint8_t *qoi_buffer = (uint8_t *)qoi_read(file.c_str(), &desc, 4);
@@ -96,7 +96,7 @@ namespace image
             for (size_t i = 0; i < d_width * d_height; i++)
                 img.set(i, qoi_buffer[i * 4 + 0]);
         }
-        else if (d_channels == 3)
+        else if (d_channels >= 3)
         {
             for (size_t i = 0; i < d_width * d_height; i++)
                 for (int c = 0; c < d_channels; c++)