! test

Author: alalek

modules/intensity_transform/src/intensity_transform.cpp

@@ -33,14 +33,13 @@ void logTransform(const Mat input, Mat& output)
 
 void gammaCorrection(const Mat input, Mat& output, const float gamma)
 {
-    vector<int> table(256);
+    array<uchar, 256> table;
     for (int i = 0; i < 256; i++)
     {
-        table[i] = (int)(pow((i / 255.0), gamma) * 255.0);
+        table[i] = saturate_cast<uchar>(pow((i / 255.0), gamma) * 255.0);
     }
 
     LUT(input, table, output);
-    output.convertTo(output, CV_8UC3);
 }
 
 void autoscaling(const Mat input, Mat& output)
@@ -52,25 +51,24 @@ void autoscaling(const Mat input, Mat& output)
 
 void contrastStretching(const Mat input, Mat& output, const int r1, const int s1, const int r2, const int s2)
 {
-    vector<int> table(256);
+    array<uchar, 256> table;
     for (int i = 0; i < 256; i++)
     {
         if (i <= r1)
         {
-            table[i] = (int)(((float)s1 / (float)r1) * i);
+            table[i] = saturate_cast<uchar>(((float)s1 / (float)r1) * i);
         }
         else if (r1 < i && i <= r2)
         {
-            table[i] = (int)(((float)(s2 - s1)/(float)(r2 - r1)) * (i - r1) + s1);
+            table[i] = saturate_cast<uchar>(((float)(s2 - s1)/(float)(r2 - r1)) * (i - r1) + s1);
         }
         else // (r2 < i)
         {
-            table[i] = (int)(((float)(255 - s2)/(float)(255 - r2)) * (i - r2) + s2);
+            table[i] = saturate_cast<uchar>(((float)(255 - s2)/(float)(255 - r2)) * (i - r2) + s2);
         }
     }
 
     LUT(input, table, output);
-    output.convertTo(output, CV_8UC3);
 }
 
 }} // cv::intensity_transform::