Merge pull request opencv#4 from VladVin/fix/warmify

Fixing the warmify filter

Author: ArtemSkrebkov

modules/photoeffects/doc/warmify.rst

@@ -4,22 +4,19 @@ Warmify
 
 Increases saturation of red and yellow tones, making photographs more warm, sunset view.
 
-.. cpp:function:: int warmify(cv::InputArray src, cv::OutputArray dst, uchar delta = 30)
+.. ocv:function:: void warmify(cv::InputArray src, cv::OutputArray dst, uchar delta = 30)
 
-   :param src: Source 8-bit three-channel image.
+   :param src: Source 3-channel image.
    :param dst: Destination image of the same size and the same type as **src**.
    :param delta: Value by which saturation of warm colors is increased.
-   :return: Error code.
 
 The algorithm.
 
-#. Create 3-channel image, which is interpreted as BGR image.
+ For every pixel of the **dst** image:
 
-    #. 1st channel is the matrix, each element equals **blue** = blue_src.
-    #. 2nd channel is the matrix, each element equals **green** = green_src + delta.
-    #. 3rd channel is the matrix, each element equals **red** = red_src + delta.
-
-#. Save this matrix as BGR image.
+  #. 1st channel is *blue = blue_src*.
+  #. 2nd channel is *green = green_src + delta*.
+  #. 3rd channel is *red = red_src + delta*.
 
 Example.
 

modules/photoeffects/include/opencv2/photoeffects.hpp

@@ -26,7 +26,7 @@ CV_EXPORTS_W  int antique(cv::InputArray src, cv::OutputArray dst, cv::InputArra
 
 CV_EXPORTS_W  void vignette(cv::InputArray src, cv::OutputArray dst, cv::Size rect);
 
-CV_EXPORTS_W  int warmify(cv::InputArray src, cv::OutputArray dst, uchar delta = 30);
+CV_EXPORTS_W  void warmify(cv::InputArray src, cv::OutputArray dst, uchar delta = 30);
 
 CV_EXPORTS_W  int matte(cv::InputArray src, cv::OutputArray dst, cv::Point firstPoint, cv::Point secondPoint,
           float sigmaX, float sigmaY, cv::Size ksize=cv::Size(0, 0));

modules/photoeffects/src/warmify.cpp

@@ -2,7 +2,7 @@
 
 namespace cv { namespace photoeffects {
 
-int warmify(cv::InputArray src, cv::OutputArray dst, uchar delta)
+void warmify(cv::InputArray src, cv::OutputArray dst, uchar delta)
 {
     CV_Assert(src.type() == CV_8UC3);
     Mat imgSrc = src.getMat();
@@ -11,7 +11,6 @@ int warmify(cv::InputArray src, cv::OutputArray dst, uchar delta)
     Mat imgDst = dst.getMat();
 
     imgDst = imgSrc + Scalar(0, delta, delta);
-    return 0;
 }
 
-}}
+}}

modules/photoeffects/test/warmify_test.cpp

@@ -17,17 +17,16 @@ TEST(photoeffects_warmify, test)
 {
     Mat image(100, 100, CV_8UC3);
     Mat dst;
-    Vec3b intensity_src;
-    Vec3b intensity_dst;
 
-    EXPECT_EQ(0, warmify(image, dst, 30));
+    warmify(image, dst, 30);
+
     for (int i = 0; i < image.rows; i++)
     {
         for (int j = 0; j < image.cols; j++)
         {
             // blue_dst = blue_src
-            intensity_src = image.at<Vec3b>(i, j);
-            intensity_dst = dst.at<Vec3b>(i, j);
+            Vec3b intensity_src = image.at<Vec3b>(i, j);
+            Vec3b intensity_dst = dst.at<Vec3b>(i, j);
             EXPECT_LE (intensity_dst[0] - 1, intensity_src[0]);
             EXPECT_GE (intensity_dst[0] + 1, intensity_src[0]);
         }
@@ -52,7 +51,7 @@ TEST(photoeffects_warmify, regression)
         FAIL() << "Can't read " + expectedOutput + " image";
     }
 
-    EXPECT_EQ(0, warmify(image, dst, 30));
+    warmify(image, dst, 30);
 
     Mat diff = abs(rightDst - dst);
     Mat mask = diff.reshape(1) > 1;