Minor code cleanings

Author: Kirill Kornyakov

include/skeleton_filter.hpp

@@ -25,4 +25,4 @@ void GuoHallThinning(const cv::Mat& src, cv::Mat& dst);
 void GuoHallThinning_optimized(const cv::Mat& src, cv::Mat& dst);
 void ImageResize_optimized(const cv::Mat &src, cv::Mat &dst, const cv::Size sz);
 void ConvertColor_BGR2GRAY_BT709_fpt(const cv::Mat& src, cv::Mat& dst);
-void ConvertColor_BGR2GRAY_BT709_simd(const cv::Mat& src, cv::Mat& dst);
+void ConvertColor_BGR2GRAY_BT709_simd(const cv::Mat& src, cv::Mat& dst);

perf/perf_skeleton.cpp

@@ -151,14 +151,13 @@ PERF_TEST_P(Size_Only, ConvertColor_simd, testing::Values(MAT_SIZES))
     cv::Mat diff1; cv::threshold(diff, diff1, 1, 0, cv::THRESH_TOZERO);
     ASSERT_EQ(0, cv::countNonZero(diff1));
 
-    // even if it is 1-off error there should be no mo than 20% of such pixels
+    // Even if it is 1-off error there should be no more than 20% of such pixels
     ASSERT_LT(cv::countNonZero(diff), sz.width*sz.height*20/100);
 
     SANITY_CHECK(dst);
 }
 
-
-// accuracy test by the way...
+// Accuracy test by the way...
 TEST(CompleteColorSpace, ConvertColor_fpt)
 {
     Size sz(4096, 4096);
@@ -190,4 +189,4 @@ TEST(CompleteColorSpace, ConvertColor_fpt)
     EXPECT_EQ(0, cv::countNonZero(diff1));
     ASSERT_LT(cv::countNonZero(diff), 7565);
     // ASSERT_EQ(0, cv::countNonZero(diff));
-}
+}

src/convertcolor.cpp

@@ -8,8 +8,9 @@
 #include <string>
 #include <sstream>
 
+// Function for debug prints
 template <typename T>
-std::string __m128i_toString(const __m128i var) // function for debug prints
+std::string __m128i_toString(const __m128i var)
 {
     std::stringstream sstr;
     const T* values = (const T*) &var;
@@ -98,7 +99,7 @@ void ConvertColor_BGR2GRAY_BT709_simd(const cv::Mat& src, cv::Mat& dst)
         int x = 0;
 
 #ifdef HAVE_SSE
-        // here is 16 times unrolled loop for vector processing
+        // Here is 16 times unrolled loop for vector processing
         for (; x <= sz.width - 16; x += 16)
         {
             __m128i chunk0 = _mm_loadu_si128((const __m128i*)(psrc + x*3 + 16*0));
@@ -107,20 +108,21 @@ void ConvertColor_BGR2GRAY_BT709_simd(const cv::Mat& src, cv::Mat& dst)
 
             __m128i red = _mm_or_si128(_mm_or_si128(_mm_shuffle_epi8(chunk0, ssse3_red_indices_0),
                                                     _mm_shuffle_epi8(chunk1, ssse3_red_indices_1)),
-                                       _mm_shuffle_epi8(chunk2, ssse3_red_indices_2));
+                                                    _mm_shuffle_epi8(chunk2, ssse3_red_indices_2));
 
             /* ??? */
 
             _mm_storeu_si128((__m128i*)(pdst + x), red);
         }
 #endif
 
-        // process leftover pixels
+        // Process leftover pixels
         for (; x < sz.width; x++)
         {
             /* ??? */
         }
     }
 
-    ConvertColor_BGR2GRAY_BT709_fpt(src, dst); // !remove this!
+    // ! Remove this before writing your optimizations !
+    ConvertColor_BGR2GRAY_BT709_fpt(src, dst);
 }