Normalized file endings.

2013-08-21 17:26:54 +04:00 · 2013-08-21 17:26:54 +04:00 · e9a28f66ee
commit e9a28f66ee
parent f55740da70
486 changed files with 166 additions and 606 deletions
--- a/3rdparty/ffmpeg/ffmpeg_version.cmake
+++ b/3rdparty/ffmpeg/ffmpeg_version.cmake
@ -7,4 +7,4 @@ set(HAVE_GENTOO_FFMPEG 1)
 set(ALIASOF_libavcodec_VERSION 53.61.100)
 set(ALIASOF_libavformat_VERSION 53.32.100)
 set(ALIASOF_libavutil_VERSION 51.35.100)
-set(ALIASOF_libswscale_VERSION 2.1.100)
+set(ALIASOF_libswscale_VERSION 2.1.100)
--- a/3rdparty/ffmpeg/make.bat
+++ b/3rdparty/ffmpeg/make.bat
@ -1,2 +1,2 @@
 set path=c:\dev\msys32\bin;%path% & gcc -Wall -shared -o opencv_ffmpeg.dll -O2 -x c++ -I../include -I../include/ffmpeg_ -I../../modules/highgui/src ffopencv.c -L../lib -lavformat -lavcodec -lavdevice -lswscale -lavutil -lwsock32
-set path=c:\dev\msys64\bin;%path% & gcc -m64 -Wall -shared -o opencv_ffmpeg_64.dll -O2 -x c++ -I../include -I../include/ffmpeg_ -I../../modules/highgui/src ffopencv.c -L../lib -lavformat64 -lavcodec64 -lavdevice64 -lswscale64 -lavutil64 -lavcore64 -lwsock32 -lws2_32
+set path=c:\dev\msys64\bin;%path% & gcc -m64 -Wall -shared -o opencv_ffmpeg_64.dll -O2 -x c++ -I../include -I../include/ffmpeg_ -I../../modules/highgui/src ffopencv.c -L../lib -lavformat64 -lavcodec64 -lavdevice64 -lswscale64 -lavutil64 -lavcore64 -lwsock32 -lws2_32
--- a/3rdparty/ffmpeg/readme.txt
+++ b/3rdparty/ffmpeg/readme.txt
@ -40,5 +40,3 @@ How to update opencv_ffmpeg.dll and opencv_ffmpeg_64.dll when a new version of F

 8. Then, go to <opencv>\3rdparty\ffmpeg, edit make.bat
   (change paths to the actual paths to your msys32 and msys64 distributions) and then run make.bat
-
-
--- a/3rdparty/libjasper/CMakeLists.txt
+++ b/3rdparty/libjasper/CMakeLists.txt
@ -48,4 +48,3 @@ endif()
 if(NOT BUILD_SHARED_LIBS)
  install(TARGETS ${JASPER_LIBRARY} ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT main)
 endif()
-
--- a/3rdparty/libtiff/tif_config.h.cmakein
+++ b/3rdparty/libtiff/tif_config.h.cmakein
@ -168,4 +168,3 @@

 /* Support Deflate compression */
 #define ZIP_SUPPORT 1
-
--- a/3rdparty/tbb/.gitignore
+++ b/3rdparty/tbb/.gitignore
@ -1 +1 @@
-tbb*.tgz
+tbb*.tgz
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -891,4 +891,3 @@ ocv_finalize_status()
 if("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
  message(WARNING "The source directory is the same as binary directory. \"make clean\" may damage the source tree")
 endif()
-
--- a/apps/haartraining/CMakeLists.txt
+++ b/apps/haartraining/CMakeLists.txt
@ -79,4 +79,3 @@ if(ENABLE_SOLUTION_FOLDERS)
  set_target_properties(opencv_haartraining PROPERTIES FOLDER "applications")
  set_target_properties(opencv_haartraining_engine PROPERTIES FOLDER "applications")
 endif()
-
--- a/apps/haartraining/_cvcommon.h
+++ b/apps/haartraining/_cvcommon.h
@ -100,4 +100,3 @@ int icvGetIdxAt( CvMat* idx, int pos )
 void icvSave( const CvArr* ptr, const char* filename, int line );

 #endif /* __CVCOMMON_H_ */
-
--- a/apps/haartraining/performance.cpp
+++ b/apps/haartraining/performance.cpp
@ -376,4 +376,3 @@ int main( int argc, char* argv[] )

    return 0;
 }
-
--- a/apps/traincascade/CMakeLists.txt
+++ b/apps/traincascade/CMakeLists.txt
@ -34,4 +34,3 @@ if(ENABLE_SOLUTION_FOLDERS)
 endif()

 install(TARGETS ${the_target} RUNTIME DESTINATION bin COMPONENT main)
