Merge pull request #18405 from victoryforce/pnm-loader-tweaks

[imageio] PNM loader tweaks and maintenance

Author: TurboGit

src/imageio/imageio.c

@@ -1,6 +1,6 @@
 /*
     This file is part of darktable,
-    Copyright (C) 2009-2024 darktable developers.
+    Copyright (C) 2009-2025 darktable developers.
 
     darktable is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -1635,9 +1635,6 @@ dt_imageio_retval_t dt_imageio_open(dt_image_t *img,
     if(!_image_handled(ret))
       ret = dt_imageio_open_jpeg(img, filename, buf);
 
-    if(!_image_handled(ret))
-      ret = dt_imageio_open_pnm(img, filename, buf);
-
     // final fallback that tries to open file via GraphicsMagick or ImageMagick
     if(!_image_handled(ret))
       ret = dt_imageio_open_exotic(img, filename, buf);

src/imageio/imageio_pnm.c

@@ -77,7 +77,8 @@ static dt_imageio_retval_t _read_pgm(dt_image_t *img, FILE*f, float *buf)
   dt_imageio_retval_t result = DT_IMAGEIO_OK;
 
   unsigned int max;
-  // We expect at most a 5-digit number (65535) + a newline + '\0', so 7 characters.
+  // We expect at most a 5-digit number (65535) + a newline + '\0',
+  // so 7 characters.
   char maxvalue_string[7];
   if(fgets(maxvalue_string,7,f))
     max = atoi(maxvalue_string);
@@ -122,6 +123,9 @@ static dt_imageio_retval_t _read_pgm(dt_image_t *img, FILE*f, float *buf)
       for(size_t x = 0; x < img->width; x++)
       {
         uint16_t intvalue = line[x];
+        // PGM files are big endian, the most significant byte is first
+        // in the case where the value must be represented by two bytes.
+        // See http://netpbm.sourceforge.net/doc/pgm.html
         if(G_BYTE_ORDER != G_BIG_ENDIAN)
           intvalue = GUINT16_SWAP_LE_BE(intvalue);
         float value = (float)intvalue / (float)max;
@@ -142,7 +146,8 @@ static dt_imageio_retval_t _read_ppm(dt_image_t *img, FILE*f, float *buf)
   dt_imageio_retval_t result = DT_IMAGEIO_OK;
 
   unsigned int max;
-  // We expect at most a 5-digit number (65535) + a newline + '\0', so 7 characters.
+  // We expect at most a 5-digit number (65535) + a newline + '\0',
+  // so 7 characters.
   char maxvalue_string[7];
   if(fgets(maxvalue_string,7,f))
     max = atoi(maxvalue_string);
@@ -191,7 +196,9 @@ static dt_imageio_retval_t _read_ppm(dt_image_t *img, FILE*f, float *buf)
         for(int c = 0; c < 3; c++)
         {
           uint16_t intvalue = line[x * 3 + c];
-          // PPM files are big endian! http://netpbm.sourceforge.net/doc/ppm.html
+          // PPM files are big endian, the most significant byte is first
+          // in the case where the value must be represented by two bytes.
+          // See http://netpbm.sourceforge.net/doc/ppm.html
           if(G_BYTE_ORDER != G_BIG_ENDIAN)
             intvalue = GUINT16_SWAP_LE_BE(intvalue);
           float value = (float)intvalue / (float)max;
@@ -206,50 +213,60 @@ static dt_imageio_retval_t _read_ppm(dt_image_t *img, FILE*f, float *buf)
   return result;
 }
 
-dt_imageio_retval_t dt_imageio_open_pnm(dt_image_t *img, const char *filename, dt_mipmap_buffer_t *mbuf)
+dt_imageio_retval_t dt_imageio_open_pnm(dt_image_t *img,
+                                        const char *filename,
+                                        dt_mipmap_buffer_t *mbuf)
 {
-  const char *ext = filename + strlen(filename);
-  while(*ext != '.' && ext > filename) ext--;
-  if(strcasecmp(ext, ".pbm") && strcasecmp(ext, ".pgm") && strcasecmp(ext, ".pnm") && strcasecmp(ext, ".ppm"))
-    return DT_IMAGEIO_UNSUPPORTED_FORMAT;
   FILE *f = g_fopen(filename, "rb");
   if(!f) return DT_IMAGEIO_FILE_NOT_FOUND;
   int ret = 0;
   dt_imageio_retval_t result = DT_IMAGEIO_LOAD_FAILED;
 
   char head[2] = { 'X', 'X' };
   ret = fscanf(f, "%c%c ", head, head + 1);
-  if(ret != 2 || head[0] != 'P') goto end;
+  if(ret != 2 || head[0] != 'P')
+  {
+    fclose(f);
+    return DT_IMAGEIO_LOAD_FAILED;
+  }
 
   char width_string[10] = { 0 };
   char height_string[10] = { 0 };
   ret = fscanf(f, "%9s %9s ", width_string, height_string);
-  if(ret != 2) goto end;
+  if(ret != 2)
+  {
+    fclose(f);
+    return DT_IMAGEIO_FILE_CORRUPTED;
+  }
 
   errno = 0;
   img->width = strtol(width_string, NULL, 0);
   img->height = strtol(height_string, NULL, 0);
-  if(errno != 0 || img->width <= 0 || img->height <= 0) goto end;
+  if(errno != 0 || img->width <= 0 || img->height <= 0)
+  {
+    fclose(f);
+    return DT_IMAGEIO_FILE_CORRUPTED;
+  }
 
   img->buf_dsc.channels = 4;
   img->buf_dsc.datatype = TYPE_FLOAT;
 
   float *buf = (float *)dt_mipmap_cache_alloc(mbuf, img);
   if(!buf)
   {
-    result = DT_IMAGEIO_CACHE_FULL;
-    goto end;
+    fclose(f);
+    return DT_IMAGEIO_CACHE_FULL;
   }
 
-  // we don't support ASCII variants or P7 anymaps! thanks to magic numbers those shouldn't reach us anyway.
+  // We don't support ASCII variants or P7 anymaps!
+  // Thanks to magic numbers those shouldn't reach us anyway.
   if(head[1] == '4')
     result = _read_pbm(img, f, buf);
   else if(head[1] == '5')
     result = _read_pgm(img, f, buf);
   else if(head[1] == '6')
     result = _read_ppm(img, f, buf);
 
-end:
   fclose(f);
 
   if(result == DT_IMAGEIO_OK)
@@ -259,6 +276,12 @@ dt_imageio_retval_t dt_imageio_open_pnm(dt_image_t *img, const char *filename, d
     img->flags &= ~DT_IMAGE_RAW;
     img->flags &= ~DT_IMAGE_S_RAW;
     img->flags &= ~DT_IMAGE_HDR;
+
+    // The most common and generally assumed interpretation of the
+    // image data in PNM seems to be that the values ​​are non-linear.
+    // This is why we set the so called 'LDR' flag, which essentially,
+    // in the absence of metadata, signals darktable the need to treat
+    // the image data as non-linear.
     img->flags |= DT_IMAGE_LDR;
     img->loader = LOADER_PNM;
   }