External alpha support

• Support for external alpha/mask
• External mask read only once per batch
• Drag & Drop window - always on top

Author: ssh4net

README.md

@@ -13,6 +13,21 @@ Check console to progress information.
 
 Tool expecting RGBA image file. Output files will be write in same folder as a source files with a name **Source_file_name_fill.ext** as RGB without alpha channel.
 
+From v1.1 possible to use external alpha channel as a single channel file with **_mask.ext** or **_alpha.ext** in name (case insencitive).
+Tool will read external alpha channel file only once per batch.
+
+Dependencies
+------------
+
+### Required dependencies
+* OpenImageIO
+* QT5
+
+Changelog
+---------
+* 1.1 - External alpha/mask channel support. Drag&Drop window always on top.
+* 1.0 - Initial release
+
 License
 -------
 

src/Solidify.cpp

@@ -36,33 +36,51 @@ bool progress_callback(void* opaque_data, float portion_done)
     return (portion_done >= 1.f);
 }
 
-//int main(int argc, char* argv[]) {
-int solidify_main(const std::string& mask_file, const std::string& inputFileName, const std::string& outputFileName) {
+std::pair<ImageBuf, ImageBuf> mask_load(const std::string& mask_file) {
+    ImageBuf mask_buf(mask_file);
+    std::cout << "Reading " << mask_file << std::endl;
+    bool read_ok = mask_buf.read(0, 0, 0, 1, true, TypeDesc::FLOAT, nullptr, nullptr);
+    if (!read_ok) {
+		std::cerr << "Error: Could not read mask image\n";
+		exit(-1);
+	}
+    
+    ImageBuf rgb_alpha, temp_buff;
+
+    bool ok = ImageBufAlgo::channel_append(temp_buff, mask_buf, mask_buf);
+    ok = ok && ImageBufAlgo::channel_append(rgb_alpha, temp_buff, mask_buf);
+    if (!ok) {
+		std::cerr << "Error: Could not append channels\n";
+		exit(-1);
+	}
+
+    temp_buff.clear();
+
+    return { mask_buf, rgb_alpha };
+}
+
+bool solidify_main(const std::string& inputFileName, const std::string& outputFileName, std::pair<ImageBuf, ImageBuf> mask_pair) {
     Timer g_timer;
 
     // Create an ImageBuf object for the input file
     ImageBuf input_buf(inputFileName);
-    ImageBuf mask_buf(mask_file);
+
+    bool external_alpha = false;
+
+    if (mask_pair.first.initialized() && mask_pair.second.initialized()) {
+		external_alpha = true;
+	}
 
     // Read the image with a progress callback
 
-    int last_channel = -1;
+    int last_channel = (external_alpha) ? 3 : -1; // If we have an external alpha, read only 3 channels
 
-    if (mask_file != "") {
-        last_channel = 3;
-        std::cout << "Reading " << mask_file << std::endl;
-        bool read_ok = mask_buf.read(0, 0, 0, 1, true, TypeDesc::FLOAT, nullptr, nullptr);
-        if (!read_ok) {
-			std::cerr << "Error: Could not read mask image\n";
-			return 1;
-		}
-    }
     std::cout << "Reading " << inputFileName << std::endl;
 
     bool read_ok = input_buf.read(0, 0, 0, last_channel, true, TypeUnknown, *progress_callback, nullptr);
     if (!read_ok) {
         std::cerr << "Error: Could not read input image\n";
-        return 1;
+        return false;
     }
     std::cout << std::endl;
 
@@ -73,33 +91,31 @@ int solidify_main(const std::string& mask_file, const std::string& inputFileName
 
     Timer pushpull_timer;
 
-    if (mask_file != "") {
-        ImageBuf alpha_ch, alpha_c3;
-        bool ok = ImageBufAlgo::channel_append(alpha_ch, mask_buf, mask_buf);
-        ok = ok && ImageBufAlgo::channel_append(alpha_c3, alpha_ch, mask_buf);
-        ImageBufAlgo::mul(input_buf, input_buf, alpha_c3);
-        ok = ok && ImageBufAlgo::channel_append(rgba_buf, input_buf, mask_buf);
+    if (external_alpha) {
+        bool ok = ImageBufAlgo::mul(input_buf, input_buf, mask_pair.second);
+        ok = ok && ImageBufAlgo::channel_append(rgba_buf, input_buf, mask_pair.first);
         if (!ok) {
 			std::cerr << "Error: " << rgba_buf.geterror() << std::endl;
-			return 1;
+			return false;
 		}
     }
 
-    // Call fillholes_pushpull
+    ImageBuf* input_buf_ptr = external_alpha ? &rgba_buf : &input_buf; // Use the multiplied RGBA buffer if have an external alpha
 
-    bool ok = ImageBufAlgo::fillholes_pushpull(result_buf, (mask_file == "") ? input_buf : rgba_buf);
+    // Call fillholes_pushpull
+    bool ok = ImageBufAlgo::fillholes_pushpull(result_buf, *input_buf_ptr);
 
     if (!ok) {
         std::cerr << "Error: " << result_buf.geterror() << std::endl;
-        return 1;
+        return false;
     }
 
     std::cout << "Push-Pull time : " << pushpull_timer.nowText() << std::endl;
 
     auto out = ImageOutput::create(outputFileName);
     if (!out) {
         std::cerr << "Could not create output file: " << outputFileName << std::endl;
-        return 1;
+        return false;
     }
 
     ImageSpec spec = result_buf.spec();
@@ -116,6 +132,8 @@ int solidify_main(const std::string& mask_file, const std::string& inputFileName
     out->close();
 
 #if 0
+
+    // Write RGBA buffer for debug
     spec = rgba_buf.spec();
     spec.nchannels = 4;
 
@@ -130,5 +148,5 @@ int solidify_main(const std::string& mask_file, const std::string& inputFileName
 
     std::cout << std::endl << "Total processing time : " << g_timer.nowText() << std::endl;
 
-    return 0;
+    return true;
 }

src/processing.cpp

@@ -62,8 +62,11 @@ bool doProcessing(QList<QUrl> urls) {
     // Check if there is an alpha channel files
     QString mask_file = checkAlpha(fileNames);
 
+    std::pair<ImageBuf, ImageBuf> mask_pair;
+
     if (mask_file != "") {
         qDebug() << "Mask file: " << mask_file << " will be used.";
+        mask_pair = mask_load(mask_file.toStdString());
 	}
 
     for (int i = 0; i < fileNames.size(); i++) {
@@ -78,7 +81,7 @@ bool doProcessing(QList<QUrl> urls) {
         QString outName = path + "/" + baseName + "_fill." + fileInfo.completeSuffix();
 
         // Call the solidify_main function
-        if (solidify_main(mask_file.toStdString(), fileNames[i].toStdString(), outName.toStdString())) {
+        if (!solidify_main(fileNames[i].toStdString(), outName.toStdString(), mask_pair)) {
             exit(-1);
         };
     }

src/solidify.h

@@ -16,4 +16,12 @@
  */
 #pragma once
 
-int solidify_main(const std::string& mask_file, const std::string& inputFileName, const std::string& outputFileName);
+#include <OpenImageIO/imageio.h>
+#include <OpenImageIO/imagebuf.h>
+#include <OpenImageIO/imagebufalgo.h>
+
+using namespace OIIO;
+
+std::pair<ImageBuf, ImageBuf> mask_load(const std::string& mask_file);
+
+bool solidify_main(const std::string& inputFileName, const std::string& outputFileName, std::pair<ImageBuf, ImageBuf> mask_pair);

src/ui.cpp

@@ -30,8 +30,16 @@ class DropArea : public QLabel {
     DropArea() {
         setAcceptDrops(true);
         resize(400, 400);
-        setText("Drag-n-drop files here"); // Set text
+        setMinimumSize(400, 400);
+        setMaximumSize(400, 400);
+        setWindowFlags(Qt::WindowStaysOnTopHint);
+        setWindowTitle("Solidify 1.1");
+        setText("Drag & drop files here"); // Set text
         setAlignment(Qt::AlignCenter); // Set alignment to center
+
+        QFont font = this->font();
+        font.setPointSize(16);
+        setFont(font);
     }
 
 protected:
@@ -55,6 +63,8 @@ class DropArea : public QLabel {
         bool success = doProcessing(urls);
 
         qDebug() << "Done!";
+
+        return;
     }
 };