-
--- a/cmake/OpenCVCRTLinkage.cmake
+++ b/cmake/OpenCVCRTLinkage.cmake
@ -98,4 +98,3 @@ if(NOT BUILD_WITH_DEBUG_INFO AND NOT MSVC)
  string(REPLACE "/Zi" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
  string(REPLACE "/Zi" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
 endif()
-
--- a/cmake/OpenCVCompilerOptions.cmake
+++ b/cmake/OpenCVCompilerOptions.cmake
@ -294,4 +294,4 @@ if(MSVC)
  if(NOT ENABLE_NOISY_WARNINGS)
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251") #class 'std::XXX' needs to have dll-interface to be used by clients of YYY
  endif()
-endif()
+endif()
--- a/cmake/OpenCVConfig.cmake
+++ b/cmake/OpenCVConfig.cmake
@ -156,4 +156,3 @@ else()
  set(OpenCV_FOUND FALSE CACHE BOOL "" FORCE)
  set(OPENCV_FOUND FALSE CACHE BOOL "" FORCE)
 endif()
-
--- a/cmake/OpenCVFindIPP.cmake
+++ b/cmake/OpenCVFindIPP.cmake
@ -346,4 +346,4 @@ if(WIN32 AND MINGW AND NOT IPP_LATEST_VERSION_MAJOR LESS 7)
    #     See http://code.opencv.org/issues/1906 for additional details
    set(MSV_NTDLL    "ntdll")
    set(IPP_LIBRARIES ${IPP_LIBRARIES} ${MSV_NTDLL}${IPP_LIB_SUFFIX})
-endif()
+endif()
--- a/cmake/OpenCVFindXimea.cmake
+++ b/cmake/OpenCVFindXimea.cmake
@ -43,4 +43,4 @@ endif()

 mark_as_advanced(FORCE XIMEA_FOUND)
 mark_as_advanced(FORCE XIMEA_PATH)
-mark_as_advanced(FORCE XIMEA_LIBRARY_DIR)
+mark_as_advanced(FORCE XIMEA_LIBRARY_DIR)
--- a/cmake/OpenCVLegacyOptions.cmake
+++ b/cmake/OpenCVLegacyOptions.cmake
@ -22,4 +22,3 @@ if(DEFINED OPENCV_BUILD_3RDPARTY_LIBS)
  set(BUILD_PNG    ${OPENCV_BUILD_3RDPARTY_LIBS} CACHE BOOL "Set via depricated OPENCV_BUILD_3RDPARTY_LIBS" FORCE)
  unset(OPENCV_BUILD_3RDPARTY_LIBS CACHE)
 endif()
-
--- a/cmake/OpenCVUtils.cmake
+++ b/cmake/OpenCVUtils.cmake
@ -515,4 +515,4 @@ function(ocv_source_group group)
  cmake_parse_arguments(OCV_SOURCE_GROUP "" "" "GLOB" ${ARGN})
  file(GLOB srcs ${OCV_SOURCE_GROUP_GLOB})
  source_group(${group} FILES ${srcs})
-endfunction()
+endfunction()
--- a/cmake/checks/OpenCVDetectCudaArch.cu
+++ b/cmake/checks/OpenCVDetectCudaArch.cu
@ -11,4 +11,4 @@ int main()
        printf("%d.%d ", prop.major, prop.minor);
    }
    return 0;
-}
+}
--- a/cmake/checks/vfwtest.cpp
+++ b/cmake/checks/vfwtest.cpp
@ -7,4 +7,4 @@ int main()
  AVIFileInit();
  AVIFileExit();
  return 0;
-}
+}
--- a/cmake/checks/winrttest.cpp
+++ b/cmake/checks/winrttest.cpp
@ -3,4 +3,4 @@
 int main(int, char**)
 {
 	return 0;
-}
+}
--- a/cmake/cl2cpp.cmake
+++ b/cmake/cl2cpp.cmake
@ -32,4 +32,4 @@ foreach(cl ${cl_list})
  file(APPEND ${OUTPUT} "const char* ${cl_filename}=\"${lines};\n")
 endforeach()

-file(APPEND ${OUTPUT} "}\n}\n")
+file(APPEND ${OUTPUT} "}\n}\n")
--- a/cmake/templates/cmake_uninstall.cmake.in
+++ b/cmake/templates/cmake_uninstall.cmake.in
@ -23,5 +23,3 @@ FOREACH(file ${files})
    MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
  ENDIF(EXISTS "$ENV{DESTDIR}${file}")
 ENDFOREACH(file)
