Fix #4532, Fix #4533 : Pentax HDR/PEF and 16/24 bits float support

2018-05-06 17:14:44 +02:00
parent a6f82d0212
commit ec2181f7ff
10 changed files with 103 additions and 40 deletions
--- a/rtengine/imageio.cc
+++ b/rtengine/imageio.cc
@@ -705,15 +705,16 @@ int ImageIO::getTIFFSampleFormat (Glib::ustring fname, IIOSampleFormat &sFormat,
                return IMIO_SUCCESS;
            }
        } else if (samplesperpixel == 3 && sampleformat == SAMPLEFORMAT_IEEEFP) {
-            /*
-             * Not yet supported
-             *
-             if (bitspersample==16) {
-                sFormat = IIOSF_HALF;
+            if (bitspersample==16) {
+                sFormat = IIOSF_FLOAT16;
                return IMIO_SUCCESS;
-            }*/
+            }
+            if (bitspersample == 24) {
+                sFormat = IIOSF_FLOAT24;
+                return IMIO_SUCCESS;
+            }
            if (bitspersample == 32) {
-                sFormat = IIOSF_FLOAT;
+                sFormat = IIOSF_FLOAT32;
                return IMIO_SUCCESS;
            }
        }