WIP soft

Signed-off-by: Larry Gritz <[email protected]>

Author: lgritz

src/cmake/testing.cmake

@@ -334,7 +334,7 @@ macro (oiio_add_all_tests)
                     IMAGEDIR oiio-images)
     oiio_add_tests (softimage
                     ENABLEVAR ENABLE_SOFTIMAGE
-                    IMAGEDIR oiio-images)
+                    IMAGEDIR oiio-images/softimage)
     oiio_add_tests (targa
                     ENABLEVAR ENABLE_TARGA
                     IMAGEDIR oiio-images)

src/softimage.imageio/softimageinput.cpp

@@ -225,43 +225,33 @@ SoftimageInput::close()
 
 
 
-inline bool
+bool
 SoftimageInput::read_next_scanline(void* data)
 {
     // Each scanline is stored using one or more channel packets.
     // We go through each of those to pull the data
     for (auto& cp : m_channel_packets) {
-        if (cp.type & UNCOMPRESSED) {
-            if (!read_pixels_uncompressed(cp, data)) {
-                errorfmt("Failed to read uncompressed pixel data from \"{}\"",
-                         m_filename);
-                close();
-                return false;
-            }
-        } else if (cp.type & PURE_RUN_LENGTH) {
-            if (!read_pixels_pure_run_length(cp, data)) {
-                errorfmt(
-                    "Failed to read pure run length encoded pixel data from \"{}\"",
-                    m_filename);
-                close();
-                return false;
-            }
-        } else if (cp.type & MIXED_RUN_LENGTH) {
-            if (!read_pixels_mixed_run_length(cp, data)) {
-                errorfmt(
-                    "Failed to read mixed run length encoded pixel data from \"{}\"",
-                    m_filename);
-                close();
-                return false;
-            }
+        bool ok = false;
+        if (cp.type == UNCOMPRESSED) {
+            ok = read_pixels_uncompressed(cp, data);
+        } else if (cp.type == PURE_RUN_LENGTH) {
+            ok = read_pixels_pure_run_length(cp, data);
+        } else if (cp.type == MIXED_RUN_LENGTH) {
+            ok = read_pixels_mixed_run_length(cp, data);
+        }
+        if (!ok) {
+            errorfmt("Failed to read channel packed type {:d} from \"{}\"",
+                     int(cp.type), m_filename);
+            close();
+            return false;
         }
     }
     return true;
 }
 
 
 
-inline bool
+bool
 SoftimageInput::read_pixels_uncompressed(
     const softimage_pvt::ChannelPacket& curPacket, void* data)
 {
@@ -304,7 +294,7 @@ SoftimageInput::read_pixels_uncompressed(
 
 
 
-inline bool
+bool
 SoftimageInput::read_pixels_pure_run_length(
     const softimage_pvt::ChannelPacket& curPacket, void* data)
 {
@@ -365,7 +355,7 @@ SoftimageInput::read_pixels_pure_run_length(
 
 
 
-inline bool
+bool
 SoftimageInput::read_pixels_mixed_run_length(
     const softimage_pvt::ChannelPacket& curPacket, void* data)
 {

testsuite/softimage/data/fisheye.pic

@@ -1,5 +1,5 @@
-Reading data/data/fisheye.pic
-data/data/fisheye.pic :   75 x   75, 4 channel, uint8 softimage
+Reading ../oiio-images/softimage/fisheye.pic
+../oiio-images/softimage/fisheye.pic :   75 x   75, 4 channel, uint8 softimage
     SHA-1: 3A3D307729BEDC0855302F3FD2846A6477887E61
     channel list: R, G, B, A
     BitsPerSample: 8
@@ -13,3 +13,18 @@ data/data/fisheye.pic :   75 x   75, 4 channel, uint8 softimage
     Stats FiniteCount: 5625 5625 5625 5625 
     Constant: No
     Monochrome: No
+Reading ../oiio-images/softimage/astone64.pic
+../oiio-images/softimage/astone64.pic :   64 x   64, 3 channel, uint8 softimage
+    SHA-1: 0FD57F8BBD941261055C65A64BBA294D9C21664F
+    channel list: R, G, B
+    BitsPerSample: 8
+    ImageDescription: "ImageFX SoftImage Saver (Amiga)"
+    Stats Min: 26 30 0 (of 255)
+    Stats Max: 255 255 174 (of 255)
+    Stats Avg: 154.83 158.82 68.19 (of 255)
+    Stats StdDev: 37.89 37.86 29.05 (of 255)
+    Stats NanCount: 0 0 0 
+    Stats InfCount: 0 0 0 
+    Stats FiniteCount: 4096 4096 4096 
+    Constant: No
+    Monochrome: No

testsuite/softimage/ref/out.txt

@@ -4,6 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # https://github.com/AcademySoftwareFoundation/OpenImageIO
 
-
-command += info_command ("data/data/fisheye.pic", extraargs="--stats")
+files = [ "fisheye.pic", "astone64.pic" ]
+for f in files:
+    command += info_command (OIIO_TESTSUITE_IMAGEDIR + "/" + f, extraargs="--stats")