Normalize line endings and whitespace

modules/python/CMakeLists.txt

@@ -20,7 +20,7 @@ ocv_module_include_directories(
     "${CMAKE_CURRENT_SOURCE_DIR}/src2"
     )
 
-    
+
 
 set(opencv_hdrs
     "${OPENCV_MODULE_opencv_core_LOCATION}/include/opencv2/core/core.hpp"
@@ -87,7 +87,7 @@ endif()
 if(MSVC AND NOT ENABLE_NOISY_WARNINGS)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4100") #unreferenced formal parameter
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4127") #conditional expression is constant
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4505") #unreferenced local function has been removed 
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4505") #unreferenced local function has been removed
   string(REPLACE "/W4" "/W3" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 endif()
 

modules/python/src2/cv2.cpp

@@ -51,7 +51,7 @@ struct ArgInfo
     bool outputarg;
     // more fields may be added if necessary
 
-    ArgInfo(const char * name_, bool outputarg_) 
+    ArgInfo(const char * name_, bool outputarg_)
         : name(name_)
         , outputarg(outputarg_) {}
 
@@ -278,7 +278,7 @@ static int pyopencv_to(const PyObject* o, Mat& m, const ArgInfo info, bool allow
             (i < ndims-1 && _strides[i] < _strides[i+1]) )
             needcopy = true;
     }
-    
+
     if (needcopy)
     {
         if (info.outputarg)

modules/python/src2/gen2.py

@@ -811,7 +811,7 @@ class PythonWrapperGenerator(object):
                     templ = gen_template_type_decl
                 self.code_types.write(templ.substitute(name=name, wname=classinfo.wname, cname=classinfo.cname,
                                       cname1=("cv::Algorithm" if classinfo.isalgorithm else classinfo.cname)))
-                                    
+
         # register classes in the same order as they have been declared.
         # this way, base classes will be registered in Python before their derivatives.
         classlist1 = [(classinfo.decl_idx, name, classinfo) for name, classinfo in classlist]

modules/python/test/calchist.py

@@ -37,7 +37,7 @@ def hs_histogram(src):
             cv.Rectangle(hist_img,
                          (h*scale, s*scale),
                          ((h+1)*scale - 1, (s+1)*scale - 1),
-                         cv.RGB(intensity, intensity, intensity), 
+                         cv.RGB(intensity, intensity, intensity),
                          cv.CV_FILLED)
     return hist_img
 

modules/python/test/precornerdetect.py

@@ -1,7 +1,7 @@
 import cv2.cv as cv
 
 def precornerdetect(image):
-    # assume that the image is floating-point 
+    # assume that the image is floating-point
     corners = cv.CloneMat(image)
     cv.PreCornerDetect(image, corners, 3)
 

modules/python/test/test.py

@@ -845,7 +845,7 @@ class FunctionTests(OpenCVTests):
                     self.assertEqual(cv.Sum(M)[0], r * c)
 
     def test_Threshold(self):
-	#""" directed test for bug 2790622 """
+    #""" directed test for bug 2790622 """
         src = self.get_sample("samples/c/lena.jpg", 0)
         results = set()
         for i in range(10):
@@ -956,7 +956,7 @@ class AreaTests(OpenCVTests):
                 for j in range(10):
                     self.assert_(all([c == chr(1) for c in cs[j].tostring()]))
 
-            # 
+            #
             m = numpy.identity(4, dtype = numpy.float32)
             m = cv.fromarray(m[:3, :3])
             rvec = cv.CreateMat(3, 1, cv.CV_32FC1)
@@ -964,7 +964,7 @@ class AreaTests(OpenCVTests):
             rvec[1,0] = 1
             rvec[2,0] = 1
             cv.Rodrigues2(rvec, m)
-	    #print m
+        #print m
 
         else:
             print "SKIPPING test_numpy - numpy support not built"
@@ -1040,11 +1040,11 @@ class AreaTests(OpenCVTests):
         cvm = cv.CreateMat(20, 10, cv.CV_32FC1)
 
     def test_depths(self):
-	#""" Make sure that the depth enums are unique """
+    #""" Make sure that the depth enums are unique """
         self.assert_(len(self.depths) == len(set(self.depths)))
 
     def test_leak(self):
-	#""" If CreateImage is not releasing image storage, then the loop below should use ~4GB of memory. """
+    #""" If CreateImage is not releasing image storage, then the loop below should use ~4GB of memory. """
         for i in range(64000):
             a = cv.CreateImage((1024,1024), cv.IPL_DEPTH_8U, 1)
         for i in range(64000):
@@ -1831,7 +1831,7 @@ class AreaTests(OpenCVTests):
         #self.snap(img)
 
     def test_create(self):
-	#""" CvCreateImage, CvCreateMat and the header-only form """
+    #""" CvCreateImage, CvCreateMat and the header-only form """
         for (w,h) in [ (320,400), (640,480), (1024, 768) ]:
             data = "z" * (w * h)
 
@@ -1910,7 +1910,7 @@ class AreaTests(OpenCVTests):
                 temp = cv.CloneImage(im)
                 for op in ["OPEN", "CLOSE", "GRADIENT", "TOPHAT", "BLACKHAT"]:
                         cv.MorphologyEx(im, dst, temp, e, eval("cv.CV_MOP_%s" % op), iter)
-        
+
     def test_getmat_nd(self):
         # 1D CvMatND should yield (N,1) CvMat
         matnd = cv.CreateMatND([13], cv.CV_8UC1)
@@ -2147,7 +2147,7 @@ class AreaTests(OpenCVTests):
         print mat
 
     def test_rand_PutText(self):
-	#""" Test for bug 2829336 """
+    #""" Test for bug 2829336 """
         mat = cv.CreateMat( 64, 64, cv.CV_8UC1)
         font = cv.InitFont(cv.CV_FONT_HERSHEY_SIMPLEX, 1, 1)
         cv.PutText(mat, chr(127), (20, 20), font, 255)