-
-
--- a/cmake/templates/cvconfig.h.cmake
+++ b/cmake/templates/cvconfig.h.cmake
@ -163,4 +163,3 @@
 /* Define to 1 if your processor stores words with the most significant byte
   first (like Motorola and SPARC, unlike Intel and VAX). */
 #cmakedefine WORDS_BIGENDIAN
-
--- a/cmake/templates/opencv_modules.hpp.in
+++ b/cmake/templates/opencv_modules.hpp.in
@ -6,4 +6,4 @@
 *
 */

-@OPENCV_MODULE_DEFINITIONS_CONFIGMAKE@
+@OPENCV_MODULE_DEFINITIONS_CONFIGMAKE@
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@ -122,4 +122,4 @@ if(BUILD_DOCS AND HAVE_SPHINX)
    install(FILES "${f}" DESTINATION "${OPENCV_DOC_INSTALL_PATH}" OPTIONAL)
  endforeach()

-endif()
+endif()
--- a/doc/_static/insertIframe.js
+++ b/doc/_static/insertIframe.js
@ -10,4 +10,3 @@ function insertIframe (elementId, iframeSrc)
    element.parentNode.replaceChild(iframe, element);
  }
 }
-
--- a/doc/_themes/blue/static/default.css_t
+++ b/doc/_themes/blue/static/default.css_t
@ -402,4 +402,4 @@ div.sphinxsidebar #searchbox input[type="text"] {

 div.sphinxsidebar #searchbox input[type="submit"] {
    width:auto;
-}
+}
--- a/doc/_themes/blue/theme.conf
+++ b/doc/_themes/blue/theme.conf
@ -28,4 +28,4 @@ feedbacklinkcolor = #ffffff
 bodyfont = sans-serif
 headfont = 'Trebuchet MS', sans-serif
 guifont = "Lucida Sans","Lucida Sans Unicode","Lucida Grande",Verdana,Arial,Helvetica,sans-serif
-lang = none
+lang = none
--- a/doc/check_docs.py
+++ b/doc/check_docs.py
@ -184,5 +184,3 @@ p = RSTParser()
 for m in opencv_module_list:
    print "\n\n*************************** " + m + " *************************\n"
    p.check_module_docs(m)
-
-
--- a/doc/mymath.sty
+++ b/doc/mymath.sty
@ -39,4 +39,3 @@
 #7 & #8 & #9
 \end{bmatrix}
 }
-
--- a/doc/pattern_tools/svgfig.py
+++ b/doc/pattern_tools/svgfig.py
@ -3667,4 +3667,3 @@ class YErrorBars:
            output.append(LineAxis(x, start, x, end, start, end, bars, False, False, **self.attr).SVG(trans))

        return output
-
--- a/doc/tutorials/calib3d/camera_calibration_square_chess/camera_calibration_square_chess.rst
+++ b/doc/tutorials/calib3d/camera_calibration_square_chess/camera_calibration_square_chess.rst
@ -59,4 +59,4 @@ Now, let us write a code that detects a chessboard in a new image and finds its
 #.
    Calculate reprojection error like it is done in ``calibration`` sample (see ``opencv/samples/cpp/calibration.cpp``, function ``computeReprojectionErrors``).

-Question: how to calculate the distance from the camera origin to any of the corners?
+Question: how to calculate the distance from the camera origin to any of the corners?
--- a/doc/tutorials/core/file_input_output_with_xml_yml/file_input_output_with_xml_yml.rst
+++ b/doc/tutorials/core/file_input_output_with_xml_yml/file_input_output_with_xml_yml.rst
@ -277,4 +277,3 @@ You may observe a runtime instance of this on the `YouTube here <https://www.you
  <div align="center">
  <iframe title="File Input and Output using XML and YAML files in OpenCV" width="560" height="349" src="http://www.youtube.com/embed/A4yqVnByMMM?rel=0&loop=1" frameborder="0" allowfullscreen align="middle"></iframe>
  </div>
-
--- a/doc/tutorials/core/interoperability_with_OpenCV_1/interoperability_with_OpenCV_1.rst
+++ b/doc/tutorials/core/interoperability_with_OpenCV_1/interoperability_with_OpenCV_1.rst
@ -127,6 +127,3 @@ You may observe a runtime instance of this on the `YouTube here <https://www.you
  <div align="center">
  <iframe title="Interoperability with OpenCV 1" width="560" height="349" src="http://www.youtube.com/embed/qckm-zvo31w?rel=0&loop=1" frameborder="0" allowfullscreen align="middle"></iframe>
  </div>
