feat(IBA) scale - add KWArgs parameter

Signed-off-by: Anton Dukhovnikov <[email protected]>

Author: antond-weta

src/include/OpenImageIO/imagebufalgo.h

@@ -957,11 +957,11 @@ bool OIIO_API abs (ImageBuf &dst, const ImageBuf &A, ROI roi={}, int nthreads=0)
 ///
 /// All channels of one of the images get multiplied by the value in the only channel of the other image.
 /// Either `A` or `B` must be a single channel image.
-ImageBuf OIIO_API scale (const ImageBuf &A, const ImageBuf &B, ROI roi={},
-                         int nthreads=0);
+ImageBuf OIIO_API scale (const ImageBuf &A, const ImageBuf &B,
+                         KWArgs options = {}, ROI roi={}, int nthreads=0);
 /// Write to an existing image `dst` (allocating if it is uninitialized).
 bool OIIO_API scale (ImageBuf &dst, const ImageBuf &A, const ImageBuf &B,
-                   ROI roi={}, int nthreads=0);
+                     KWArgs options = {}, ROI roi={}, int nthreads=0);
 
 
 /// Compute per-pixel product `A * B`, returning the result image.

src/libOpenImageIO/imagebufalgo_muldiv.cpp

@@ -45,7 +45,7 @@ scale_impl(ImageBuf& R, const ImageBuf& A, const ImageBuf& B, ROI roi,
 
 bool
 ImageBufAlgo::scale(ImageBuf& dst, const ImageBuf& A, const ImageBuf& B,
-                    ROI roi, int nthreads)
+                    KWArgs options, ROI roi, int nthreads)
 {
     pvt::LoggedTimer logtime("IBA::scale");
     bool ok = false;
@@ -72,10 +72,11 @@ ImageBufAlgo::scale(ImageBuf& dst, const ImageBuf& A, const ImageBuf& B,
 
 
 ImageBuf
-ImageBufAlgo::scale(const ImageBuf& A, const ImageBuf& B, ROI roi, int nthreads)
+ImageBufAlgo::scale(const ImageBuf& A, const ImageBuf& B, KWArgs options,
+                    ROI roi, int nthreads)
 {
     ImageBuf result;
-    bool ok = scale(result, A, B, roi, nthreads);
+    bool ok = scale(result, A, B, options, roi, nthreads);
     if (!ok && !result.has_error())
         result.errorfmt("ImageBufAlgo::scale() error");
     return result;
@@ -149,8 +150,6 @@ ImageBufAlgo::mul(ImageBuf& dst, Image_or_Const A_, Image_or_Const B_, ROI roi,
     pvt::LoggedTimer logtime("IBA::mul");
     if (A_.is_img() && B_.is_img()) {
         const ImageBuf &A(A_.img()), &B(B_.img());
-        if (A.nchannels() == 1 || B.nchannels() == 1)
-            return scale(dst, A, B, roi, nthreads);
         if (!IBAprep(roi, &dst, &A, &B, IBAprep_CLAMP_MUTUAL_NCHANNELS))
             return false;
         bool ok;