Grayscale images fix

Author: ssh4net

README.md

@@ -11,10 +11,12 @@ Check console to progress information.
 
 ![Screenshot](https://github.com/ssh4net/Solidify/assets/3924000/3b8562f6-ca73-49f6-a3b1-b9e1f4cbc8ac)
 
-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.
+Tool expecting RGBA or Grayscale with alpha channel 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.
+From v1.2 possible to use external alpha channel as a single channel file with **_mask.ext** or **_alpha.ext** in name (case insencitive).
+Supporting for RGB and Grayscale images only with external alpha/mask image file.
+
+Too optimize performance Solidify app reading external alpha channel file once per batch.
 
 ![Solidify 1 1](https://github.com/ssh4net/Solidify/assets/3924000/24dc9382-e554-44d0-8ed1-2465752a4752)
 
@@ -27,7 +29,8 @@ Dependencies
 
 Changelog
 ---------
-* 1.1 - External alpha/mask channel support. Drag&Drop window always on top.
+* 1.2 - Grayscale textures fix
+* 1.1 - External alpha/mask channel support. Drag&Drop window always on top
 * 1.0 - Initial release
 
 License

src/Solidify.cpp

@@ -37,26 +37,32 @@ bool progress_callback(void* opaque_data, float portion_done)
 }
 
 std::pair<ImageBuf, ImageBuf> mask_load(const std::string& mask_file) {
-    ImageBuf mask_buf(mask_file);
+    ImageBuf alpha_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);
+    bool read_ok = alpha_buf.read(0, 0, 0, 1, true, TypeDesc::FLOAT, nullptr, nullptr);
     if (!read_ok) {
 		std::cerr << "Error: Could not read mask image\n";
+        system("pause");
 		exit(-1);
 	}
-    
+
+    // rename channel to alpha and set it as an alpha channel
+    alpha_buf.specmod().channelnames[0] = "A";
+    alpha_buf.specmod().alpha_channel = 0;
+
     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);
+    bool ok = ImageBufAlgo::channel_append(temp_buff, alpha_buf, alpha_buf);
+    ok = ok && ImageBufAlgo::channel_append(rgb_alpha, temp_buff, alpha_buf);
     if (!ok) {
 		std::cerr << "Error: Could not append channels\n";
+        system("pause");
 		exit(-1);
 	}
 
     temp_buff.clear();
 