-
-
-
--- a/doc/tutorials/core/table_of_content_core/table_of_content_core.rst
+++ b/doc/tutorials/core/table_of_content_core/table_of_content_core.rst
@ -218,4 +218,4 @@ Here you will learn the about the basic building blocks of the library. A must r
   ../random_generator_and_text/random_generator_and_text
   ../discrete_fourier_transform/discrete_fourier_transform
   ../file_input_output_with_xml_yml/file_input_output_with_xml_yml
-   ../interoperability_with_OpenCV_1/interoperability_with_OpenCV_1
+   ../interoperability_with_OpenCV_1/interoperability_with_OpenCV_1
--- a/doc/tutorials/definitions/README.txt
+++ b/doc/tutorials/definitions/README.txt
@ -1 +1 @@
-Include in this directory only defintion files. None of the reST files entered here will be parsed by the Sphinx Builder.
+Include in this directory only defintion files. None of the reST files entered here will be parsed by the Sphinx Builder.
--- a/doc/tutorials/definitions/noContent.rst
+++ b/doc/tutorials/definitions/noContent.rst
@ -1,3 +1,3 @@

 .. note::
-   Unfortunetly we have no tutorials into this section. And you can help us with that, since OpenCV is a community effort. If you have a tutorial suggestion or you have written a tutorial yourself (or coded a sample code) that you would like to see here, please contact follow these instructions: :ref:`howToWriteTutorial` and :how_to_contribute:`How to contribute <>`.
+   Unfortunetly we have no tutorials into this section. And you can help us with that, since OpenCV is a community effort. If you have a tutorial suggestion or you have written a tutorial yourself (or coded a sample code) that you would like to see here, please contact follow these instructions: :ref:`howToWriteTutorial` and :how_to_contribute:`How to contribute <>`.
--- a/doc/tutorials/features2d/feature_description/feature_description.rst
+++ b/doc/tutorials/features2d/feature_description/feature_description.rst
@ -100,6 +100,3 @@ Result
   .. image:: images/Feature_Description_BruteForce_Result.jpg
      :align: center
      :height: 200pt
-
-
-
--- a/doc/tutorials/features2d/feature_detection/feature_detection.rst
+++ b/doc/tutorials/features2d/feature_detection/feature_detection.rst
@ -95,4 +95,3 @@ Result
   .. image:: images/Feature_Detection_Result_b.jpg
      :align: center
      :height: 200pt
-
--- a/doc/tutorials/features2d/feature_homography/feature_homography.rst
+++ b/doc/tutorials/features2d/feature_homography/feature_homography.rst
@ -146,4 +146,3 @@ Result
   .. image:: images/Feature_Homography_Result.jpg
      :align: center
      :height: 200pt
-
--- a/doc/tutorials/features2d/table_of_content_features2d/table_of_content_features2d.rst
+++ b/doc/tutorials/features2d/table_of_content_features2d/table_of_content_features2d.rst
@ -201,4 +201,3 @@ Learn about how to use the feature points  detectors, descriptors and matching f
   ../feature_flann_matcher/feature_flann_matcher
   ../feature_homography/feature_homography
   ../detection_of_planar_objects/detection_of_planar_objects
-
--- a/doc/tutorials/features2d/trackingmotion/corner_subpixeles/corner_subpixeles.rst
+++ b/doc/tutorials/features2d/trackingmotion/corner_subpixeles/corner_subpixeles.rst
@ -135,4 +135,3 @@ Here is the result:

 .. image:: images/Corner_Subpixeles_Result.jpg
              :align: center
-
--- a/doc/tutorials/features2d/trackingmotion/generic_corner_detector/generic_corner_detector.rst
+++ b/doc/tutorials/features2d/trackingmotion/generic_corner_detector/generic_corner_detector.rst
@ -37,4 +37,3 @@ Result

 .. image:: images/My_Shi_Tomasi_corner_detector_Result.jpg
              :align: center
-
--- a/doc/tutorials/features2d/trackingmotion/good_features_to_track/good_features_to_track.rst
+++ b/doc/tutorials/features2d/trackingmotion/good_features_to_track/good_features_to_track.rst
@ -118,5 +118,3 @@ Result

 .. image:: images/Feature_Detection_Result_a.jpg
              :align: center
-
-
--- a/doc/tutorials/features2d/trackingmotion/harris_detector/harris_detector.rst
+++ b/doc/tutorials/features2d/trackingmotion/harris_detector/harris_detector.rst
@ -243,5 +243,3 @@ The detected corners are surrounded by a small black circle

 .. image:: images/Harris_Detector_Result.jpg
              :align: center
-
-
--- a/doc/tutorials/general/table_of_content_general/table_of_content_general.rst
+++ b/doc/tutorials/general/table_of_content_general/table_of_content_general.rst
@ -10,4 +10,3 @@ These tutorials are the bottom of the iceberg as they link together multiple of
 .. raw:: latex

   \pagebreak
