deep_merge: add check for the inputs to have the same channels (1675)

AcademySoftwareFoundation · Apr 20, 2017 · 51d6ceb · 51d6ceb
1 parent f3cd9cf
commit 51d6ceb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/libOpenImageIO/imagebufalgo_deep.cpp b/src/libOpenImageIO/imagebufalgo_deep.cpp
@@ -292,7 +292,8 @@ ImageBufAlgo::deep_merge (ImageBuf &dst, const ImageBuf &A,
         dst.error ("deep_merge can only be performed on deep images");
         return false;
     }
-    if (! IBAprep (roi, &dst, &A, &B, NULL, IBAprep_SUPPORT_DEEP))
+    if (! IBAprep (roi, &dst, &A, &B, NULL,
+                   IBAprep_SUPPORT_DEEP | IBAprep_REQUIRE_SAME_NCHANNELS))
         return false;
     if (! dst.deep()) {
         dst.error ("Cannot deep_merge to a flat image");