-    return { mask_buf, rgb_alpha };
+    return { alpha_buf, rgb_alpha };
 }
 
 bool solidify_main(const std::string& inputFileName, const std::string& outputFileName, std::pair<ImageBuf, ImageBuf> mask_pair) {
@@ -66,6 +72,7 @@ bool solidify_main(const std::string& inputFileName, const std::string& outputFi
     ImageBuf input_buf(inputFileName);
 
     bool external_alpha = false;
+    bool grayscale = false;
 
     if (mask_pair.first.initialized() && mask_pair.second.initialized()) {
 		external_alpha = true;
@@ -82,7 +89,55 @@ bool solidify_main(const std::string& inputFileName, const std::string& outputFi
         std::cerr << "Error: Could not read input image\n";
         return false;
     }
+
     std::cout << std::endl;
+    std::cout << "channels: " << input_buf.nchannels() << std::endl;
+
+    int alpha_channel = input_buf.spec().alpha_channel;
+    std::cout << "alpha channel: " << alpha_channel << std::endl;
+
+    bool isValid = true;
+    int inputCh = input_buf.nchannels();
+    //
+    // Valid with and without external alpha:
+    // RGBA - 4 channels
+    // Grayscale with alpha - 2 channels
+    // RGB with alpha - 4 channels
+    // 
+    // Valid only with external alpha:
+    // Grayscale - 1 channel
+    // RGB - 3 channels 
+    //
+    switch (inputCh)
+    {
+    case 1:
+        isValid = external_alpha ? true : false;
+        grayscale = true;
+        break;
+    case 2:
+        isValid = true;
+        input_buf.specmod().channelnames[0] = "Y";
+        input_buf.specmod().channelnames[0] = "A";
+        input_buf.specmod().alpha_channel = 1;
+        grayscale = true;
+        break;
+    case 3:
+        isValid = external_alpha ? true : false;
+        grayscale = false;
+		break;
+    case 4:
+        isValid = true;
+        input_buf.specmod().channelnames[3] = "A";
+        input_buf.specmod().alpha_channel = 3;
+        grayscale = false;
+		break;
+    default:
+        isValid = false;
+        std::cerr << "Error: Only Grayscale, RGB and RGBA images are supported" << std::endl;
+        std::cerr << "Grayscale and RGB images must have an external alpha channel or use external alpha file" << std::endl;
+        return false;
+        break;
+    }
 
     // Create an ImageBuf object to store the result
     ImageBuf result_buf, rgba_buf;
@@ -92,16 +147,28 @@ bool solidify_main(const std::string& inputFileName, const std::string& outputFi
     Timer pushpull_timer;
 
     if (external_alpha) {
-        bool ok = ImageBufAlgo::mul(input_buf, input_buf, mask_pair.second);
+        bool ok = ImageBufAlgo::mul(input_buf, input_buf, grayscale ? mask_pair.first : 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 false;
 		}
+        // rename last channel to alpha and set alpha channel
+        rgba_buf.specmod().channelnames[rgba_buf.nchannels() - 1] = "A";
+        rgba_buf.specmod().alpha_channel = rgba_buf.nchannels() - 1;
     }
 
     ImageBuf* input_buf_ptr = external_alpha ? &rgba_buf : &input_buf; // Use the multiplied RGBA buffer if have an external alpha
 
+#if 0
+    std::cout << "channels: " << input_buf_ptr->nchannels() << std::endl;
+    //std::vector<std::string> chnames = input_buf_ptr->spec().channelnames;
+    //for (int i = 0; i < input_buf_ptr->nchannels(); ++i)
+    //    std::cout << "channel " << i << " : " << chnames[i] << std::endl;
+
+    std::cout << "alpha channel: " << input_buf_ptr->spec().alpha_channel << std::endl;
+#endif
+
     // Call fillholes_pushpull
     bool ok = ImageBufAlgo::fillholes_pushpull(result_buf, *input_buf_ptr);
 
@@ -119,7 +186,7 @@ bool solidify_main(const std::string& inputFileName, const std::string& outputFi
     }
 
     ImageSpec spec = result_buf.spec();
-    spec.nchannels = 3; // Only write RGB channels
+    spec.nchannels = grayscale ? 1 : 3; // Only write RGB channels
     spec.alpha_channel = -1; // No alpha channel
 
     out->open(outputFileName, spec, ImageOutput::Create);
@@ -131,21 +198,6 @@ bool solidify_main(const std::string& inputFileName, const std::string& outputFi
         *progress_callback, nullptr);
     out->close();
 
-#if 0
-
-    // Write RGBA buffer for debug
-    spec = rgba_buf.spec();
-    spec.nchannels = 4;
-
-    out->open("debug.exr", spec, ImageOutput::Create);
-
-    out->write_image(rgba_buf.spec().format, rgba_buf.localpixels(),
-        rgba_buf.pixel_stride(), rgba_buf.scanline_stride(), rgba_buf.z_stride(),
-        *progress_callback, nullptr);
-    out->close();
-
-#endif
-
     std::cout << std::endl << "Total processing time : " << g_timer.nowText() << std::endl;
 
     return true;

src/processing.cpp

@@ -82,6 +82,7 @@ bool doProcessing(QList<QUrl> urls) {
 
         // Call the solidify_main function
         if (!solidify_main(fileNames[i].toStdString(), outName.toStdString(), mask_pair)) {
+            system("pause");
             exit(-1);
         };
     }

src/ui.cpp

@@ -33,7 +33,7 @@ class DropArea : public QLabel {
         setMinimumSize(400, 400);
         setMaximumSize(400, 400);
         setWindowFlags(Qt::WindowStaysOnTopHint);
-        setWindowTitle("Solidify 1.1");
+        setWindowTitle("Solidify 1.2");
         setText("Drag & drop files here"); // Set text
         setAlignment(Qt::AlignCenter); // Set alignment to center