-
--- a/doc/tutorials/highgui/table_of_content_highgui/table_of_content_highgui.rst
+++ b/doc/tutorials/highgui/table_of_content_highgui/table_of_content_highgui.rst
@ -74,4 +74,4 @@ This section contains valuable tutorials about how to read/save your image/video

   ../trackbar/trackbar
   ../video-input-psnr-ssim/video-input-psnr-ssim
-   ../video-write/video-write
+   ../video-write/video-write
--- a/doc/tutorials/highgui/trackbar/trackbar.rst
+++ b/doc/tutorials/highgui/trackbar/trackbar.rst
@ -154,8 +154,3 @@ Result
  .. image:: images/Adding_Trackbars_Tutorial_Result_1.jpg
     :alt: Adding Trackbars - Lena
     :align: center
-
-
-
-
-
--- a/doc/tutorials/imgproc/histograms/histogram_calculation/histogram_calculation.rst
+++ b/doc/tutorials/imgproc/histograms/histogram_calculation/histogram_calculation.rst
@ -329,4 +329,3 @@ Result

     .. image:: images/Histogram_Calculation_Result.jpg
              :align: center
-
--- a/doc/tutorials/imgproc/histograms/template_matching/template_matching.rst
+++ b/doc/tutorials/imgproc/histograms/template_matching/template_matching.rst
@ -369,4 +369,3 @@ Results

   .. image:: images/Template_Matching_Image_Result.jpg
            :align: center
-
--- a/doc/tutorials/imgproc/imgtrans/canny_detector/canny_detector.rst
+++ b/doc/tutorials/imgproc/imgtrans/canny_detector/canny_detector.rst
@ -282,6 +282,3 @@ Result
           :align: center

 * Notice how the image is superposed to the black background on the edge regions.
-
-
-
--- a/doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.rst
+++ b/doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.rst
@ -290,4 +290,3 @@ We get the following result by using the Probabilistic Hough Line Transform:
   :align: center

 You may observe that the number of lines detected vary while you change the *threshold*. The explanation is sort of evident: If you establish a higher threshold, fewer lines will be detected (since you will need more points to declare a line detected).
-
--- a/doc/tutorials/imgproc/imgtrans/remap/remap.rst
+++ b/doc/tutorials/imgproc/imgtrans/remap/remap.rst
@ -311,4 +311,3 @@ Result
         :alt: Result 0 for remapping
         :width: 250pt
         :align: center
-
--- a/doc/tutorials/imgproc/imgtrans/warp_affine/warp_affine.rst
+++ b/doc/tutorials/imgproc/imgtrans/warp_affine/warp_affine.rst
@ -306,4 +306,3 @@ Result
            :alt: Original image
            :width: 250pt
            :align: center
-
--- a/doc/tutorials/imgproc/opening_closing_hats/opening_closing_hats.rst
+++ b/doc/tutorials/imgproc/opening_closing_hats/opening_closing_hats.rst
@ -279,4 +279,3 @@ Results
  .. image:: images/Morphology_2_Tutorial_Cover.jpg
     :alt: Morphology 2: Result sample
     :align: center
-
--- a/doc/tutorials/imgproc/pyramids/pyramids.rst
+++ b/doc/tutorials/imgproc/pyramids/pyramids.rst
@ -259,5 +259,3 @@ Results
  .. image:: images/Pyramids_Tutorial_PyrUp_Result.jpg
     :alt: Pyramids: PyrUp Result
     :align: center
-
-
--- a/doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/bounding_rects_circles.rst
+++ b/doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/bounding_rects_circles.rst
@ -121,4 +121,3 @@ Result

   .. |BRC_1|  image:: images/Bounding_Rects_Circles_Result.jpg
                    :align: middle
-
--- a/doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/bounding_rotated_ellipses.rst
+++ b/doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/bounding_rotated_ellipses.rst
@ -123,4 +123,3 @@ Result

   .. |BRE_1|  image:: images/Bounding_Rotated_Ellipses_Result.jpg
                    :align: middle
-
--- a/doc/tutorials/imgproc/shapedescriptors/find_contours/find_contours.rst
+++ b/doc/tutorials/imgproc/shapedescriptors/find_contours/find_contours.rst
@ -104,4 +104,3 @@ Result

   .. |contour_1|  image:: images/Find_Contours_Result.jpg
                     :align: middle
-
--- a/doc/tutorials/imgproc/shapedescriptors/hull/hull.rst
+++ b/doc/tutorials/imgproc/shapedescriptors/hull/hull.rst
@ -113,4 +113,3 @@ Result

   .. |Hull_1|  image:: images/Hull_Result.jpg
                     :align: middle
