Add testing for maketx --lightprobe, fix bugs

src/libOpenImageIO/maketexture.cpp

@@ -369,6 +369,7 @@ latlong_to_dir(float s, float t, bool y_is_up = true)
 
 
 
+template<class SRCTYPE>
 static bool
 lightprobe_to_envlatl(ImageBuf& dst, const ImageBuf& src, bool y_is_up,
                       ROI roi = ROI::All(), int nthreads = 0)
@@ -392,8 +393,8 @@ lightprobe_to_envlatl(ImageBuf& dst, const ImageBuf& src, bool y_is_up,
             float r      = M_1_PI * acosf(V[2]) / hypotf(V[0], V[1]);
             float u      = (V[0] * r + 1.0f) * 0.5f;
             float v      = (V[1] * r + 1.0f) * 0.5f;
-            interppixel_NDC_clamped<float>(src, float(u), float(v), pixel,
-                                           false);
+            interppixel_NDC_clamped<SRCTYPE>(src, float(u), float(v), pixel,
+                                             false);
             for (int c = roi.chbegin; c < roi.chend; ++c)
                 d[c] = pixel[c];
         }
@@ -1163,7 +1164,11 @@ make_texture_impl(ImageBufAlgo::MakeTextureMode mode, const ImageBuf* input,
         std::shared_ptr<ImageBuf> latlong(new ImageBuf(newspec));
         // Now lightprobe holds the original lightprobe, src is a blank
         // image that will be the unwrapped latlong version of it.
-        lightprobe_to_envlatl(*latlong, *src, true);
+        bool ok = true;
+        OIIO_DISPATCH_COMMON_TYPES(ok, "lightprobe_to_envlatl",
+                                   lightprobe_to_envlatl, src->spec().format,
+                                   *latlong, *src, true);
+        // lightprobe_to_envlatl(*latlong, *src, true);
         // Carry on with the lat-long environment map from here on out
         mode = ImageBufAlgo::MakeTxEnvLatl;
         src  = latlong;

testsuite/maketx/ref/out.txt

@@ -401,3 +401,5 @@ bumpslope.exr        :   64 x   64, 6 channel, half openexr
     oiio:SHA-1: "49B533110A914CE89BE0B14753A6A4CC037C964F"
     oiio:subimages: 1
     openexr:roundingmode: 0
+Comparing "uffizi_latlong_env-128.exr" and "ref/uffizi_latlong_env-128.exr"
+PASS

testsuite/maketx/run.py

@@ -2,6 +2,7 @@
 
 failureok = 1
 
+outputs = [ ]
 
 # Just for simplicity, make a checkerboard with a solid alpha
 command += oiiotool (" --pattern checker 128x128 4 --ch R,G,B,=1.0"
@@ -116,19 +117,23 @@
                            "--envlatl")
 command += oiiotool ("--stats -a whiteenv.exr")
 
+# Test --lightprobe
+command += maketx_command ("src/uffizi_probe-128.exr", "uffizi_latlong_env-128.exr",
+                           "--lightprobe -d half")
+outputs += [ "uffizi_latlong_env-128.exr" ]
+
 #Test --bumpslopes to export a 6 channels height map with gradients
 command += oiiotool (" --pattern noise 64x64 1"
            + " -d half -o " + make_relpath("bump.exr"))
 command += maketx_command ("bump.exr", "bumpslope.exr",
                            "--bumpslopes -d half", showinfo=True)
 
 
-outputs = [ "out.txt" ]
+outputs += [ "out.txt" ]
 
 
 
-# To do:  --filter --fullpixels
+# To do:  --fullpixels
 #         --prman-metadata --ignore-unassoc
 #         --mipimage 
-#         --envlatl TIFF, --envlatl EXR
 #         --colorconvert --unpremult -u --fovcot