-
--- a/doc/tutorials/imgproc/shapedescriptors/moments/moments.rst
+++ b/doc/tutorials/imgproc/shapedescriptors/moments/moments.rst
@ -133,4 +133,3 @@ Result
   .. |MU_2|  image:: images/Moments_Result2.jpg
                    :width: 250pt
                    :align: middle
-
--- a/doc/tutorials/imgproc/shapedescriptors/point_polygon_test/point_polygon_test.rst
+++ b/doc/tutorials/imgproc/shapedescriptors/point_polygon_test/point_polygon_test.rst
@ -114,4 +114,3 @@ Result

   .. |PPT_1|  image:: images/Point_Polygon_Test_Result.jpg
                    :align: middle
-
--- a/doc/tutorials/imgproc/table_of_content_imgproc/table_of_content_imgproc.rst
+++ b/doc/tutorials/imgproc/table_of_content_imgproc/table_of_content_imgproc.rst
@ -539,6 +539,3 @@ In this section you will learn about the image processing (manipulation) functio
   ../shapedescriptors/bounding_rotated_ellipses/bounding_rotated_ellipses
   ../shapedescriptors/moments/moments
   ../shapedescriptors/point_polygon_test/point_polygon_test
-
-
-
--- a/doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
+++ b/doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
@ -384,4 +384,4 @@ upcoming issues. During this it may take a little longer to see your work online
 however if you submitted it, be sure that eventually it will show up.

 If you have any questions or advices relating to this tutorial you can contact us at
-delete-admin@-delete-opencv.org (delete the -delete- parts of that email address).
+-delete-admin@-delete-opencv.org (delete the -delete- parts of that email address).
--- a/doc/tutorials/introduction/linux_eclipse/linux_eclipse.rst
+++ b/doc/tutorials/introduction/linux_eclipse/linux_eclipse.rst
@ -253,6 +253,3 @@ Say you have or create a new file, *helloworld.cpp* in a directory called *foo*:
 a. You can also optionally modify the ``Build command:`` from ``make`` to something like ``make VERBOSE=1 -j4`` which tells the compiler to produce detailed symbol files for debugging and also to compile in 4 parallel threads.

 #. Done!
-
-
-
--- a/doc/tutorials/introduction/linux_install/linux_install.rst
+++ b/doc/tutorials/introduction/linux_install/linux_install.rst
@ -80,4 +80,3 @@ Building OpenCV from Source Using CMake, Using the Command Line
 .. note::

   If the size of the created library is a critical issue (like in case of an Android build) you can use the ``install/strip`` command to get the smallest size as possible. The *stripped* version appears to be twice as small. However, we do not recommend using this unless those extra megabytes do really matter.
-
--- a/doc/tutorials/ios/hello/hello.rst
+++ b/doc/tutorials/ios/hello/hello.rst
@ -73,4 +73,3 @@ Now we will learn how to write a simple Hello World Application in Xcode using O
 .. image:: images/output.png
     :alt: output
     :align: center
-
--- a/doc/tutorials/ios/image_manipulation/image_manipulation.rst
+++ b/doc/tutorials/ios/image_manipulation/image_manipulation.rst
@ -127,4 +127,4 @@ Check out an instance of running code with more Image Effects on `YouTube <http:

  <div align="center">
 <iframe width="560" height="350" src="http://www.youtube.com/embed/Ko3K_xdhJ1I" frameborder="0" allowfullscreen></iframe>
-  </div>
+  </div>
--- a/doc/tutorials/ml/introduction_to_svm/introduction_to_svm.rst
+++ b/doc/tutorials/ml/introduction_to_svm/introduction_to_svm.rst
@ -185,4 +185,3 @@ Results
 .. image:: images/result.png
  :alt: The seperated planes
  :align: center
-
--- a/doc/tutorials/ml/non_linear_svms/non_linear_svms.rst
+++ b/doc/tutorials/ml/non_linear_svms/non_linear_svms.rst
@ -216,4 +216,4 @@ You may observe a runtime instance of this on the `YouTube here <https://www.you

  <div align="center">
  <iframe title="Support Vector Machines for Non-Linearly Separable Data" width="560" height="349" src="http://www.youtube.com/embed/vFv2yPcSo-Q?rel=0&loop=1" frameborder="0" allowfullscreen align="middle"></iframe>
-  </div>
+  </div>
--- a/doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
+++ b/doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
@ -131,4 +131,3 @@ Result
   .. image:: images/Cascade_Classifier_Tutorial_Result_LBP.jpg
      :align: center
      :height: 300pt
-
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@ -5,5 +5,3 @@ install(FILES ${old_hdrs}
 install(FILES "opencv2/opencv.hpp"
    DESTINATION ${OPENCV_INCLUDE_INSTALL_PATH}/opencv2
    COMPONENT main)
-
-
--- a/include/opencv/cv.h
+++ b/include/opencv/cv.h
@ -80,4 +80,3 @@
 #endif //__cplusplus

 #endif // __OPENCV_OLD_CV_H_
-
--- a/include/opencv/cxeigen.hpp
+++ b/include/opencv/cxeigen.hpp
@ -46,4 +46,3 @@
 #include "opencv2/core/eigen.hpp"

 #endif
-
--- a/modules/androidcamera/camera_wrapper/camera_wrapper.h
+++ b/modules/androidcamera/camera_wrapper/camera_wrapper.h
@ -14,4 +14,3 @@ double getCameraPropertyC(void* camera, int propIdx);
 void setCameraPropertyC(void* camera, int propIdx, double value);
 void applyCameraPropertiesC(void** camera);
 }
-
--- a/modules/androidcamera/include/camera_activity.hpp
+++ b/modules/androidcamera/include/camera_activity.hpp
@ -45,4 +45,4 @@ private:
    int frameHeight;
 };

-#endif
+#endif
--- a/modules/calib3d/doc/calib3d.rst
+++ b/modules/calib3d/doc/calib3d.rst
@ -6,4 +6,3 @@ calib3d. Camera Calibration and 3D Reconstruction
    :maxdepth: 2

    camera_calibration_and_3d_reconstruction
-
--- a/modules/calib3d/src/_modelest.h
+++ b/modules/calib3d/src/_modelest.h
@ -78,4 +78,3 @@ protected:
 };

 #endif // _CV_MODEL_EST_H_
-
--- a/modules/calib3d/src/epnp.cpp
+++ b/modules/calib3d/src/epnp.cpp
@ -622,4 +622,3 @@ void epnp::qr_solve(CvMat * A, CvMat * b, CvMat * X)
    pX[i] = (pb[i] - sum) / A2[i];
  }
 }
-
--- a/modules/calib3d/src/p3p.cpp
+++ b/modules/calib3d/src/p3p.cpp
@ -413,4 +413,3 @@ bool p3p::jacobi_4x4(double * A, double * D, double * U)

    return false;
 }
-
--- a/modules/calib3d/src/p3p.h
+++ b/modules/calib3d/src/p3p.h
@ -59,4 +59,3 @@ class p3p
 };

 #endif // P3P_H
-
--- a/modules/calib3d/src/solvepnp.cpp
+++ b/modules/calib3d/src/solvepnp.cpp
@ -346,4 +346,3 @@ void cv::solvePnPRansac(InputArray _opoints, InputArray _ipoints,
    }
    return;
 }
-
--- a/modules/calib3d/test/test_affine3d_estimator.cpp
+++ b/modules/calib3d/test/test_affine3d_estimator.cpp
@ -193,4 +193,3 @@ void CV_Affine3D_EstTest::run( int /* start_from */)
 }

 TEST(Calib3d_EstimateAffineTransform, accuracy) { CV_Affine3D_EstTest test; test.safe_run(); }
-
--- a/modules/calib3d/test/test_cameracalibration_badarg.cpp
+++ b/modules/calib3d/test/test_cameracalibration_badarg.cpp
@ -734,5 +734,3 @@ protected:
 TEST(Calib3d_CalibrateCamera_C, badarg) { CV_CameraCalibrationBadArgTest test; test.safe_run(); }
 TEST(Calib3d_Rodrigues_C, badarg) { CV_Rodrigues2BadArgTest test; test.safe_run(); }
 TEST(Calib3d_ProjectPoints_C, badarg) { CV_ProjectPoints2BadArgTest test; test.safe_run(); }
-
-
--- a/modules/calib3d/test/test_chessboardgenerator.cpp
+++ b/modules/calib3d/test/test_chessboardgenerator.cpp
@ -329,4 +329,3 @@ Mat cv::ChessBoardGenerator::operator ()(const Mat& bg, const Mat& camMat, const
    return generateChessBoard(bg, camMat, distCoeffs, zero, pb1, pb2,
        squareSize.width, squareSize.height,  pts3d, corners);
 }
-
--- a/modules/calib3d/test/test_compose_rt.cpp
+++ b/modules/calib3d/test/test_compose_rt.cpp
@ -212,4 +212,3 @@ protected:
 };

 TEST(Calib3d_ComposeRT, accuracy) { CV_composeRT_Test test; test.safe_run(); }
-
--- a/modules/calib3d/test/test_precomp.hpp
+++ b/modules/calib3d/test/test_precomp.hpp
@ -22,4 +22,3 @@ namespace cvtest
 }

 #endif
-
--- a/modules/calib3d/test/test_reproject_image_to_3d.cpp
+++ b/modules/calib3d/test/test_reproject_image_to_3d.cpp
@ -172,4 +172,3 @@ protected:
 };

 TEST(Calib3d_ReprojectImageTo3D, accuracy) { CV_ReprojectImageTo3DTest test; test.safe_run(); }
-
--- a/modules/calib3d/test/test_solvepnp_ransac.cpp
+++ b/modules/calib3d/test/test_solvepnp_ransac.cpp
@ -303,4 +303,4 @@ TEST(DISABLED_Calib3d_SolvePnPRansac, concurrency)
    EXPECT_LT(tnorm, 1e-6);

 }
-#endif
+#endif
--- a/modules/calib3d/test/test_undistort_points.cpp
+++ b/modules/calib3d/test/test_undistort_points.cpp
@ -94,4 +94,4 @@ void CV_UndistortTest::run(int /* start_from */)
    }
 }

-TEST(Calib3d_Undistort, accuracy) { CV_UndistortTest test; test.safe_run(); }
+TEST(Calib3d_Undistort, accuracy) { CV_UndistortTest test; test.safe_run(); }
--- a/modules/contrib/doc/facerec/facerec_tutorial.rst
+++ b/modules/contrib/doc/facerec/facerec_tutorial.rst
@ -626,5 +626,3 @@ CSV for the AT&T Facedatabase
 .. literalinclude:: etc/at.txt
   :language: none
   :linenos:
-
-
--- a/modules/contrib/doc/facerec/index.rst
+++ b/modules/contrib/doc/facerec/index.rst
@ -30,4 +30,3 @@ Indices and tables
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`
-
--- a/modules/contrib/doc/facerec/src/CMakeLists.txt
+++ b/modules/contrib/doc/facerec/src/CMakeLists.txt
@ -23,4 +23,3 @@ target_link_libraries(facerec_fisherfaces opencv_contrib opencv_core opencv_imgp

 add_executable(facerec_lbph facerec_lbph.cpp)
 target_link_libraries(facerec_lbph opencv_contrib opencv_core opencv_imgproc opencv_highgui)
-
--- a/modules/contrib/doc/facerec/tutorial/facerec_gender_classification.rst
+++ b/modules/contrib/doc/facerec/tutorial/facerec_gender_classification.rst
@ -231,5 +231,3 @@ Here are some examples:
 +---------------------------------+----------------------------------------------------------------------------+
 | 0.2 (20%), 0.2 (20%), (70,70)   | .. image:: ../img/tutorial/gender_classification/arnie_20_20_70_70.jpg     |
 +---------------------------------+----------------------------------------------------------------------------+
-
-
--- a/modules/contrib/doc/facerec/tutorial/facerec_save_load.rst
+++ b/modules/contrib/doc/facerec/tutorial/facerec_save_load.rst
@ -44,4 +44,3 @@ And here is the Reconstruction, which is the same as the original:

 .. image:: ../img/eigenface_reconstruction_opencv.png
    :align: center
-
--- a/modules/contrib/doc/facerec/tutorial/facerec_video_recognition.rst
+++ b/modules/contrib/doc/facerec/tutorial/facerec_video_recognition.rst
@ -205,5 +205,3 @@ Here are some examples:
 +---------------------------------+----------------------------------------------------------------------------+
 | 0.2 (20%), 0.2 (20%), (70,70)   | .. image:: ../img/tutorial/gender_classification/arnie_20_20_70_70.jpg     |
 +---------------------------------+----------------------------------------------------------------------------+
-
-
--- a/modules/contrib/doc/stereo.rst
+++ b/modules/contrib/doc/stereo.rst
@ -113,5 +113,3 @@ The method executes the variational algorithm on a rectified stereo pair. See ``
 **Note**:

 The method is not constant, so you should not use the same ``StereoVar`` instance from different threads simultaneously.
-
-
--- a/modules/contrib/include/opencv2/contrib/contrib.hpp
+++ b/modules/contrib/include/opencv2/contrib/contrib.hpp
@ -983,4 +983,3 @@ namespace cv
 #endif

 #endif
-
--- a/modules/contrib/include/opencv2/contrib/retina.hpp
+++ b/modules/contrib/include/opencv2/contrib/retina.hpp
@ -353,4 +353,3 @@ protected:

 }
 #endif /* __OPENCV_CONTRIB_RETINA_HPP__ */
-
--- a/Show More
+++ b/Show More