From e9a28f66ee9d999a6127bae169925a646b51bfce Mon Sep 17 00:00:00 2001 From: Roman Donchenko Date: Wed, 21 Aug 2013 17:26:54 +0400 Subject: [PATCH] Normalized file endings. --- 3rdparty/ffmpeg/ffmpeg_version.cmake | 2 +- 3rdparty/ffmpeg/make.bat | 2 +- 3rdparty/ffmpeg/readme.txt | 2 -- 3rdparty/libjasper/CMakeLists.txt | 1 - 3rdparty/libtiff/tif_config.h.cmakein | 1 - 3rdparty/tbb/.gitignore | 2 +- CMakeLists.txt | 1 - apps/haartraining/CMakeLists.txt | 1 - apps/haartraining/_cvcommon.h | 1 - apps/haartraining/performance.cpp | 1 - apps/traincascade/CMakeLists.txt | 1 - cmake/OpenCVCRTLinkage.cmake | 1 - cmake/OpenCVCompilerOptions.cmake | 2 +- cmake/OpenCVConfig.cmake | 1 - cmake/OpenCVFindIPP.cmake | 2 +- cmake/OpenCVFindXimea.cmake | 2 +- cmake/OpenCVLegacyOptions.cmake | 1 - cmake/OpenCVUtils.cmake | 2 +- cmake/checks/OpenCVDetectCudaArch.cu | 2 +- cmake/checks/vfwtest.cpp | 2 +- cmake/checks/winrttest.cpp | 2 +- cmake/cl2cpp.cmake | 2 +- cmake/templates/cmake_uninstall.cmake.in | 2 -- cmake/templates/cvconfig.h.cmake | 1 - cmake/templates/opencv_modules.hpp.in | 2 +- doc/CMakeLists.txt | 2 +- doc/_static/insertIframe.js | 1 - doc/_themes/blue/static/default.css_t | 2 +- doc/_themes/blue/theme.conf | 2 +- doc/check_docs.py | 2 -- doc/mymath.sty | 1 - doc/pattern_tools/svgfig.py | 1 - .../camera_calibration_square_chess.rst | 2 +- .../file_input_output_with_xml_yml.rst | 1 - .../interoperability_with_OpenCV_1.rst | 3 --- .../core/table_of_content_core/table_of_content_core.rst | 2 +- doc/tutorials/definitions/README.txt | 2 +- doc/tutorials/definitions/noContent.rst | 2 +- .../feature_description/feature_description.rst | 3 --- .../features2d/feature_detection/feature_detection.rst | 1 - .../features2d/feature_homography/feature_homography.rst | 1 - .../table_of_content_features2d.rst | 1 - .../corner_subpixeles/corner_subpixeles.rst | 1 - .../generic_corner_detector/generic_corner_detector.rst | 1 - .../good_features_to_track/good_features_to_track.rst | 2 -- .../trackingmotion/harris_detector/harris_detector.rst | 2 -- .../table_of_content_general.rst | 1 - .../table_of_content_highgui.rst | 2 +- doc/tutorials/highgui/trackbar/trackbar.rst | 5 ----- .../histogram_calculation/histogram_calculation.rst | 1 - .../histograms/template_matching/template_matching.rst | 1 - .../imgproc/imgtrans/canny_detector/canny_detector.rst | 3 --- .../imgproc/imgtrans/hough_lines/hough_lines.rst | 1 - doc/tutorials/imgproc/imgtrans/remap/remap.rst | 1 - .../imgproc/imgtrans/warp_affine/warp_affine.rst | 1 - .../opening_closing_hats/opening_closing_hats.rst | 1 - doc/tutorials/imgproc/pyramids/pyramids.rst | 2 -- .../bounding_rects_circles/bounding_rects_circles.rst | 1 - .../bounding_rotated_ellipses.rst | 1 - .../shapedescriptors/find_contours/find_contours.rst | 1 - doc/tutorials/imgproc/shapedescriptors/hull/hull.rst | 1 - .../imgproc/shapedescriptors/moments/moments.rst | 1 - .../point_polygon_test/point_polygon_test.rst | 1 - .../table_of_content_imgproc.rst | 3 --- .../how_to_write_a_tutorial/how_to_write_a_tutorial.rst | 2 +- .../introduction/linux_eclipse/linux_eclipse.rst | 3 --- .../introduction/linux_install/linux_install.rst | 1 - doc/tutorials/ios/hello/hello.rst | 1 - .../ios/image_manipulation/image_manipulation.rst | 2 +- .../ml/introduction_to_svm/introduction_to_svm.rst | 1 - doc/tutorials/ml/non_linear_svms/non_linear_svms.rst | 2 +- .../objdetect/cascade_classifier/cascade_classifier.rst | 1 - include/CMakeLists.txt | 2 -- include/opencv/cv.h | 1 - include/opencv/cxeigen.hpp | 1 - modules/androidcamera/camera_wrapper/camera_wrapper.h | 1 - modules/androidcamera/include/camera_activity.hpp | 2 +- modules/calib3d/doc/calib3d.rst | 1 - modules/calib3d/src/_modelest.h | 1 - modules/calib3d/src/epnp.cpp | 1 - modules/calib3d/src/p3p.cpp | 1 - modules/calib3d/src/p3p.h | 1 - modules/calib3d/src/solvepnp.cpp | 1 - modules/calib3d/test/test_affine3d_estimator.cpp | 1 - modules/calib3d/test/test_cameracalibration_badarg.cpp | 2 -- modules/calib3d/test/test_chessboardgenerator.cpp | 1 - modules/calib3d/test/test_compose_rt.cpp | 1 - modules/calib3d/test/test_precomp.hpp | 1 - modules/calib3d/test/test_reproject_image_to_3d.cpp | 1 - modules/calib3d/test/test_solvepnp_ransac.cpp | 2 +- modules/calib3d/test/test_undistort_points.cpp | 2 +- modules/contrib/doc/facerec/facerec_tutorial.rst | 2 -- modules/contrib/doc/facerec/index.rst | 1 - modules/contrib/doc/facerec/src/CMakeLists.txt | 1 - .../facerec/tutorial/facerec_gender_classification.rst | 2 -- .../contrib/doc/facerec/tutorial/facerec_save_load.rst | 1 - .../doc/facerec/tutorial/facerec_video_recognition.rst | 2 -- modules/contrib/doc/stereo.rst | 2 -- modules/contrib/include/opencv2/contrib/contrib.hpp | 1 - modules/contrib/include/opencv2/contrib/retina.hpp | 1 - modules/contrib/src/adaptiveskindetector.cpp | 2 -- modules/contrib/src/basicretinafilter.hpp | 2 -- modules/contrib/src/bowmsctrainer.cpp | 1 - modules/contrib/src/chowliutree.cpp | 1 - modules/contrib/src/colortracker.cpp | 2 -- modules/contrib/src/contrib_init.cpp | 1 - modules/contrib/src/detection_based_tracker.cpp | 1 - modules/contrib/src/featuretracker.cpp | 1 - modules/contrib/src/fuzzymeanshifttracker.cpp | 1 - modules/contrib/src/hybridtracker.cpp | 1 - modules/contrib/src/lda.cpp | 1 - modules/contrib/src/logpolar_bsm.cpp | 1 - modules/contrib/src/magnoretinafilter.cpp | 2 -- modules/contrib/src/magnoretinafilter.hpp | 2 -- modules/contrib/src/parvoretinafilter.cpp | 1 - modules/contrib/src/parvoretinafilter.hpp | 1 - modules/contrib/src/retina.cpp | 1 - modules/contrib/src/retinacolor.hpp | 2 -- modules/contrib/src/retinafilter.hpp | 4 ---- modules/contrib/src/stereovar.cpp | 2 +- modules/contrib/src/templatebuffer.hpp | 3 --- modules/contrib/test/test_precomp.hpp | 1 - modules/core/doc/basic_structures.rst | 1 - modules/core/doc/core.rst | 1 - modules/core/doc/drawing_functions.rst | 1 - modules/core/doc/dynamic_structures.rst | 1 - modules/core/doc/old_basic_structures.rst | 1 - modules/core/include/opencv2/core/eigen.hpp | 1 - modules/core/perf/perf_abs.cpp | 1 - modules/core/perf/perf_bitwise.cpp | 1 - modules/core/perf/perf_merge.cpp | 2 +- modules/core/src/convert.cpp | 2 +- modules/core/src/lapack.cpp | 2 +- modules/core/src/out.cpp | 1 - modules/core/test/test_arithm.cpp | 2 +- modules/core/test/test_ds.cpp | 2 -- modules/core/test/test_dxt.cpp | 2 -- modules/core/test/test_math.cpp | 1 - modules/features2d/CMakeLists.txt | 1 - .../doc/common_interfaces_of_descriptor_matchers.rst | 1 - .../common_interfaces_of_generic_descriptor_matchers.rst | 2 -- .../doc/drawing_function_of_keypoints_and_matches.rst | 1 - modules/features2d/doc/object_categorization.rst | 1 - modules/features2d/perf/perf_fast.cpp | 1 - modules/features2d/src/fast_score.cpp | 1 - modules/features2d/test/test_brisk.cpp | 1 - modules/features2d/test/test_fast.cpp | 1 - modules/features2d/test/test_keypoints.cpp | 2 -- modules/features2d/test/test_mser.cpp | 1 - modules/flann/CMakeLists.txt | 1 - modules/flann/include/opencv2/flann/random.h | 2 -- modules/flann/include/opencv2/flann/result_set.h | 1 - modules/flann/src/flann.cpp | 2 +- modules/flann/src/precomp.hpp | 1 - modules/gpu/doc/data_structures.rst | 1 - modules/gpu/doc/introduction.rst | 1 - modules/gpu/include/opencv2/gpu/device/block.hpp | 2 -- modules/gpu/misc/mark_nvidia.py | 1 - modules/gpu/perf4au/CMakeLists.txt | 1 - modules/gpu/src/calib3d.cpp | 2 -- modules/gpu/src/denoising.cpp | 2 -- modules/gpu/src/precomp.cpp | 1 - modules/gpu/src/speckle_filtering.cpp | 1 - modules/highgui/doc/qt_new_functions.rst | 2 -- .../highgui/doc/reading_and_writing_images_and_video.rst | 1 - modules/highgui/include/opencv2/highgui/ios.h | 2 +- modules/highgui/perf/perf_input.cpp | 2 +- modules/highgui/perf/perf_output.cpp | 2 +- modules/highgui/src/cap_avfoundation.mm | 1 - modules/highgui/src/cap_ffmpeg_api.hpp | 1 - modules/highgui/src/cap_ios_abstract_camera.mm | 1 - modules/highgui/src/cap_ios_video_camera.mm | 1 - modules/highgui/src/cap_msmf.cpp | 2 +- modules/highgui/src/cap_qtkit.mm | 1 - modules/highgui/src/files_Qt/Milky/README.txt | 2 +- modules/highgui/src/grfmt_bmp.cpp | 1 - modules/highgui/src/ios_conversions.mm | 2 +- modules/highgui/test/test_fourcc.cpp | 2 +- modules/highgui/test/test_main.cpp | 1 - modules/highgui/test/test_positioning.cpp | 2 +- modules/imgproc/doc/filtering.rst | 1 - modules/imgproc/doc/geometric_transformations.rst | 2 -- modules/imgproc/doc/miscellaneous_transformations.rst | 2 +- modules/imgproc/doc/object_detection.rst | 2 +- modules/imgproc/perf/perf_cornerEigenValsAndVecs.cpp | 2 +- modules/imgproc/perf/perf_cornerHarris.cpp | 2 +- modules/imgproc/perf/perf_filter2d.cpp | 2 -- modules/imgproc/perf/perf_warp.cpp | 1 - modules/imgproc/src/rotcalipers.cpp | 1 - modules/imgproc/test/test_approxpoly.cpp | 1 - modules/imgproc/test/test_convhull.cpp | 1 - modules/imgproc/test/test_distancetransform.cpp | 2 -- modules/imgproc/test/test_filter.cpp | 1 - modules/imgproc/test/test_houghLines.cpp | 1 - modules/imgproc/test/test_thresh.cpp | 1 - modules/imgproc/test/test_watershed.cpp | 1 - modules/java/android_test/.gitignore | 2 +- .../src/org/opencv/test/imgproc/ImgprocTest.java | 2 +- modules/java/check-tests.py | 1 - modules/java/generator/gen_java.py | 1 - modules/java/generator/src/cpp/common.h | 2 +- modules/java/generator/src/cpp/core_manual.cpp | 2 +- modules/java/generator/src/cpp/jni_part.cpp | 2 +- modules/java/generator/src/cpp/utils.cpp | 2 +- modules/java/generator/src/java/android+sync.py | 2 +- .../generator/src/java/engine+OpenCVEngineInterface.aidl | 2 +- .../doc/common_interfaces_of_descriptor_extractors.rst | 2 +- .../common_interfaces_of_generic_descriptor_matchers.rst | 1 - modules/legacy/doc/expectation_maximization.rst | 1 - modules/legacy/doc/histograms.rst | 1 - modules/legacy/doc/motion_analysis.rst | 2 -- modules/legacy/doc/planar_subdivisions.rst | 1 - modules/legacy/include/opencv2/legacy/streams.hpp | 1 - modules/legacy/src/_vm.h | 1 - modules/legacy/src/bgfg_codebook.cpp | 1 - modules/legacy/src/bgfg_common.cpp | 1 - modules/legacy/src/bgfg_gaussmix.cpp | 1 - modules/legacy/src/blobtrack.cpp | 1 - modules/legacy/src/blobtrackanalysis.cpp | 1 - modules/legacy/src/blobtrackanalysisior.cpp | 1 - modules/legacy/src/blobtrackanalysistrackdist.cpp | 1 - modules/legacy/src/blobtrackgen1.cpp | 2 -- modules/legacy/src/blobtrackgenyml.cpp | 2 -- modules/legacy/src/blobtrackingauto.cpp | 1 - modules/legacy/src/blobtrackingmsfg.cpp | 1 - modules/legacy/src/blobtrackingmsfgs.cpp | 1 - modules/legacy/src/blobtrackpostprockalman.cpp | 1 - modules/legacy/src/calcimagehomography.cpp | 1 - modules/legacy/src/calibfilter.cpp | 2 -- modules/legacy/src/clique.cpp | 1 - modules/legacy/src/decomppoly.cpp | 1 - modules/legacy/src/dpstereo.cpp | 1 - modules/legacy/src/enteringblobdetection.cpp | 2 -- modules/legacy/src/enteringblobdetectionreal.cpp | 1 - modules/legacy/src/epilines.cpp | 2 -- modules/legacy/src/extendededges.cpp | 4 ---- modules/legacy/src/face.cpp | 1 - modules/legacy/src/face.h | 1 - modules/legacy/src/facedetection.cpp | 2 -- modules/legacy/src/facetemplate.h | 1 - modules/legacy/src/features2d.cpp | 2 -- modules/legacy/src/findface.cpp | 1 - modules/legacy/src/findhandregion.cpp | 1 - modules/legacy/src/hmm.cpp | 1 - modules/legacy/src/hmm1d.cpp | 1 - modules/legacy/src/image.cpp | 1 - modules/legacy/src/lcm.cpp | 4 ---- modules/legacy/src/levmar.cpp | 3 --- modules/legacy/src/lines.cpp | 1 - modules/legacy/src/lmeds.cpp | 1 - modules/legacy/src/morphing.cpp | 1 - modules/legacy/src/testseq.cpp | 1 - modules/legacy/src/texture.cpp | 1 - modules/legacy/src/trifocal.cpp | 1 - modules/legacy/src/vecfacetracking.cpp | 1 - modules/legacy/src/video.cpp | 2 -- modules/legacy/test/test_bruteforcematcher.cpp | 1 - modules/legacy/test/test_optflow.cpp | 2 -- modules/legacy/test/test_subdivisions.cpp | 1 - modules/ml/doc/decision_trees.rst | 1 - modules/ml/doc/k_nearest_neighbors.rst | 2 -- modules/ml/doc/neural_networks.rst | 1 - modules/ml/doc/statistical_models.rst | 1 - modules/ml/src/ertrees.cpp | 1 - modules/ml/src/knearest.cpp | 1 - modules/ml/src/nbayes.cpp | 1 - modules/ml/src/svm.cpp | 1 - modules/ml/test/test_emknearestkmeans.cpp | 1 - modules/nonfree/doc/feature_detection.rst | 2 +- modules/nonfree/include/opencv2/nonfree/ocl.hpp | 2 +- modules/nonfree/perf/perf_surf.ocl.cpp | 2 +- modules/nonfree/test/test_detectors.cpp | 3 --- modules/nonfree/test/test_features2d.cpp | 1 - modules/objdetect/doc/latent_svm.rst | 2 -- modules/objdetect/src/_lsvm_tbbversion.h | 2 +- modules/objdetect/src/cascadedetect.hpp | 1 - modules/objdetect/src/featurepyramid.cpp | 2 +- modules/objdetect/src/fft.cpp | 1 - modules/objdetect/src/lsvmtbbversion.cpp | 1 - modules/ocl/doc/data_structures.rst | 2 +- modules/ocl/doc/feature_detection_and_description.rst | 2 +- modules/ocl/doc/image_filtering.rst | 2 +- modules/ocl/doc/matrix_reductions.rst | 2 +- modules/ocl/doc/structures_and_utility_functions.rst | 2 +- modules/ocl/perf/main.cpp | 2 +- modules/ocl/perf/perf_arithm.cpp | 2 +- modules/ocl/perf/perf_blend.cpp | 2 +- modules/ocl/perf/perf_brute_force_matcher.cpp | 2 +- modules/ocl/perf/perf_calib3d.cpp | 9 --------- modules/ocl/perf/perf_canny.cpp | 2 +- modules/ocl/perf/perf_color.cpp | 2 +- modules/ocl/perf/perf_fft.cpp | 2 +- modules/ocl/perf/perf_gemm.cpp | 2 +- modules/ocl/perf/perf_haar.cpp | 2 +- modules/ocl/perf/perf_hog.cpp | 2 +- modules/ocl/perf/perf_match_template.cpp | 2 +- modules/ocl/perf/perf_matrix_operation.cpp | 2 +- modules/ocl/perf/perf_norm.cpp | 2 +- modules/ocl/perf/perf_precomp.cpp | 4 ---- modules/ocl/perf/perf_pyramid.cpp | 2 +- modules/ocl/src/blend.cpp | 2 +- modules/ocl/src/columnsum.cpp | 2 +- modules/ocl/src/gftt.cpp | 2 -- modules/ocl/src/hog.cpp | 2 +- modules/ocl/src/interpolate_frames.cpp | 1 - modules/ocl/src/kmeans.cpp | 1 - modules/ocl/src/moments.cpp | 1 - .../ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl | 1 - modules/ocl/src/opencl/arithm_compare_eq.cl | 1 - modules/ocl/src/opencl/arithm_compare_ne.cl | 2 -- modules/ocl/src/opencl/arithm_div.cl | 2 -- modules/ocl/src/opencl/arithm_minMaxLoc.cl | 2 +- modules/ocl/src/opencl/arithm_mul.cl | 2 +- modules/ocl/src/opencl/filter_sep_row.cl | 2 -- modules/ocl/src/opencl/haarobjectdetect.cl | 2 -- modules/ocl/src/opencl/haarobjectdetect_scaled2.cl | 1 - modules/ocl/src/opencl/imgproc_gftt.cl | 1 - modules/ocl/src/opencl/imgproc_integral.cl | 2 +- modules/ocl/src/opencl/imgproc_warpPerspective.cl | 1 - modules/ocl/src/opencl/moments.cl | 2 +- modules/ocl/src/pyrdown.cpp | 1 - modules/ocl/src/pyrup.cpp | 2 +- modules/ocl/src/stereobm.cpp | 1 - modules/ocl/src/stereobp.cpp | 1 - modules/ocl/src/tvl1flow.cpp | 2 +- modules/ocl/test/test_blend.cpp | 2 +- modules/ocl/test/test_canny.cpp | 2 +- modules/ocl/test/test_objdetect.cpp | 2 +- modules/ocl/test/test_optflow.cpp | 1 - modules/ocl/test/test_precomp.hpp | 1 - modules/ocl/test/utility.cpp | 1 - modules/photo/doc/denoising.rst | 1 - modules/photo/doc/inpainting.rst | 2 +- modules/photo/src/arrays.hpp | 2 -- modules/photo/src/denoising.cpp | 2 -- modules/python/src2/cv2.cpp | 1 - modules/python/src2/cv2.cv.hpp | 1 - modules/python/test/calchist.py | 1 - modules/stitching/CMakeLists.txt | 1 - modules/stitching/doc/autocalib.rst | 1 - modules/stitching/doc/exposure_compensation.rst | 1 - modules/stitching/doc/high_level.rst | 1 - modules/stitching/doc/stitching.rst | 2 -- modules/stitching/doc/warpers.rst | 2 +- modules/stitching/src/motion_estimators.cpp | 1 - modules/stitching/src/seam_finders.cpp | 1 - modules/stitching/test/test_matchers.cpp | 2 +- modules/superres/src/btv_l1_ocl.cpp | 2 +- modules/superres/src/opencl/superres_btvl1.cl | 2 +- modules/superres/src/optical_flow.cpp | 2 +- modules/ts/misc/perf_tests_timing.py | 2 +- modules/ts/misc/report.py | 2 +- modules/ts/src/ts_perf.cpp | 1 - modules/video/src/bgfg_gaussmix.cpp | 1 - modules/video/src/kalman.cpp | 2 -- modules/video/src/lkpyramid.hpp | 1 - modules/video/src/optflowgf.cpp | 1 - modules/video/src/simpleflow.cpp | 1 - modules/videostab/CMakeLists.txt | 1 - modules/videostab/src/precomp.hpp | 1 - platforms/android/package/CMakeLists.txt | 2 +- platforms/android/refman.rst | 2 +- platforms/android/service/all.py | 2 +- platforms/android/service/device.conf | 2 +- platforms/android/service/doc/Intro.rst | 2 +- .../android/service/doc/LoaderCallbackInterface.rst | 2 +- platforms/android/service/doc/UseCases.rst | 2 +- platforms/android/service/doc/build_uml.py | 2 +- platforms/android/service/engine/jni/Android.mk | 2 +- platforms/android/service/engine/jni/Application.mk | 2 +- .../engine/jni/BinderComponent/BnOpenCVEngine.cpp | 2 +- .../service/engine/jni/BinderComponent/BnOpenCVEngine.h | 2 +- .../engine/jni/BinderComponent/BpOpenCVEngine.cpp | 2 +- .../service/engine/jni/BinderComponent/BpOpenCVEngine.h | 2 +- .../engine/jni/BinderComponent/HardwareDetector.cpp | 2 +- .../engine/jni/BinderComponent/HardwareDetector.h | 2 +- .../service/engine/jni/BinderComponent/ProcReader.h | 2 +- .../service/engine/jni/BinderComponent/StringUtils.cpp | 2 +- .../service/engine/jni/BinderComponent/StringUtils.h | 2 +- .../service/engine/jni/BinderComponent/TegraDetector.cpp | 2 +- .../service/engine/jni/BinderComponent/TegraDetector.h | 2 +- .../engine/jni/JNIWrapper/HardwareDetector_jni.cpp | 2 +- .../service/engine/jni/NativeClient/ClientMain.cpp | 2 +- .../engine/jni/NativeService/NativePackageManager.cpp | 2 +- .../engine/jni/NativeService/NativePackageManager.h | 2 +- .../service/engine/jni/NativeService/ServiceMain.cpp | 2 +- .../service/engine/jni/Tests/PackageManagerStub.cpp | 2 +- .../service/engine/jni/Tests/PackageManagerStub.h | 2 +- platforms/android/service/engine/jni/Tests/TestMain.cpp | 2 +- platforms/android/service/engine/jni/Tests/Tests.mk | 2 +- .../android/service/engine/jni/include/EngineCommon.h | 2 +- .../android/service/engine/jni/include/IOpenCVEngine.h | 2 +- .../src/org/opencv/engine/OpenCVEngineInterface.aidl | 2 +- platforms/android/service/push_native.py | 2 +- platforms/ios/build_framework.py | 2 +- platforms/ios/cmake/Modules/Platform/iOS.cmake | 2 +- .../ios/cmake/Toolchains/Toolchain-iPhoneOS_Xcode.cmake | 2 +- .../Toolchains/Toolchain-iPhoneSimulator_Xcode.cmake | 2 +- platforms/ios/readme.txt | 2 +- platforms/readme.txt | 2 +- platforms/scripts/cmake_winrt.cmd | 2 +- platforms/winrt/arm.winrt.toolchain.cmake | 2 +- samples/android/.gitignore | 2 +- samples/android/color-blob-detection/CMakeLists.txt | 1 - .../colorblobdetect/ColorBlobDetectionActivity.java | 2 +- samples/android/face-detection/CMakeLists.txt | 1 - samples/android/face-detection/jni/Android.mk | 2 +- .../face-detection/jni/DetectionBasedTracker_jni.cpp | 2 +- samples/android/hello-android/main.cpp | 1 - .../opencv/samples/NativeActivity/CvNativeActivity.java | 2 +- samples/android/tutorial-1-camerapreview/CMakeLists.txt | 1 - samples/android/tutorial-3-cameracontrol/CMakeLists.txt | 1 - .../src/org/opencv/samples/tutorial3/Tutorial3View.java | 2 +- samples/c/CMakeLists.txt | 1 - samples/c/adaptiveskindetector.cpp | 1 - samples/c/blobtrack_sample.cpp | 3 --- samples/c/example_cmake/CMakeLists.txt | 3 --- samples/c/example_cmake/README.txt | 5 ----- samples/c/example_cmake/minarea.c | 1 - samples/cpp/CMakeLists.txt | 1 - ...OpenEXRimages_HighDynamicRange_Retina_toneMapping.cpp | 2 -- ...Rimages_HighDynamicRange_Retina_toneMapping_video.cpp | 2 -- samples/cpp/bgfg_gmg.cpp | 1 - samples/cpp/calibration_artificial.cpp | 1 - samples/cpp/dft.cpp | 1 - samples/cpp/houghlines.cpp | 1 - samples/cpp/opencv_version.cpp | 2 +- samples/cpp/phase_corr.cpp | 4 ---- samples/cpp/retinaDemo.cpp | 1 - samples/cpp/stereo_calib.cpp | 1 - samples/cpp/stitching.cpp | 2 -- samples/cpp/stitching_detailed.cpp | 2 -- samples/cpp/tutorial_code/ImgProc/Morphology_2.cpp | 2 -- samples/cpp/tutorial_code/ImgProc/Pyramids.cpp | 7 ------- samples/cpp/tutorial_code/ImgTrans/Sobel_Demo.cpp | 2 -- .../cpp/tutorial_code/ImgTrans/copyMakeBorder_demo.cpp | 2 -- .../cpp/tutorial_code/ShapeDescriptors/moments_demo.cpp | 1 - .../ShapeDescriptors/pointPolygonTest_demo.cpp | 2 -- .../tutorial_code/TrackingMotion/cornerDetector_Demo.cpp | 1 - .../tutorial_code/TrackingMotion/cornerSubPix_Demo.cpp | 1 - .../TrackingMotion/goodFeaturesToTrack_Demo.cpp | 1 - samples/cpp/tutorial_code/core/Matrix/Drawing_1.cpp | 2 -- .../discrete_fourier_transform.cpp | 2 +- .../core/file_input_output/file_input_output.cpp | 2 +- .../core/how_to_scan_images/how_to_scan_images.cpp | 2 +- .../core/mat_mask_operations/mat_mask_operations.cpp | 2 +- .../mat_the_basic_image_container.cpp | 2 +- .../gpu/gpu-basics-similarity/gpu-basics-similarity.cpp | 1 - .../introduction/display_image/display_image.cpp | 2 +- .../introduction/windows_visual_studio_Opencv/Test.cpp | 2 +- .../tutorial_code/ml/non_linear_svms/non_linear_svms.cpp | 2 +- samples/gpu/CMakeLists.txt | 1 - samples/gpu/brox_optical_flow.cpp | 2 +- samples/gpu/hog.cpp | 1 - samples/gpu/houghlines.cpp | 1 - samples/gpu/stereo_match.cpp | 2 -- samples/java/sbt/src/main/java/DetectFaceDemo.java | 2 +- .../src/main/scala/ScalaCorrespondenceMatchingDemo.scala | 2 +- .../java/sbt/src/main/scala/ScalaDetectFaceDemo.scala | 2 +- samples/ocl/CMakeLists.txt | 1 - samples/ocl/hog.cpp | 1 - samples/ocl/stereo_match.cpp | 2 -- samples/ocl/tvl1_optical_flow.cpp | 2 +- samples/python/watershed.py | 1 - samples/python2/asift.py | 1 - samples/python2/calibrate.py | 1 - samples/python2/camshift.py | 1 - samples/python2/common.py | 1 - samples/python2/deconvolution.py | 1 - samples/python2/demo.py | 1 - samples/python2/distrans.py | 1 - samples/python2/edge.py | 1 - samples/python2/facedetect.py | 1 - samples/python2/hist.py | 1 - samples/python2/inpaint.py | 1 - samples/python2/lappyr.py | 2 -- samples/python2/opt_flow.py | 1 - samples/winrt/ImageManipulations/MediaCapture.vcxproj | 2 +- .../MediaExtensions/Common/BufferLock.h | 1 - .../ImageManipulations/MediaExtensions/Common/OpQueue.h | 2 +- .../OcvTransform/OcvImageManipulations.idl | 2 +- .../MediaExtensions/OcvTransform/OcvTransform.cpp | 1 - .../MediaExtensions/OcvTransform/OcvTransform.def | 2 +- .../MediaExtensions/OcvTransform/OcvTransform.h | 2 +- .../MediaExtensions/OcvTransform/OcvTransform.vcxproj | 2 +- samples/winrt/ImageManipulations/Package.appxmanifest | 2 +- 486 files changed, 166 insertions(+), 606 deletions(-) diff --git a/3rdparty/ffmpeg/ffmpeg_version.cmake b/3rdparty/ffmpeg/ffmpeg_version.cmake index e35e8c7a63..7fc3d65306 100644 --- 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) \ No newline at end of file +set(ALIASOF_libswscale_VERSION 2.1.100) diff --git a/3rdparty/ffmpeg/make.bat b/3rdparty/ffmpeg/make.bat index 9f11b52d63..2323af9ab8 100644 --- 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 \ No newline at end of file +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 diff --git a/3rdparty/ffmpeg/readme.txt b/3rdparty/ffmpeg/readme.txt index 1928a53039..e98b285208 100644 --- 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 \3rdparty\ffmpeg, edit make.bat (change paths to the actual paths to your msys32 and msys64 distributions) and then run make.bat - - diff --git a/3rdparty/libjasper/CMakeLists.txt b/3rdparty/libjasper/CMakeLists.txt index 97919bee49..8430ca1658 100644 --- 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() - diff --git a/3rdparty/libtiff/tif_config.h.cmakein b/3rdparty/libtiff/tif_config.h.cmakein index 1e6bc0454c..182f2833d1 100644 --- 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 - diff --git a/3rdparty/tbb/.gitignore b/3rdparty/tbb/.gitignore index 601e1b265e..69ce9ceb9c 100644 --- a/3rdparty/tbb/.gitignore +++ b/3rdparty/tbb/.gitignore @@ -1 +1 @@ -tbb*.tgz \ No newline at end of file +tbb*.tgz diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e745e7f97..4c38b5b713 100644 --- 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() - diff --git a/apps/haartraining/CMakeLists.txt b/apps/haartraining/CMakeLists.txt index 953be3b7e5..92c4473b19 100644 --- 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() - diff --git a/apps/haartraining/_cvcommon.h b/apps/haartraining/_cvcommon.h index e4f1081645..136fd68085 100644 --- 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_ */ - diff --git a/apps/haartraining/performance.cpp b/apps/haartraining/performance.cpp index 2fe98f8211..fd9c857a85 100644 --- a/apps/haartraining/performance.cpp +++ b/apps/haartraining/performance.cpp @@ -376,4 +376,3 @@ int main( int argc, char* argv[] ) return 0; } - diff --git a/apps/traincascade/CMakeLists.txt b/apps/traincascade/CMakeLists.txt index be60137a9d..f4f5478937 100644 --- 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) - diff --git a/cmake/OpenCVCRTLinkage.cmake b/cmake/OpenCVCRTLinkage.cmake index 62d89af4a9..26437669d5 100644 --- 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() - diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake index 7a91b188ae..4ba6469979 100644 --- 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() \ No newline at end of file +endif() diff --git a/cmake/OpenCVConfig.cmake b/cmake/OpenCVConfig.cmake index 300fcd4193..ef920e94fa 100644 --- 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() - diff --git a/cmake/OpenCVFindIPP.cmake b/cmake/OpenCVFindIPP.cmake index afa0da9793..772cae886f 100644 --- 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() \ No newline at end of file +endif() diff --git a/cmake/OpenCVFindXimea.cmake b/cmake/OpenCVFindXimea.cmake index 20dc9e8a54..6b86b609e9 100644 --- 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) \ No newline at end of file +mark_as_advanced(FORCE XIMEA_LIBRARY_DIR) diff --git a/cmake/OpenCVLegacyOptions.cmake b/cmake/OpenCVLegacyOptions.cmake index e05ad4c48d..d74bd6ed8a 100644 --- 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() - diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake index 59366eb03b..cefe3d812f 100644 --- 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() \ No newline at end of file +endfunction() diff --git a/cmake/checks/OpenCVDetectCudaArch.cu b/cmake/checks/OpenCVDetectCudaArch.cu index 008f8ba8d0..9d7086cf24 100644 --- 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; -} \ No newline at end of file +} diff --git a/cmake/checks/vfwtest.cpp b/cmake/checks/vfwtest.cpp index 63d545788f..8d8ecb2719 100644 --- a/cmake/checks/vfwtest.cpp +++ b/cmake/checks/vfwtest.cpp @@ -7,4 +7,4 @@ int main() AVIFileInit(); AVIFileExit(); return 0; -} \ No newline at end of file +} diff --git a/cmake/checks/winrttest.cpp b/cmake/checks/winrttest.cpp index 4172afe557..6e15e1b362 100644 --- a/cmake/checks/winrttest.cpp +++ b/cmake/checks/winrttest.cpp @@ -3,4 +3,4 @@ int main(int, char**) { return 0; -} \ No newline at end of file +} diff --git a/cmake/cl2cpp.cmake b/cmake/cl2cpp.cmake index 4f18e9e643..1e932eabdb 100644 --- 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") \ No newline at end of file +file(APPEND ${OUTPUT} "}\n}\n") diff --git a/cmake/templates/cmake_uninstall.cmake.in b/cmake/templates/cmake_uninstall.cmake.in index 14e601019d..0e63d705cd 100644 --- 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) - - diff --git a/cmake/templates/cvconfig.h.cmake b/cmake/templates/cvconfig.h.cmake index 833d1eb3d8..bce8eafcaa 100644 --- 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 - diff --git a/cmake/templates/opencv_modules.hpp.in b/cmake/templates/opencv_modules.hpp.in index 5d58e40e4c..1498715028 100644 --- a/cmake/templates/opencv_modules.hpp.in +++ b/cmake/templates/opencv_modules.hpp.in @@ -6,4 +6,4 @@ * */ -@OPENCV_MODULE_DEFINITIONS_CONFIGMAKE@ \ No newline at end of file +@OPENCV_MODULE_DEFINITIONS_CONFIGMAKE@ diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 63f3a451b3..8f6955c4b7 100644 --- 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() \ No newline at end of file +endif() diff --git a/doc/_static/insertIframe.js b/doc/_static/insertIframe.js index ba464246da..0a3099a8c2 100644 --- a/doc/_static/insertIframe.js +++ b/doc/_static/insertIframe.js @@ -10,4 +10,3 @@ function insertIframe (elementId, iframeSrc) element.parentNode.replaceChild(iframe, element); } } - diff --git a/doc/_themes/blue/static/default.css_t b/doc/_themes/blue/static/default.css_t index e2127db1da..f2084902b7 100644 --- 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; -} \ No newline at end of file +} diff --git a/doc/_themes/blue/theme.conf b/doc/_themes/blue/theme.conf index 206193f6f2..bc0b99b2a3 100644 --- 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 \ No newline at end of file +lang = none diff --git a/doc/check_docs.py b/doc/check_docs.py index 8ab5fced4d..13d9f763e7 100755 --- 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) - - diff --git a/doc/mymath.sty b/doc/mymath.sty index 491c160cc3..4da8282121 100644 --- a/doc/mymath.sty +++ b/doc/mymath.sty @@ -39,4 +39,3 @@ #7 & #8 & #9 \end{bmatrix} } - diff --git a/doc/pattern_tools/svgfig.py b/doc/pattern_tools/svgfig.py index 86afa59133..c690c9ff08 100755 --- 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 - diff --git 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 index 4eff2640ad..e08550750d 100644 --- 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? \ No newline at end of file +Question: how to calculate the distance from the camera origin to any of the corners? diff --git 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 index 87166b7cc3..42f6a60915 100644 --- 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 - diff --git 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 index 9340a7c748..62afaed49e 100644 --- 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 - - - diff --git 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 index b50d97635f..4150265d10 100644 --- 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 \ No newline at end of file + ../interoperability_with_OpenCV_1/interoperability_with_OpenCV_1 diff --git a/doc/tutorials/definitions/README.txt b/doc/tutorials/definitions/README.txt index 829e27cacb..a598a95dd7 100644 --- 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. \ No newline at end of file +Include in this directory only defintion files. None of the reST files entered here will be parsed by the Sphinx Builder. diff --git a/doc/tutorials/definitions/noContent.rst b/doc/tutorials/definitions/noContent.rst index a273a9ad17..c2780c266d 100644 --- 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 <>`. \ No newline at end of file + 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 <>`. diff --git a/doc/tutorials/features2d/feature_description/feature_description.rst b/doc/tutorials/features2d/feature_description/feature_description.rst index 0329cc4641..94b7c684e6 100644 --- 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 - - - diff --git a/doc/tutorials/features2d/feature_detection/feature_detection.rst b/doc/tutorials/features2d/feature_detection/feature_detection.rst index 1051fe5dee..0e690404a8 100644 --- 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 - diff --git a/doc/tutorials/features2d/feature_homography/feature_homography.rst b/doc/tutorials/features2d/feature_homography/feature_homography.rst index eb06083b05..e195e53f43 100644 --- 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 - diff --git 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 index cc90082b85..f4107804bb 100644 --- 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 - diff --git a/doc/tutorials/features2d/trackingmotion/corner_subpixeles/corner_subpixeles.rst b/doc/tutorials/features2d/trackingmotion/corner_subpixeles/corner_subpixeles.rst index 1b405e46c0..0c5aedbcc1 100644 --- 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 - diff --git a/doc/tutorials/features2d/trackingmotion/generic_corner_detector/generic_corner_detector.rst b/doc/tutorials/features2d/trackingmotion/generic_corner_detector/generic_corner_detector.rst index 465ff216cb..d33bf3df6c 100644 --- 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 - diff --git 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 index e69937eaa3..63b0d97494 100644 --- 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 - - diff --git a/doc/tutorials/features2d/trackingmotion/harris_detector/harris_detector.rst b/doc/tutorials/features2d/trackingmotion/harris_detector/harris_detector.rst index cb9650775f..2c3cb14aa6 100644 --- 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 - - diff --git 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 index 2a6d57ffb9..6e127a98f6 100644 --- 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 - diff --git 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 index 0ba7c323cb..ef6eacce27 100644 --- 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 \ No newline at end of file + ../video-write/video-write diff --git a/doc/tutorials/highgui/trackbar/trackbar.rst b/doc/tutorials/highgui/trackbar/trackbar.rst index d6f7202ce1..e5fbb85f5c 100644 --- 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 - - - - - diff --git a/doc/tutorials/imgproc/histograms/histogram_calculation/histogram_calculation.rst b/doc/tutorials/imgproc/histograms/histogram_calculation/histogram_calculation.rst index de1567abb2..f2859c1bef 100644 --- 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 - diff --git a/doc/tutorials/imgproc/histograms/template_matching/template_matching.rst b/doc/tutorials/imgproc/histograms/template_matching/template_matching.rst index e0c643d05c..e7f0e818e4 100644 --- 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 - diff --git a/doc/tutorials/imgproc/imgtrans/canny_detector/canny_detector.rst b/doc/tutorials/imgproc/imgtrans/canny_detector/canny_detector.rst index 52b10468ba..06257fa1b0 100644 --- 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. - - - diff --git a/doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.rst b/doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.rst index dfb57c03c7..8c759c00c2 100644 --- 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). - diff --git a/doc/tutorials/imgproc/imgtrans/remap/remap.rst b/doc/tutorials/imgproc/imgtrans/remap/remap.rst index 27eef0d116..b86897ba9f 100644 --- 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 - diff --git a/doc/tutorials/imgproc/imgtrans/warp_affine/warp_affine.rst b/doc/tutorials/imgproc/imgtrans/warp_affine/warp_affine.rst index 8c08d22e42..b2e3be9084 100644 --- 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 - diff --git a/doc/tutorials/imgproc/opening_closing_hats/opening_closing_hats.rst b/doc/tutorials/imgproc/opening_closing_hats/opening_closing_hats.rst index db96faa2da..1132005069 100644 --- 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 - diff --git a/doc/tutorials/imgproc/pyramids/pyramids.rst b/doc/tutorials/imgproc/pyramids/pyramids.rst index ee40bf72eb..b9d0d4e93a 100644 --- 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 - - diff --git a/doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/bounding_rects_circles.rst b/doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/bounding_rects_circles.rst index d073a1b925..069ba64b05 100644 --- 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 - diff --git a/doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/bounding_rotated_ellipses.rst b/doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/bounding_rotated_ellipses.rst index 894df8605e..1bbfeb3d6b 100644 --- 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 - diff --git a/doc/tutorials/imgproc/shapedescriptors/find_contours/find_contours.rst b/doc/tutorials/imgproc/shapedescriptors/find_contours/find_contours.rst index decdf31ef6..f145506ce4 100644 --- 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 - diff --git a/doc/tutorials/imgproc/shapedescriptors/hull/hull.rst b/doc/tutorials/imgproc/shapedescriptors/hull/hull.rst index c6abdd2c82..a17c3e9f41 100644 --- 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 - diff --git a/doc/tutorials/imgproc/shapedescriptors/moments/moments.rst b/doc/tutorials/imgproc/shapedescriptors/moments/moments.rst index 6ef2de6ee6..847bf362d7 100644 --- 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 - diff --git a/doc/tutorials/imgproc/shapedescriptors/point_polygon_test/point_polygon_test.rst b/doc/tutorials/imgproc/shapedescriptors/point_polygon_test/point_polygon_test.rst index a73a8e92e5..c333bf5d81 100644 --- 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 - diff --git 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 index 1be239cfb1..a371c02c87 100644 --- 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 - - - diff --git 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 index ee89a4e9c3..30620bafc3 100644 --- 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). \ No newline at end of file +-delete-admin@-delete-opencv.org (delete the -delete- parts of that email address). diff --git a/doc/tutorials/introduction/linux_eclipse/linux_eclipse.rst b/doc/tutorials/introduction/linux_eclipse/linux_eclipse.rst index dc684451e7..6aaf7c0874 100644 --- 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! - - - diff --git a/doc/tutorials/introduction/linux_install/linux_install.rst b/doc/tutorials/introduction/linux_install/linux_install.rst index e8b96dab73..1e02b64c9d 100644 --- 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. - diff --git a/doc/tutorials/ios/hello/hello.rst b/doc/tutorials/ios/hello/hello.rst index 8deda33ef0..196b88de9e 100644 --- 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 - diff --git a/doc/tutorials/ios/image_manipulation/image_manipulation.rst b/doc/tutorials/ios/image_manipulation/image_manipulation.rst index fd2d9c6e3f..c4cde19907 100644 --- 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 - \ No newline at end of file + diff --git a/doc/tutorials/ml/introduction_to_svm/introduction_to_svm.rst b/doc/tutorials/ml/introduction_to_svm/introduction_to_svm.rst index 1b3abd660a..50f734803d 100644 --- 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 - diff --git a/doc/tutorials/ml/non_linear_svms/non_linear_svms.rst b/doc/tutorials/ml/non_linear_svms/non_linear_svms.rst index c09a8e3f8a..5e46bb003a 100644 --- 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 - \ No newline at end of file + diff --git a/doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst b/doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst index cabb81c010..03080fec50 100644 --- 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 - diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 1d5909616a..ed3b85a8fc 100644 --- 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) - - diff --git a/include/opencv/cv.h b/include/opencv/cv.h index f9831cf5cd..77d0971a25 100644 --- a/include/opencv/cv.h +++ b/include/opencv/cv.h @@ -80,4 +80,3 @@ #endif //__cplusplus #endif // __OPENCV_OLD_CV_H_ - diff --git a/include/opencv/cxeigen.hpp b/include/opencv/cxeigen.hpp index c503f713d6..1f04d1a3a2 100644 --- a/include/opencv/cxeigen.hpp +++ b/include/opencv/cxeigen.hpp @@ -46,4 +46,3 @@ #include "opencv2/core/eigen.hpp" #endif - diff --git a/modules/androidcamera/camera_wrapper/camera_wrapper.h b/modules/androidcamera/camera_wrapper/camera_wrapper.h index 88c9c4100b..430dea2dd5 100644 --- 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); } - diff --git a/modules/androidcamera/include/camera_activity.hpp b/modules/androidcamera/include/camera_activity.hpp index 76a63b06ec..a6a62e767c 100644 --- a/modules/androidcamera/include/camera_activity.hpp +++ b/modules/androidcamera/include/camera_activity.hpp @@ -45,4 +45,4 @@ private: int frameHeight; }; -#endif \ No newline at end of file +#endif diff --git a/modules/calib3d/doc/calib3d.rst b/modules/calib3d/doc/calib3d.rst index 0ac8d51960..0c056843d2 100644 --- 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 - diff --git a/modules/calib3d/src/_modelest.h b/modules/calib3d/src/_modelest.h index 2488a934b1..4aef46edf6 100644 --- a/modules/calib3d/src/_modelest.h +++ b/modules/calib3d/src/_modelest.h @@ -78,4 +78,3 @@ protected: }; #endif // _CV_MODEL_EST_H_ - diff --git a/modules/calib3d/src/epnp.cpp b/modules/calib3d/src/epnp.cpp index 7f4782ce0e..30786f946a 100644 --- 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]; } } - diff --git a/modules/calib3d/src/p3p.cpp b/modules/calib3d/src/p3p.cpp index a02da3ecb7..674df2c8a7 100644 --- 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; } - diff --git a/modules/calib3d/src/p3p.h b/modules/calib3d/src/p3p.h index a58b0fa149..57f8d7df88 100644 --- a/modules/calib3d/src/p3p.h +++ b/modules/calib3d/src/p3p.h @@ -59,4 +59,3 @@ class p3p }; #endif // P3P_H - diff --git a/modules/calib3d/src/solvepnp.cpp b/modules/calib3d/src/solvepnp.cpp index 3d2c0c2c47..b0ef1d9830 100644 --- a/modules/calib3d/src/solvepnp.cpp +++ b/modules/calib3d/src/solvepnp.cpp @@ -346,4 +346,3 @@ void cv::solvePnPRansac(InputArray _opoints, InputArray _ipoints, } return; } - diff --git a/modules/calib3d/test/test_affine3d_estimator.cpp b/modules/calib3d/test/test_affine3d_estimator.cpp index eedfa687c6..732400b913 100644 --- 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(); } - diff --git a/modules/calib3d/test/test_cameracalibration_badarg.cpp b/modules/calib3d/test/test_cameracalibration_badarg.cpp index b805e71a49..b5ce3fca6b 100644 --- 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(); } - - diff --git a/modules/calib3d/test/test_chessboardgenerator.cpp b/modules/calib3d/test/test_chessboardgenerator.cpp index d8ec943a4c..01a4c019c8 100644 --- 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); } - diff --git a/modules/calib3d/test/test_compose_rt.cpp b/modules/calib3d/test/test_compose_rt.cpp index b71288e6d4..577cc06270 100644 --- 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(); } - diff --git a/modules/calib3d/test/test_precomp.hpp b/modules/calib3d/test/test_precomp.hpp index e0fcd486d1..76381b8255 100644 --- a/modules/calib3d/test/test_precomp.hpp +++ b/modules/calib3d/test/test_precomp.hpp @@ -22,4 +22,3 @@ namespace cvtest } #endif - diff --git a/modules/calib3d/test/test_reproject_image_to_3d.cpp b/modules/calib3d/test/test_reproject_image_to_3d.cpp index a93804f74e..0c03831c90 100644 --- 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(); } - diff --git a/modules/calib3d/test/test_solvepnp_ransac.cpp b/modules/calib3d/test/test_solvepnp_ransac.cpp index 3377a57c63..6c924a5804 100644 --- 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 \ No newline at end of file +#endif diff --git a/modules/calib3d/test/test_undistort_points.cpp b/modules/calib3d/test/test_undistort_points.cpp index c1ace3d4df..5dabd213db 100644 --- 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(); } \ No newline at end of file +TEST(Calib3d_Undistort, accuracy) { CV_UndistortTest test; test.safe_run(); } diff --git a/modules/contrib/doc/facerec/facerec_tutorial.rst b/modules/contrib/doc/facerec/facerec_tutorial.rst index 16b425d7ee..cbfb417971 100644 --- 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: - - diff --git a/modules/contrib/doc/facerec/index.rst b/modules/contrib/doc/facerec/index.rst index ce8a15e677..b871448c55 100644 --- 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` - diff --git a/modules/contrib/doc/facerec/src/CMakeLists.txt b/modules/contrib/doc/facerec/src/CMakeLists.txt index e56762ea49..94aa36fbe0 100644 --- 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) - diff --git a/modules/contrib/doc/facerec/tutorial/facerec_gender_classification.rst b/modules/contrib/doc/facerec/tutorial/facerec_gender_classification.rst index 0c7398d2fb..770083170d 100644 --- 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 | +---------------------------------+----------------------------------------------------------------------------+ - - diff --git a/modules/contrib/doc/facerec/tutorial/facerec_save_load.rst b/modules/contrib/doc/facerec/tutorial/facerec_save_load.rst index 7948bcd73a..2d0b65dffd 100644 --- 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 - diff --git a/modules/contrib/doc/facerec/tutorial/facerec_video_recognition.rst b/modules/contrib/doc/facerec/tutorial/facerec_video_recognition.rst index b692fe5137..76e76eebe2 100644 --- 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 | +---------------------------------+----------------------------------------------------------------------------+ - - diff --git a/modules/contrib/doc/stereo.rst b/modules/contrib/doc/stereo.rst index d5f2d00801..103bd0f3fd 100644 --- 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. - - diff --git a/modules/contrib/include/opencv2/contrib/contrib.hpp b/modules/contrib/include/opencv2/contrib/contrib.hpp index f18a5f93cf..7d881c359a 100644 --- a/modules/contrib/include/opencv2/contrib/contrib.hpp +++ b/modules/contrib/include/opencv2/contrib/contrib.hpp @@ -983,4 +983,3 @@ namespace cv #endif #endif - diff --git a/modules/contrib/include/opencv2/contrib/retina.hpp b/modules/contrib/include/opencv2/contrib/retina.hpp index 6f660efcac..3d7c847beb 100644 --- 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__ */ - diff --git a/modules/contrib/src/adaptiveskindetector.cpp b/modules/contrib/src/adaptiveskindetector.cpp index a44c42077f..0865ad70b9 100644 --- a/modules/contrib/src/adaptiveskindetector.cpp +++ b/modules/contrib/src/adaptiveskindetector.cpp @@ -284,5 +284,3 @@ void CvAdaptiveSkinDetector::Histogram::mergeWith(CvAdaptiveSkinDetector::Histog } } }; - - diff --git a/modules/contrib/src/basicretinafilter.hpp b/modules/contrib/src/basicretinafilter.hpp index 439f0d15fe..8bd136d68e 100644 --- a/modules/contrib/src/basicretinafilter.hpp +++ b/modules/contrib/src/basicretinafilter.hpp @@ -653,5 +653,3 @@ namespace cv } #endif - - diff --git a/modules/contrib/src/bowmsctrainer.cpp b/modules/contrib/src/bowmsctrainer.cpp index 448505c5ba..12d9781b23 100644 --- a/modules/contrib/src/bowmsctrainer.cpp +++ b/modules/contrib/src/bowmsctrainer.cpp @@ -136,4 +136,3 @@ Mat BOWMSCTrainer::cluster(const Mat& _descriptors) const { } } - diff --git a/modules/contrib/src/chowliutree.cpp b/modules/contrib/src/chowliutree.cpp index ba1ef65610..64417d1d9b 100644 --- a/modules/contrib/src/chowliutree.cpp +++ b/modules/contrib/src/chowliutree.cpp @@ -287,4 +287,3 @@ bool ChowLiuTree::reduceEdgesToMinSpan(std::list& edges) { } } - diff --git a/modules/contrib/src/colortracker.cpp b/modules/contrib/src/colortracker.cpp index 03cdf07ae9..dfa3ed5d04 100644 --- a/modules/contrib/src/colortracker.cpp +++ b/modules/contrib/src/colortracker.cpp @@ -133,5 +133,3 @@ Point2f CvMeanShiftTracker::getTrackingCenter() { return prev_center; } - - diff --git a/modules/contrib/src/contrib_init.cpp b/modules/contrib/src/contrib_init.cpp index a80f6f5e11..317867a59f 100644 --- a/modules/contrib/src/contrib_init.cpp +++ b/modules/contrib/src/contrib_init.cpp @@ -41,4 +41,3 @@ //M*/ #include "precomp.hpp" - diff --git a/modules/contrib/src/detection_based_tracker.cpp b/modules/contrib/src/detection_based_tracker.cpp index a1e5dea4de..0b3fcce65b 100644 --- a/modules/contrib/src/detection_based_tracker.cpp +++ b/modules/contrib/src/detection_based_tracker.cpp @@ -853,4 +853,3 @@ const DetectionBasedTracker::Parameters& DetectionBasedTracker::getParameters() } #endif - diff --git a/modules/contrib/src/featuretracker.cpp b/modules/contrib/src/featuretracker.cpp index 87cccf4b7c..b8d40deb02 100644 --- a/modules/contrib/src/featuretracker.cpp +++ b/modules/contrib/src/featuretracker.cpp @@ -221,4 +221,3 @@ Point2f CvFeatureTracker::getTrackingCenter() center.y = (float)(prev_center.y + prev_trackwindow.height/2.0); return center; } - diff --git a/modules/contrib/src/fuzzymeanshifttracker.cpp b/modules/contrib/src/fuzzymeanshifttracker.cpp index c83f915b03..d221d49c0f 100644 --- a/modules/contrib/src/fuzzymeanshifttracker.cpp +++ b/modules/contrib/src/fuzzymeanshifttracker.cpp @@ -720,4 +720,3 @@ void CvFuzzyMeanShiftTracker::track(IplImage *maskImage, IplImage *depthMap, int searchMode = tsTracking; } }; - diff --git a/modules/contrib/src/hybridtracker.cpp b/modules/contrib/src/hybridtracker.cpp index 362de7c04d..0fd31f8f79 100644 --- a/modules/contrib/src/hybridtracker.cpp +++ b/modules/contrib/src/hybridtracker.cpp @@ -234,4 +234,3 @@ void CvHybridTracker::updateTrackerWithLowPassFilter(Mat) { Rect CvHybridTracker::getTrackingWindow() { return prev_window; } - diff --git a/modules/contrib/src/lda.cpp b/modules/contrib/src/lda.cpp index 5ff94ce6e9..98c696612c 100644 --- a/modules/contrib/src/lda.cpp +++ b/modules/contrib/src/lda.cpp @@ -1111,4 +1111,3 @@ Mat LDA::reconstruct(InputArray src) { } } - diff --git a/modules/contrib/src/logpolar_bsm.cpp b/modules/contrib/src/logpolar_bsm.cpp index 3de6a61820..b96eea8031 100644 --- a/modules/contrib/src/logpolar_bsm.cpp +++ b/modules/contrib/src/logpolar_bsm.cpp @@ -649,4 +649,3 @@ LogPolar_Adjacent::~LogPolar_Adjacent() } } - diff --git a/modules/contrib/src/magnoretinafilter.cpp b/modules/contrib/src/magnoretinafilter.cpp index 6f72c5bbeb..57a4466a39 100644 --- a/modules/contrib/src/magnoretinafilter.cpp +++ b/modules/contrib/src/magnoretinafilter.cpp @@ -207,5 +207,3 @@ const std::valarray &MagnoRetinaFilter::runFilter(const std::valarrayactivateContoursProcessing(activate);} } // end of namespace cv - diff --git a/modules/contrib/src/retinacolor.hpp b/modules/contrib/src/retinacolor.hpp index 056d006e4b..7b7294442b 100644 --- a/modules/contrib/src/retinacolor.hpp +++ b/modules/contrib/src/retinacolor.hpp @@ -338,5 +338,3 @@ namespace cv } #endif /*RETINACOLOR_HPP_*/ - - diff --git a/modules/contrib/src/retinafilter.hpp b/modules/contrib/src/retinafilter.hpp index 7fa2a078c8..572ae4c25c 100644 --- a/modules/contrib/src/retinafilter.hpp +++ b/modules/contrib/src/retinafilter.hpp @@ -543,7 +543,3 @@ private: } #endif /*RETINACLASSES_H_*/ - - - - diff --git a/modules/contrib/src/stereovar.cpp b/modules/contrib/src/stereovar.cpp index 1b542bbf52..e08d6328b7 100644 --- a/modules/contrib/src/stereovar.cpp +++ b/modules/contrib/src/stereovar.cpp @@ -408,4 +408,4 @@ void StereoVar::operator ()( const Mat& left, const Mat& right, Mat& disp ) u.release(); } -} // namespace \ No newline at end of file +} // namespace diff --git a/modules/contrib/src/templatebuffer.hpp b/modules/contrib/src/templatebuffer.hpp index c49e493580..e50cd442ce 100644 --- a/modules/contrib/src/templatebuffer.hpp +++ b/modules/contrib/src/templatebuffer.hpp @@ -550,6 +550,3 @@ namespace cv } #endif - - - diff --git a/modules/contrib/test/test_precomp.hpp b/modules/contrib/test/test_precomp.hpp index d477eddbbe..ea73ce932e 100644 --- a/modules/contrib/test/test_precomp.hpp +++ b/modules/contrib/test/test_precomp.hpp @@ -14,4 +14,3 @@ #include #endif - diff --git a/modules/core/doc/basic_structures.rst b/modules/core/doc/basic_structures.rst index 7631ee3654..a3f7f92b65 100644 --- a/modules/core/doc/basic_structures.rst +++ b/modules/core/doc/basic_structures.rst @@ -2892,4 +2892,3 @@ The above methods are usually enough for users. If you want to make your own alg * Add public virtual method ``AlgorithmInfo* info() const;`` to your class. * Add constructor function, ``AlgorithmInfo`` instance and implement the ``info()`` method. The simplest way is to take http://code.opencv.org/projects/opencv/repository/revisions/master/entry/modules/ml/src/ml_init.cpp as the reference and modify it according to the list of your parameters. * Add some public function (e.g. ``initModule_()``) that calls info() of your algorithm and put it into the same source file as ``info()`` implementation. This is to force C++ linker to include this object file into the target application. See ``Algorithm::create()`` for details. - diff --git a/modules/core/doc/core.rst b/modules/core/doc/core.rst index fc1afa644f..c4fb195b07 100644 --- a/modules/core/doc/core.rst +++ b/modules/core/doc/core.rst @@ -15,4 +15,3 @@ core. The Core Functionality clustering utility_and_system_functions_and_macros opengl_interop - diff --git a/modules/core/doc/drawing_functions.rst b/modules/core/doc/drawing_functions.rst index f1b62fb8e2..b277e01d25 100644 --- a/modules/core/doc/drawing_functions.rst +++ b/modules/core/doc/drawing_functions.rst @@ -531,4 +531,3 @@ The function ``putText`` renders the specified text string in the image. Symbols that cannot be rendered using the specified font are replaced by question marks. See :ocv:func:`getTextSize` for a text rendering code example. - diff --git a/modules/core/doc/dynamic_structures.rst b/modules/core/doc/dynamic_structures.rst index e333971c06..d56ee494e3 100644 --- a/modules/core/doc/dynamic_structures.rst +++ b/modules/core/doc/dynamic_structures.rst @@ -1584,4 +1584,3 @@ Gathers all node pointers to a single sequence. :param storage: Container for the sequence The function puts pointers of all nodes reachable from ``first`` into a single sequence. The pointers are written sequentially in the depth-first order. - diff --git a/modules/core/doc/old_basic_structures.rst b/modules/core/doc/old_basic_structures.rst index 0596e04bff..c8de17adae 100644 --- a/modules/core/doc/old_basic_structures.rst +++ b/modules/core/doc/old_basic_structures.rst @@ -1751,4 +1751,3 @@ For example, `NumPy `_ arrays support the array interfa (480, 640, 3) 1 .. note:: In the new Python wrappers (**cv2** module) the function is not needed, since cv2 can process Numpy arrays (and this is the only supported array type). - diff --git a/modules/core/include/opencv2/core/eigen.hpp b/modules/core/include/opencv2/core/eigen.hpp index 751734eb5a..a7b237f96d 100644 --- a/modules/core/include/opencv2/core/eigen.hpp +++ b/modules/core/include/opencv2/core/eigen.hpp @@ -278,4 +278,3 @@ void cv2eigen( const Matx<_Tp, 1, _cols>& src, #endif #endif - diff --git a/modules/core/perf/perf_abs.cpp b/modules/core/perf/perf_abs.cpp index 691c6f7c4b..63cb06b638 100644 --- a/modules/core/perf/perf_abs.cpp +++ b/modules/core/perf/perf_abs.cpp @@ -24,4 +24,3 @@ PERF_TEST_P(Size_MatType, abs, TYPICAL_MATS_ABS) SANITY_CHECK(c); } - diff --git a/modules/core/perf/perf_bitwise.cpp b/modules/core/perf/perf_bitwise.cpp index 64a8dd8bd9..1308b7bf3e 100644 --- a/modules/core/perf/perf_bitwise.cpp +++ b/modules/core/perf/perf_bitwise.cpp @@ -73,4 +73,3 @@ PERF_TEST_P(Size_MatType, bitwise_xor, TYPICAL_MATS_BITW_ARITHM) SANITY_CHECK(c); } - diff --git a/modules/core/perf/perf_merge.cpp b/modules/core/perf/perf_merge.cpp index d82941a92b..e7e8d2fe3f 100644 --- a/modules/core/perf/perf_merge.cpp +++ b/modules/core/perf/perf_merge.cpp @@ -34,4 +34,4 @@ PERF_TEST_P( Size_SrcDepth_DstChannels, merge, TEST_CYCLE_MULTIRUN(runs) merge( (vector &)mv, dst ); SANITY_CHECK(dst, 1e-12); -} \ No newline at end of file +} diff --git a/modules/core/src/convert.cpp b/modules/core/src/convert.cpp index 288eb1dfab..3de9f83d1a 100644 --- a/modules/core/src/convert.cpp +++ b/modules/core/src/convert.cpp @@ -1391,4 +1391,4 @@ CV_IMPL void cvNormalize( const CvArr* srcarr, CvArr* dstarr, cv::normalize( src, dst, a, b, norm_type, dst.type(), mask ); } -/* End of file. */ \ No newline at end of file +/* End of file. */ diff --git a/modules/core/src/lapack.cpp b/modules/core/src/lapack.cpp index f5fe53ae9e..7ee84a6d45 100644 --- a/modules/core/src/lapack.cpp +++ b/modules/core/src/lapack.cpp @@ -1832,4 +1832,4 @@ cvSVBkSb( const CvArr* warr, const CvArr* uarr, cv::SVD::backSubst(w, u, v, rhs, dst); CV_Assert( dst.data == dst0.data ); -} \ No newline at end of file +} diff --git a/modules/core/src/out.cpp b/modules/core/src/out.cpp index 6817fca615..65190c50e3 100644 --- a/modules/core/src/out.cpp +++ b/modules/core/src/out.cpp @@ -304,4 +304,3 @@ Formatted::Formatted(const Mat& _m, const Formatter* _fmt, const int* _params) } } - diff --git a/modules/core/test/test_arithm.cpp b/modules/core/test/test_arithm.cpp index 0bb185d2d2..664fa0204a 100644 --- a/modules/core/test/test_arithm.cpp +++ b/modules/core/test/test_arithm.cpp @@ -1563,4 +1563,4 @@ TEST(Core_round, CvRound) ASSERT_EQ(4, cvRound(3.5)); ASSERT_EQ(-2, cvRound(-2.5)); ASSERT_EQ(-4, cvRound(-3.5)); -} \ No newline at end of file +} diff --git a/modules/core/test/test_ds.cpp b/modules/core/test/test_ds.cpp index d79786054a..cd76ca2fe9 100644 --- a/modules/core/test/test_ds.cpp +++ b/modules/core/test/test_ds.cpp @@ -2118,5 +2118,3 @@ TEST(Core_DS_Seq, sort_invert) { Core_SeqSortInvTest test; test.safe_run(); } TEST(Core_DS_Set, basic_operations) { Core_SetTest test; test.safe_run(); } TEST(Core_DS_Graph, basic_operations) { Core_GraphTest test; test.safe_run(); } TEST(Core_DS_Graph, scan) { Core_GraphScanTest test; test.safe_run(); } - - diff --git a/modules/core/test/test_dxt.cpp b/modules/core/test/test_dxt.cpp index 16025fa8f2..1c0c7b00bf 100644 --- a/modules/core/test/test_dxt.cpp +++ b/modules/core/test/test_dxt.cpp @@ -866,5 +866,3 @@ protected: }; TEST(Core_DFT, complex_output) { Core_DFTComplexOutputTest test; test.safe_run(); } - - diff --git a/modules/core/test/test_math.cpp b/modules/core/test/test_math.cpp index cc91a6b863..3847afce6e 100644 --- a/modules/core/test/test_math.cpp +++ b/modules/core/test/test_math.cpp @@ -2643,4 +2643,3 @@ TEST(CovariationMatrixVectorOfMatWithMean, accuracy) } /* End of file. */ - diff --git a/modules/features2d/CMakeLists.txt b/modules/features2d/CMakeLists.txt index 7d36a58ac1..0b080cfb9a 100644 --- a/modules/features2d/CMakeLists.txt +++ b/modules/features2d/CMakeLists.txt @@ -1,3 +1,2 @@ set(the_description "2D Features Framework") ocv_define_module(features2d opencv_imgproc opencv_flann OPTIONAL opencv_highgui) - diff --git a/modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst b/modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst index 264d3a1bbf..91c4110d2d 100644 --- a/modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst +++ b/modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst @@ -305,4 +305,3 @@ Flann-based descriptor matcher. This matcher trains :ocv:class:`flann::Index_` o }; .. - diff --git a/modules/features2d/doc/common_interfaces_of_generic_descriptor_matchers.rst b/modules/features2d/doc/common_interfaces_of_generic_descriptor_matchers.rst index fcdc8b9b0e..5a7f952bc2 100644 --- a/modules/features2d/doc/common_interfaces_of_generic_descriptor_matchers.rst +++ b/modules/features2d/doc/common_interfaces_of_generic_descriptor_matchers.rst @@ -274,5 +274,3 @@ Example: :: VectorDescriptorMatcher matcher( new SurfDescriptorExtractor, new BruteForceMatcher > ); - - diff --git a/modules/features2d/doc/drawing_function_of_keypoints_and_matches.rst b/modules/features2d/doc/drawing_function_of_keypoints_and_matches.rst index 2669ab9f27..e8ef4e0b37 100644 --- a/modules/features2d/doc/drawing_function_of_keypoints_and_matches.rst +++ b/modules/features2d/doc/drawing_function_of_keypoints_and_matches.rst @@ -76,4 +76,3 @@ Draws keypoints. :param color: Color of keypoints. :param flags: Flags setting drawing features. Possible ``flags`` bit values are defined by ``DrawMatchesFlags``. See details above in :ocv:func:`drawMatches` . - diff --git a/modules/features2d/doc/object_categorization.rst b/modules/features2d/doc/object_categorization.rst index 4361c3022c..644634fd06 100644 --- a/modules/features2d/doc/object_categorization.rst +++ b/modules/features2d/doc/object_categorization.rst @@ -204,4 +204,3 @@ BOWImgDescriptorExtractor::descriptorType Returns an image descriptor type. .. ocv:function:: int BOWImgDescriptorExtractor::descriptorType() const - diff --git a/modules/features2d/perf/perf_fast.cpp b/modules/features2d/perf/perf_fast.cpp index f6a47fe0f6..abd3d87332 100644 --- a/modules/features2d/perf/perf_fast.cpp +++ b/modules/features2d/perf/perf_fast.cpp @@ -41,4 +41,3 @@ PERF_TEST_P(fast, detect, testing::Combine( SANITY_CHECK_KEYPOINTS(points); } - diff --git a/modules/features2d/src/fast_score.cpp b/modules/features2d/src/fast_score.cpp index 423b1f950d..de697b7c90 100644 --- a/modules/features2d/src/fast_score.cpp +++ b/modules/features2d/src/fast_score.cpp @@ -357,4 +357,3 @@ int cornerScore<8>(const uchar* ptr, const int pixel[], int threshold) } } // namespace cv - diff --git a/modules/features2d/test/test_brisk.cpp b/modules/features2d/test/test_brisk.cpp index 49d149834b..a254992b4d 100644 --- a/modules/features2d/test/test_brisk.cpp +++ b/modules/features2d/test/test_brisk.cpp @@ -92,4 +92,3 @@ void CV_BRISKTest::run( int ) } TEST(Features2d_BRISK, regression) { CV_BRISKTest test; test.safe_run(); } - diff --git a/modules/features2d/test/test_fast.cpp b/modules/features2d/test/test_fast.cpp index 4161be1abe..40cc7f02ab 100644 --- a/modules/features2d/test/test_fast.cpp +++ b/modules/features2d/test/test_fast.cpp @@ -134,4 +134,3 @@ void CV_FastTest::run( int ) } TEST(Features2d_FAST, regression) { CV_FastTest test; test.safe_run(); } - diff --git a/modules/features2d/test/test_keypoints.cpp b/modules/features2d/test/test_keypoints.cpp index b5d01a7378..009ded5db5 100644 --- a/modules/features2d/test/test_keypoints.cpp +++ b/modules/features2d/test/test_keypoints.cpp @@ -166,5 +166,3 @@ TEST(Features2d_Detector_Keypoints_Dense, validation) CV_FeatureDetectorKeypointsTest test(Algorithm::create("Feature2D.Dense")); test.safe_run(); } - - diff --git a/modules/features2d/test/test_mser.cpp b/modules/features2d/test/test_mser.cpp index b30400a502..0170bad910 100644 --- a/modules/features2d/test/test_mser.cpp +++ b/modules/features2d/test/test_mser.cpp @@ -204,4 +204,3 @@ void CV_MserTest::run(int) } TEST(Features2d_MSER, DISABLED_regression) { CV_MserTest test; test.safe_run(); } - diff --git a/modules/flann/CMakeLists.txt b/modules/flann/CMakeLists.txt index 645e8ce857..a6326c40a0 100644 --- a/modules/flann/CMakeLists.txt +++ b/modules/flann/CMakeLists.txt @@ -1,3 +1,2 @@ set(the_description "Clustering and Search in Multi-Dimensional Spaces") ocv_define_module(flann opencv_core) - diff --git a/modules/flann/include/opencv2/flann/random.h b/modules/flann/include/opencv2/flann/random.h index 2a67352da3..a3cf5ec53d 100644 --- a/modules/flann/include/opencv2/flann/random.h +++ b/modules/flann/include/opencv2/flann/random.h @@ -131,5 +131,3 @@ public: } #endif //OPENCV_FLANN_RANDOM_H - - diff --git a/modules/flann/include/opencv2/flann/result_set.h b/modules/flann/include/opencv2/flann/result_set.h index 7bb709b76e..3adad46596 100644 --- a/modules/flann/include/opencv2/flann/result_set.h +++ b/modules/flann/include/opencv2/flann/result_set.h @@ -540,4 +540,3 @@ private: } #endif //OPENCV_FLANN_RESULTSET_H - diff --git a/modules/flann/src/flann.cpp b/modules/flann/src/flann.cpp index fa1fdaf418..67fff88a4a 100644 --- a/modules/flann/src/flann.cpp +++ b/modules/flann/src/flann.cpp @@ -54,4 +54,4 @@ namespace cvflann } void dummyfunc() {} -} \ No newline at end of file +} diff --git a/modules/flann/src/precomp.hpp b/modules/flann/src/precomp.hpp index 76d83992e5..988c01f2a0 100644 --- a/modules/flann/src/precomp.hpp +++ b/modules/flann/src/precomp.hpp @@ -22,4 +22,3 @@ #include "opencv2/flann/flann_base.hpp" #endif - diff --git a/modules/gpu/doc/data_structures.rst b/modules/gpu/doc/data_structures.rst index 5699723203..0c75a5cccf 100644 --- a/modules/gpu/doc/data_structures.rst +++ b/modules/gpu/doc/data_structures.rst @@ -386,4 +386,3 @@ Class that enables getting ``cudaStream_t`` from :ocv:class:`gpu::Stream` and is { CV_EXPORTS static cudaStream_t getStream(const Stream& stream); }; - diff --git a/modules/gpu/doc/introduction.rst b/modules/gpu/doc/introduction.rst index ef34c369b9..a1237629c5 100644 --- a/modules/gpu/doc/introduction.rst +++ b/modules/gpu/doc/introduction.rst @@ -60,4 +60,3 @@ With this algorithm, a dual GPU gave a 180 % performance increase comparing to the single Fermi GPU. For a source code example, see http://code.opencv.org/projects/opencv/repository/revisions/master/entry/samples/gpu/. - diff --git a/modules/gpu/include/opencv2/gpu/device/block.hpp b/modules/gpu/include/opencv2/gpu/device/block.hpp index 86ce205bc7..6cc00aed4d 100644 --- a/modules/gpu/include/opencv2/gpu/device/block.hpp +++ b/modules/gpu/include/opencv2/gpu/device/block.hpp @@ -201,5 +201,3 @@ namespace cv { namespace gpu { namespace device }}} #endif /* __OPENCV_GPU_DEVICE_BLOCK_HPP__ */ - - diff --git a/modules/gpu/misc/mark_nvidia.py b/modules/gpu/misc/mark_nvidia.py index 08743fb136..80dc7f9cee 100755 --- a/modules/gpu/misc/mark_nvidia.py +++ b/modules/gpu/misc/mark_nvidia.py @@ -257,4 +257,3 @@ if __name__ == "__main__": outputFile = open(sys.argv[2], 'w') outputFile.writelines(lines) outputFile.close() - diff --git a/modules/gpu/perf4au/CMakeLists.txt b/modules/gpu/perf4au/CMakeLists.txt index 7452203826..376e7b2706 100644 --- a/modules/gpu/perf4au/CMakeLists.txt +++ b/modules/gpu/perf4au/CMakeLists.txt @@ -25,4 +25,3 @@ if(WIN32) set_target_properties(${the_target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /DEBUG") endif() endif() - diff --git a/modules/gpu/src/calib3d.cpp b/modules/gpu/src/calib3d.cpp index b84f09d0ab..ee0004bcfe 100644 --- a/modules/gpu/src/calib3d.cpp +++ b/modules/gpu/src/calib3d.cpp @@ -291,5 +291,3 @@ void cv::gpu::solvePnPRansac(const Mat& object, const Mat& image, const Mat& cam } #endif - - diff --git a/modules/gpu/src/denoising.cpp b/modules/gpu/src/denoising.cpp index 995b809d3e..50fab0cc2e 100644 --- a/modules/gpu/src/denoising.cpp +++ b/modules/gpu/src/denoising.cpp @@ -194,5 +194,3 @@ void cv::gpu::FastNonLocalMeansDenoising::labMethod( const GpuMat& src, GpuMat& #endif - - diff --git a/modules/gpu/src/precomp.cpp b/modules/gpu/src/precomp.cpp index c955cfceb3..10511bc54e 100644 --- a/modules/gpu/src/precomp.cpp +++ b/modules/gpu/src/precomp.cpp @@ -73,4 +73,3 @@ bool cv::gpu::tryConvertToGpuBorderType(int cpuBorderType, int& gpuBorderType) } /* End of file. */ - diff --git a/modules/gpu/src/speckle_filtering.cpp b/modules/gpu/src/speckle_filtering.cpp index 0b97a20f5f..f7424483ea 100644 --- a/modules/gpu/src/speckle_filtering.cpp +++ b/modules/gpu/src/speckle_filtering.cpp @@ -165,4 +165,3 @@ void cv::filterSpeckles( Mat& img, uchar newVal, int maxSpeckleSize, uchar maxDi } } } - diff --git a/modules/highgui/doc/qt_new_functions.rst b/modules/highgui/doc/qt_new_functions.rst index bd889db8a2..9f2d70e6c3 100644 --- a/modules/highgui/doc/qt_new_functions.rst +++ b/modules/highgui/doc/qt_new_functions.rst @@ -334,5 +334,3 @@ See below various examples of the ``createButton`` function call: :: createButton("button6",callbackButton2,NULL,CV_PUSH_BUTTON,1); .. - - diff --git a/modules/highgui/doc/reading_and_writing_images_and_video.rst b/modules/highgui/doc/reading_and_writing_images_and_video.rst index bc901821f5..335b5ae740 100644 --- a/modules/highgui/doc/reading_and_writing_images_and_video.rst +++ b/modules/highgui/doc/reading_and_writing_images_and_video.rst @@ -555,4 +555,3 @@ Writes the next video frame :param image: The written frame The functions/methods write the specified image to video file. It must have the same size as has been specified when opening the video writer. - diff --git a/modules/highgui/include/opencv2/highgui/ios.h b/modules/highgui/include/opencv2/highgui/ios.h index a78fbf72c7..a7f0395d71 100644 --- a/modules/highgui/include/opencv2/highgui/ios.h +++ b/modules/highgui/include/opencv2/highgui/ios.h @@ -46,4 +46,4 @@ UIImage* MatToUIImage(const cv::Mat& image); void UIImageToMat(const UIImage* image, - cv::Mat& m, bool alphaExist = false); \ No newline at end of file + cv::Mat& m, bool alphaExist = false); diff --git a/modules/highgui/perf/perf_input.cpp b/modules/highgui/perf/perf_input.cpp index 414c85365f..528bba6b30 100644 --- a/modules/highgui/perf/perf_input.cpp +++ b/modules/highgui/perf/perf_input.cpp @@ -37,4 +37,4 @@ PERF_TEST_P(VideoCapture_Reading, ReadFile, testing::Values( "highgui/video/big_ SANITY_CHECK(dummy); } -#endif // BUILD_WITH_VIDEO_INPUT_SUPPORT \ No newline at end of file +#endif // BUILD_WITH_VIDEO_INPUT_SUPPORT diff --git a/modules/highgui/perf/perf_output.cpp b/modules/highgui/perf/perf_output.cpp index 2adfe89655..88e00b0ebd 100644 --- a/modules/highgui/perf/perf_output.cpp +++ b/modules/highgui/perf/perf_output.cpp @@ -37,4 +37,4 @@ PERF_TEST_P(VideoWriter_Writing, WriteFrame, SANITY_CHECK(dummy); } -#endif // BUILD_WITH_VIDEO_OUTPUT_SUPPORT \ No newline at end of file +#endif // BUILD_WITH_VIDEO_OUTPUT_SUPPORT diff --git a/modules/highgui/src/cap_avfoundation.mm b/modules/highgui/src/cap_avfoundation.mm index dfbb2a0cdb..35b52f08ce 100644 --- a/modules/highgui/src/cap_avfoundation.mm +++ b/modules/highgui/src/cap_avfoundation.mm @@ -1329,4 +1329,3 @@ bool CvVideoWriter_AVFoundation::writeFrame(const IplImage* iplimage) { } } - diff --git a/modules/highgui/src/cap_ffmpeg_api.hpp b/modules/highgui/src/cap_ffmpeg_api.hpp index 1fe488c049..2242bd4d9c 100644 --- a/modules/highgui/src/cap_ffmpeg_api.hpp +++ b/modules/highgui/src/cap_ffmpeg_api.hpp @@ -94,4 +94,3 @@ typedef int (*Read_InputMediaStream_FFMPEG_Plugin)(struct InputMediaStream_FFMPE #endif #endif - diff --git a/modules/highgui/src/cap_ios_abstract_camera.mm b/modules/highgui/src/cap_ios_abstract_camera.mm index 38e1c12e68..a77e200a82 100644 --- a/modules/highgui/src/cap_ios_abstract_camera.mm +++ b/modules/highgui/src/cap_ios_abstract_camera.mm @@ -491,4 +491,3 @@ } @end - diff --git a/modules/highgui/src/cap_ios_video_camera.mm b/modules/highgui/src/cap_ios_video_camera.mm index f4d30a7618..99f8a75ae6 100644 --- a/modules/highgui/src/cap_ios_video_camera.mm +++ b/modules/highgui/src/cap_ios_video_camera.mm @@ -616,4 +616,3 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;}; } @end - diff --git a/modules/highgui/src/cap_msmf.cpp b/modules/highgui/src/cap_msmf.cpp index 9daad64206..df52f04bdf 100644 --- a/modules/highgui/src/cap_msmf.cpp +++ b/modules/highgui/src/cap_msmf.cpp @@ -3532,4 +3532,4 @@ CvVideoWriter* cvCreateVideoWriter_MSMF( const char* filename, int fourcc, return NULL; } -#endif \ No newline at end of file +#endif diff --git a/modules/highgui/src/cap_qtkit.mm b/modules/highgui/src/cap_qtkit.mm index 275deae0d2..570a03fc87 100644 --- a/modules/highgui/src/cap_qtkit.mm +++ b/modules/highgui/src/cap_qtkit.mm @@ -1046,4 +1046,3 @@ bool CvVideoWriter_QT::writeFrame(const IplImage* image) { return 1; } - diff --git a/modules/highgui/src/files_Qt/Milky/README.txt b/modules/highgui/src/files_Qt/Milky/README.txt index df2a2e83f4..01ab431457 100644 --- a/modules/highgui/src/files_Qt/Milky/README.txt +++ b/modules/highgui/src/files_Qt/Milky/README.txt @@ -16,4 +16,4 @@ The license does not permit the following uses: You may not use, or allow anyone else to use the icons to create pornographic, libelous, obscene, or defamatory material. -All icon files are provided "as is". You agree not to hold IconEden.com liable for any damages that may occur due to use, or inability to use, icons or image data from IconEden.com. \ No newline at end of file +All icon files are provided "as is". You agree not to hold IconEden.com liable for any damages that may occur due to use, or inability to use, icons or image data from IconEden.com. diff --git a/modules/highgui/src/grfmt_bmp.cpp b/modules/highgui/src/grfmt_bmp.cpp index 3da9bc3111..c8f8218cd3 100644 --- a/modules/highgui/src/grfmt_bmp.cpp +++ b/modules/highgui/src/grfmt_bmp.cpp @@ -563,4 +563,3 @@ bool BmpEncoder::write( const Mat& img, const vector& ) } } - diff --git a/modules/highgui/src/ios_conversions.mm b/modules/highgui/src/ios_conversions.mm index 4300acd9bf..fa6208a17f 100644 --- a/modules/highgui/src/ios_conversions.mm +++ b/modules/highgui/src/ios_conversions.mm @@ -114,4 +114,4 @@ void UIImageToMat(const UIImage* image, image.CGImage); CGContextRelease(contextRef); CGColorSpaceRelease(colorSpace); -} \ No newline at end of file +} diff --git a/modules/highgui/test/test_fourcc.cpp b/modules/highgui/test/test_fourcc.cpp index 4a2757c10e..13cac25a24 100644 --- a/modules/highgui/test/test_fourcc.cpp +++ b/modules/highgui/test/test_fourcc.cpp @@ -112,4 +112,4 @@ TEST(Highgui_dshow, fourcc_conversion) EXPECT_EQ(fourcc, (unsigned long)(unsigned)fourccFromParam); } -} \ No newline at end of file +} diff --git a/modules/highgui/test/test_main.cpp b/modules/highgui/test/test_main.cpp index 363b54161e..4727b9565c 100644 --- a/modules/highgui/test/test_main.cpp +++ b/modules/highgui/test/test_main.cpp @@ -1,4 +1,3 @@ #include "test_precomp.hpp" CV_TEST_MAIN("highgui") - diff --git a/modules/highgui/test/test_positioning.cpp b/modules/highgui/test/test_positioning.cpp index 9f022ca9f9..22818b1a3e 100644 --- a/modules/highgui/test/test_positioning.cpp +++ b/modules/highgui/test/test_positioning.cpp @@ -220,4 +220,4 @@ void CV_VideoRandomPositioningTest::run(int) #if BUILD_WITH_VIDEO_INPUT_SUPPORT && defined HAVE_FFMPEG TEST (Highgui_Video, seek_progressive) { CV_VideoProgressivePositioningTest test; test.safe_run(); } TEST (Highgui_Video, seek_random) { CV_VideoRandomPositioningTest test; test.safe_run(); } -#endif \ No newline at end of file +#endif diff --git a/modules/imgproc/doc/filtering.rst b/modules/imgproc/doc/filtering.rst index 73df71e6bd..3d230d1caf 100755 --- a/modules/imgproc/doc/filtering.rst +++ b/modules/imgproc/doc/filtering.rst @@ -1642,4 +1642,3 @@ is equivalent to .. seealso:: :ocv:func:`cartToPolar` - diff --git a/modules/imgproc/doc/geometric_transformations.rst b/modules/imgproc/doc/geometric_transformations.rst index c3abdb7c4c..229183e5f2 100644 --- a/modules/imgproc/doc/geometric_transformations.rst +++ b/modules/imgproc/doc/geometric_transformations.rst @@ -705,5 +705,3 @@ The function is similar to where ``undistort()`` is an approximate iterative algorithm that estimates the normalized original point coordinates out of the normalized distorted point coordinates ("normalized" means that the coordinates do not depend on the camera matrix). The function can be used for both a stereo camera head or a monocular camera (when R is empty). - - diff --git a/modules/imgproc/doc/miscellaneous_transformations.rst b/modules/imgproc/doc/miscellaneous_transformations.rst index ae728c28cd..e3c459d68c 100644 --- a/modules/imgproc/doc/miscellaneous_transformations.rst +++ b/modules/imgproc/doc/miscellaneous_transformations.rst @@ -815,4 +815,4 @@ See the sample ``grabcut.cpp`` to learn how to use the function. * An example using the GrabCut algorithm can be found at opencv_source_code/samples/cpp/grabcut.cpp - * (Python) An example using the GrabCut algorithm can be found at opencv_source_code/samples/python2/grabcut.py \ No newline at end of file + * (Python) An example using the GrabCut algorithm can be found at opencv_source_code/samples/python2/grabcut.py diff --git a/modules/imgproc/doc/object_detection.rst b/modules/imgproc/doc/object_detection.rst index ab4db330e9..16304a6a0f 100644 --- a/modules/imgproc/doc/object_detection.rst +++ b/modules/imgproc/doc/object_detection.rst @@ -76,4 +76,4 @@ After the function finishes the comparison, the best matches can be found as glo .. note:: - * (Python) An example on how to match mouse selected regions in an image can be found at opencv_source_code/samples/python2/mouse_and_match.py \ No newline at end of file + * (Python) An example on how to match mouse selected regions in an image can be found at opencv_source_code/samples/python2/mouse_and_match.py diff --git a/modules/imgproc/perf/perf_cornerEigenValsAndVecs.cpp b/modules/imgproc/perf/perf_cornerEigenValsAndVecs.cpp index 1b176ed7a4..0c89d39d50 100644 --- a/modules/imgproc/perf/perf_cornerEigenValsAndVecs.cpp +++ b/modules/imgproc/perf/perf_cornerEigenValsAndVecs.cpp @@ -37,4 +37,4 @@ PERF_TEST_P(Img_BlockSize_ApertureSize_BorderType, cornerEigenValsAndVecs, extractChannel(dst, l1, 0); SANITY_CHECK(l1, 2e-5); -} \ No newline at end of file +} diff --git a/modules/imgproc/perf/perf_cornerHarris.cpp b/modules/imgproc/perf/perf_cornerHarris.cpp index 10ed8de27f..bb54644375 100644 --- a/modules/imgproc/perf/perf_cornerHarris.cpp +++ b/modules/imgproc/perf/perf_cornerHarris.cpp @@ -36,4 +36,4 @@ PERF_TEST_P(Img_BlockSize_ApertureSize_k_BorderType, cornerHarris, TEST_CYCLE() cornerHarris(src, dst, blockSize, apertureSize, k, borderType); SANITY_CHECK(dst, 2e-5); -} \ No newline at end of file +} diff --git a/modules/imgproc/perf/perf_filter2d.cpp b/modules/imgproc/perf/perf_filter2d.cpp index 1498ffdb17..b897d6ac01 100644 --- a/modules/imgproc/perf/perf_filter2d.cpp +++ b/modules/imgproc/perf/perf_filter2d.cpp @@ -72,5 +72,3 @@ PERF_TEST_P( Image_KernelSize, GaborFilter2d, SANITY_CHECK(filteredImage, 1e-3); } - - diff --git a/modules/imgproc/perf/perf_warp.cpp b/modules/imgproc/perf/perf_warp.cpp index e958a7e963..146528b6bb 100644 --- a/modules/imgproc/perf/perf_warp.cpp +++ b/modules/imgproc/perf/perf_warp.cpp @@ -221,4 +221,3 @@ PERF_TEST(Transform, getPerspectiveTransform) SANITY_CHECK(transformCoefficient, 1e-5); } - diff --git a/modules/imgproc/src/rotcalipers.cpp b/modules/imgproc/src/rotcalipers.cpp index 2171ec13e2..3795f7a4d1 100644 --- a/modules/imgproc/src/rotcalipers.cpp +++ b/modules/imgproc/src/rotcalipers.cpp @@ -438,4 +438,3 @@ cvMinAreaRect2( const CvArr* array, CvMemStorage* storage ) box.angle = (float)(box.angle*180/CV_PI); return box; } - diff --git a/modules/imgproc/test/test_approxpoly.cpp b/modules/imgproc/test/test_approxpoly.cpp index d087d541e1..c4973c31e6 100644 --- a/modules/imgproc/test/test_approxpoly.cpp +++ b/modules/imgproc/test/test_approxpoly.cpp @@ -356,4 +356,3 @@ _exit_: } TEST(Imgproc_ApproxPoly, accuracy) { CV_ApproxPolyTest test; test.safe_run(); } - diff --git a/modules/imgproc/test/test_convhull.cpp b/modules/imgproc/test/test_convhull.cpp index 19f536a944..cae75d0cb0 100644 --- a/modules/imgproc/test/test_convhull.cpp +++ b/modules/imgproc/test/test_convhull.cpp @@ -1700,4 +1700,3 @@ TEST(Imgproc_ContourPerimeterSlice, accuracy) { CV_PerimeterAreaSliceTest test; TEST(Imgproc_FitEllipse, small) { CV_FitEllipseSmallTest test; test.safe_run(); } /* End of file. */ - diff --git a/modules/imgproc/test/test_distancetransform.cpp b/modules/imgproc/test/test_distancetransform.cpp index da7e33449d..bbbb3479e7 100644 --- a/modules/imgproc/test/test_distancetransform.cpp +++ b/modules/imgproc/test/test_distancetransform.cpp @@ -293,5 +293,3 @@ void CV_DisTransTest::prepare_to_validation( int /*test_case_idx*/ ) TEST(Imgproc_DistanceTransform, accuracy) { CV_DisTransTest test; test.safe_run(); } - - diff --git a/modules/imgproc/test/test_filter.cpp b/modules/imgproc/test/test_filter.cpp index 6bf529b0e7..efbad99749 100644 --- a/modules/imgproc/test/test_filter.cpp +++ b/modules/imgproc/test/test_filter.cpp @@ -1886,4 +1886,3 @@ protected: }; TEST(Imgproc_Filtering, supportedFormats) { CV_FilterSupportedFormatsTest test; test.safe_run(); } - diff --git a/modules/imgproc/test/test_houghLines.cpp b/modules/imgproc/test/test_houghLines.cpp index 9f2d27fc90..d2a45cba61 100644 --- a/modules/imgproc/test/test_houghLines.cpp +++ b/modules/imgproc/test/test_houghLines.cpp @@ -146,4 +146,3 @@ void CV_HoughLinesTest::run_test(int type) TEST(Imgproc_HoughLines, regression) { CV_StandartHoughLinesTest test; test.safe_run(); } TEST(Imgproc_HoughLinesP, regression) { CV_ProbabilisticHoughLinesTest test; test.safe_run(); } - diff --git a/modules/imgproc/test/test_thresh.cpp b/modules/imgproc/test/test_thresh.cpp index 30a760da5c..f59fec19e1 100644 --- a/modules/imgproc/test/test_thresh.cpp +++ b/modules/imgproc/test/test_thresh.cpp @@ -318,4 +318,3 @@ void CV_ThreshTest::prepare_to_validation( int /*test_case_idx*/ ) } TEST(Imgproc_Threshold, accuracy) { CV_ThreshTest test; test.safe_run(); } - diff --git a/modules/imgproc/test/test_watershed.cpp b/modules/imgproc/test/test_watershed.cpp index 52cb37a4fc..0edb18e02e 100644 --- a/modules/imgproc/test/test_watershed.cpp +++ b/modules/imgproc/test/test_watershed.cpp @@ -130,4 +130,3 @@ void CV_WatershedTest::run( int /* start_from */) } TEST(Imgproc_Watershed, regression) { CV_WatershedTest test; test.safe_run(); } - diff --git a/modules/java/android_test/.gitignore b/modules/java/android_test/.gitignore index 2d406cbbcc..a21956836e 100644 --- a/modules/java/android_test/.gitignore +++ b/modules/java/android_test/.gitignore @@ -4,4 +4,4 @@ build.xml local.properties proguard-project.txt project.properties -default.properties \ No newline at end of file +default.properties diff --git a/modules/java/android_test/src/org/opencv/test/imgproc/ImgprocTest.java b/modules/java/android_test/src/org/opencv/test/imgproc/ImgprocTest.java index acaf426748..7eed06abd9 100644 --- a/modules/java/android_test/src/org/opencv/test/imgproc/ImgprocTest.java +++ b/modules/java/android_test/src/org/opencv/test/imgproc/ImgprocTest.java @@ -1963,4 +1963,4 @@ public class ImgprocTest extends OpenCVTestCase { assertMatEqual(truth, markers); } -} \ No newline at end of file +} diff --git a/modules/java/check-tests.py b/modules/java/check-tests.py index c4d34f61e9..394b377ef9 100755 --- a/modules/java/check-tests.py +++ b/modules/java/check-tests.py @@ -162,4 +162,3 @@ if __name__ == '__main__': print "Not tested methods found:", len(funcs) print "Total tests found:", parser.get_tests_count() print "Empty test stubs found:", parser.get_empty_stubs_count() - diff --git a/modules/java/generator/gen_java.py b/modules/java/generator/gen_java.py index d82a593bfa..1b49b6c4fb 100755 --- a/modules/java/generator/gen_java.py +++ b/modules/java/generator/gen_java.py @@ -1485,4 +1485,3 @@ if __name__ == "__main__": #print "Generating module '" + module + "' from headers:\n\t" + "\n\t".join(srcfiles) generator = JavaWrapperGenerator() generator.gen(srcfiles, module, dstdir) - diff --git a/modules/java/generator/src/cpp/common.h b/modules/java/generator/src/cpp/common.h index b67f633f7b..d46f3c5333 100644 --- a/modules/java/generator/src/cpp/common.h +++ b/modules/java/generator/src/cpp/common.h @@ -30,4 +30,4 @@ # pragma warning(disable:4800 4244) #endif -#endif //__JAVA_COMMON_H__ \ No newline at end of file +#endif //__JAVA_COMMON_H__ diff --git a/modules/java/generator/src/cpp/core_manual.cpp b/modules/java/generator/src/cpp/core_manual.cpp index d7ba5b9947..286cb268d3 100644 --- a/modules/java/generator/src/cpp/core_manual.cpp +++ b/modules/java/generator/src/cpp/core_manual.cpp @@ -12,4 +12,4 @@ void cv::setErrorVerbosity(bool verbose) cv::redirectError(0); else cv::redirectError((cv::ErrorCallback)quietCallback); -} \ No newline at end of file +} diff --git a/modules/java/generator/src/cpp/jni_part.cpp b/modules/java/generator/src/cpp/jni_part.cpp index df1bd142ca..df2074da45 100644 --- a/modules/java/generator/src/cpp/jni_part.cpp +++ b/modules/java/generator/src/cpp/jni_part.cpp @@ -63,4 +63,4 @@ JNI_OnUnload(JavaVM*, void*) //do nothing } -} // extern "C" \ No newline at end of file +} // extern "C" diff --git a/modules/java/generator/src/cpp/utils.cpp b/modules/java/generator/src/cpp/utils.cpp index 9f6b1bfcff..88636300d7 100644 --- a/modules/java/generator/src/cpp/utils.cpp +++ b/modules/java/generator/src/cpp/utils.cpp @@ -158,4 +158,4 @@ JNIEXPORT void JNICALL Java_org_opencv_android_Utils_nMatToBitmap } // extern "C" -#endif //__ANDROID__ \ No newline at end of file +#endif //__ANDROID__ diff --git a/modules/java/generator/src/java/android+sync.py b/modules/java/generator/src/java/android+sync.py index baf95cb6e1..ed78537f08 100755 --- a/modules/java/generator/src/java/android+sync.py +++ b/modules/java/generator/src/java/android+sync.py @@ -4,4 +4,4 @@ import os import shutil for f in os.listdir("."): - shutil.copyfile(f, os.path.join("../../../../../../modules/java/generator/src/java/", "android+" + f)); \ No newline at end of file + shutil.copyfile(f, os.path.join("../../../../../../modules/java/generator/src/java/", "android+" + f)); diff --git a/modules/java/generator/src/java/engine+OpenCVEngineInterface.aidl b/modules/java/generator/src/java/engine+OpenCVEngineInterface.aidl index 7a47a90732..21fe5f716b 100644 --- a/modules/java/generator/src/java/engine+OpenCVEngineInterface.aidl +++ b/modules/java/generator/src/java/engine+OpenCVEngineInterface.aidl @@ -30,4 +30,4 @@ interface OpenCVEngineInterface * @return Returns names of OpenCV libraries, separated by semicolon. */ String getLibraryList(String version); -} \ No newline at end of file +} diff --git a/modules/legacy/doc/common_interfaces_of_descriptor_extractors.rst b/modules/legacy/doc/common_interfaces_of_descriptor_extractors.rst index dc5d81db34..7d56b6badf 100644 --- a/modules/legacy/doc/common_interfaces_of_descriptor_extractors.rst +++ b/modules/legacy/doc/common_interfaces_of_descriptor_extractors.rst @@ -30,4 +30,4 @@ Wrapping class for computing descriptors by using the virtual int descriptorType() const; protected: ... - } \ No newline at end of file + } diff --git a/modules/legacy/doc/common_interfaces_of_generic_descriptor_matchers.rst b/modules/legacy/doc/common_interfaces_of_generic_descriptor_matchers.rst index a2abfa3e49..8647115d50 100644 --- a/modules/legacy/doc/common_interfaces_of_generic_descriptor_matchers.rst +++ b/modules/legacy/doc/common_interfaces_of_generic_descriptor_matchers.rst @@ -361,4 +361,3 @@ Wrapping class for computing, matching, and classifying descriptors using the protected: ... }; - diff --git a/modules/legacy/doc/expectation_maximization.rst b/modules/legacy/doc/expectation_maximization.rst index e3791cbe55..6a5418f1fa 100644 --- a/modules/legacy/doc/expectation_maximization.rst +++ b/modules/legacy/doc/expectation_maximization.rst @@ -191,4 +191,3 @@ Reads the trained Gaussian mixture model from the file storage. :param fs: A file storage with the trained model. :param node: The parent map. If it is NULL, the function searches a node with parameters in all the top-level nodes (streams), starting with the first one. - diff --git a/modules/legacy/doc/histograms.rst b/modules/legacy/doc/histograms.rst index 0405bf2fe0..73ab677876 100644 --- a/modules/legacy/doc/histograms.rst +++ b/modules/legacy/doc/histograms.rst @@ -92,4 +92,3 @@ Returns a pointer to the histogram bin. .. The macros ``GetHistValue`` return a pointer to the specified bin of the 1D, 2D, 3D, or N-D histogram. In case of a sparse histogram, the function creates a new bin and sets it to 0, unless it exists already. - diff --git a/modules/legacy/doc/motion_analysis.rst b/modules/legacy/doc/motion_analysis.rst index 005e186214..21a09bf801 100644 --- a/modules/legacy/doc/motion_analysis.rst +++ b/modules/legacy/doc/motion_analysis.rst @@ -84,5 +84,3 @@ Calculates the optical flow for two images using Lucas-Kanade algorithm. :param vely: Vertical component of the optical flow of the same size as input images, 32-bit floating-point, single-channel The function computes the flow for every pixel of the first input image using the Lucas and Kanade algorithm [Lucas81]_. The function is obsolete. To track sparse features, use :ocv:func:`calcOpticalFlowPyrLK`. To track all the pixels, use :ocv:func:`calcOpticalFlowFarneback`. - - diff --git a/modules/legacy/doc/planar_subdivisions.rst b/modules/legacy/doc/planar_subdivisions.rst index f01e11ae8d..074d1ea388 100644 --- a/modules/legacy/doc/planar_subdivisions.rst +++ b/modules/legacy/doc/planar_subdivisions.rst @@ -322,4 +322,3 @@ Inserts a single point into a Delaunay triangulation. :param pt: Inserted point. The function inserts a single point into a subdivision and modifies the subdivision topology appropriately. If a point with the same coordinates exists already, no new point is added. The function returns a pointer to the allocated point. No virtual point coordinates are calculated at this stage. - diff --git a/modules/legacy/include/opencv2/legacy/streams.hpp b/modules/legacy/include/opencv2/legacy/streams.hpp index 6935b00c3d..e164bf4a83 100644 --- a/modules/legacy/include/opencv2/legacy/streams.hpp +++ b/modules/legacy/include/opencv2/legacy/streams.hpp @@ -90,4 +90,3 @@ and DirectX SDK (2006 April or later). #endif #endif - diff --git a/modules/legacy/src/_vm.h b/modules/legacy/src/_vm.h index 977878899c..7220fbbff9 100644 --- a/modules/legacy/src/_vm.h +++ b/modules/legacy/src/_vm.h @@ -295,4 +295,3 @@ int icvSingularValueDecomposition( int M, /*======================================================================================*/ #endif/*_CV_VM_H_*/ - diff --git a/modules/legacy/src/bgfg_codebook.cpp b/modules/legacy/src/bgfg_codebook.cpp index 03e7e09784..2a53b29bf6 100644 --- a/modules/legacy/src/bgfg_codebook.cpp +++ b/modules/legacy/src/bgfg_codebook.cpp @@ -359,4 +359,3 @@ void cvBGCodeBookClearStale( CvBGCodeBookModel* model, int staleThresh, } /* End of file. */ - diff --git a/modules/legacy/src/bgfg_common.cpp b/modules/legacy/src/bgfg_common.cpp index 5431c2703b..2bcea5573b 100644 --- a/modules/legacy/src/bgfg_common.cpp +++ b/modules/legacy/src/bgfg_common.cpp @@ -135,4 +135,3 @@ cvSegmentFGMask( CvArr* _mask, int poly1Hull0, float perimScale, } /* End of file. */ - diff --git a/modules/legacy/src/bgfg_gaussmix.cpp b/modules/legacy/src/bgfg_gaussmix.cpp index f4c65f55c3..6c6839e4a2 100644 --- a/modules/legacy/src/bgfg_gaussmix.cpp +++ b/modules/legacy/src/bgfg_gaussmix.cpp @@ -1319,4 +1319,3 @@ icvUpdateGaussianBGModel2( IplImage* curr_frame, CvGaussBGModel2* bg_model ) } /* End of file. */ - diff --git a/modules/legacy/src/blobtrack.cpp b/modules/legacy/src/blobtrack.cpp index 6d0a5e3f93..48b83ef914 100644 --- a/modules/legacy/src/blobtrack.cpp +++ b/modules/legacy/src/blobtrack.cpp @@ -637,4 +637,3 @@ void cvReleaseBlobTracker(CvBlobTracker**ppT ) ppT[0]->Release(); ppT[0] = 0; } - diff --git a/modules/legacy/src/blobtrackanalysis.cpp b/modules/legacy/src/blobtrackanalysis.cpp index 5095d3aee2..6416ae688e 100644 --- a/modules/legacy/src/blobtrackanalysis.cpp +++ b/modules/legacy/src/blobtrackanalysis.cpp @@ -125,4 +125,3 @@ CvBlobTrackAnalysis* cvCreateBlobTrackAnalysisList(CvBlobTrackAnalysisOne* (*cre } /* ======================== Analyser modules ============================= */ - diff --git a/modules/legacy/src/blobtrackanalysisior.cpp b/modules/legacy/src/blobtrackanalysisior.cpp index 571ca9ef06..c5b2222e66 100644 --- a/modules/legacy/src/blobtrackanalysisior.cpp +++ b/modules/legacy/src/blobtrackanalysisior.cpp @@ -171,4 +171,3 @@ CvBlobTrackAnalysis* cvCreateModuleBlobTrackAnalysisIOR() return (CvBlobTrackAnalysis*)pIOR; }/* cvCreateCvBlobTrackAnalysisIOR */ /* ======================== Analyser modules ============================= */ - diff --git a/modules/legacy/src/blobtrackanalysistrackdist.cpp b/modules/legacy/src/blobtrackanalysistrackdist.cpp index 9e93ca27a4..2adba7e3a0 100644 --- a/modules/legacy/src/blobtrackanalysistrackdist.cpp +++ b/modules/legacy/src/blobtrackanalysistrackdist.cpp @@ -578,4 +578,3 @@ public: CvBlobTrackAnalysis* cvCreateModuleBlobTrackAnalysisTrackDist() {return (CvBlobTrackAnalysis*) new CvBlobTrackAnalysisTrackDist;} - diff --git a/modules/legacy/src/blobtrackgen1.cpp b/modules/legacy/src/blobtrackgen1.cpp index b76086e3eb..7114f2b4ce 100644 --- a/modules/legacy/src/blobtrackgen1.cpp +++ b/modules/legacy/src/blobtrackgen1.cpp @@ -181,5 +181,3 @@ CvBlobTrackGen* cvCreateModuleBlobTrackGen1() { return (CvBlobTrackGen*) new CvBlobTrackGen1(0); } - - diff --git a/modules/legacy/src/blobtrackgenyml.cpp b/modules/legacy/src/blobtrackgenyml.cpp index 8a414915c1..0d9de45ee3 100644 --- a/modules/legacy/src/blobtrackgenyml.cpp +++ b/modules/legacy/src/blobtrackgenyml.cpp @@ -215,5 +215,3 @@ CvBlobTrackGen* cvCreateModuleBlobTrackGenYML() { return (CvBlobTrackGen*) new CvBlobTrackGenYML; } - - diff --git a/modules/legacy/src/blobtrackingauto.cpp b/modules/legacy/src/blobtrackingauto.cpp index 59e0ee60fb..ada0bdff44 100644 --- a/modules/legacy/src/blobtrackingauto.cpp +++ b/modules/legacy/src/blobtrackingauto.cpp @@ -479,4 +479,3 @@ void CvBlobTrackerAuto1::Process(IplImage* pImg, IplImage* pMask) TIME_END("TrackAnalysis",m_BlobList.GetBlobNum()) } /* CvBlobTrackerAuto1::Process */ - diff --git a/modules/legacy/src/blobtrackingmsfg.cpp b/modules/legacy/src/blobtrackingmsfg.cpp index 8444964447..5fd9634d4d 100644 --- a/modules/legacy/src/blobtrackingmsfg.cpp +++ b/modules/legacy/src/blobtrackingmsfg.cpp @@ -1179,4 +1179,3 @@ CvBlobTracker* cvCreateBlobTrackerMSPF() { return cvCreateBlobTrackerList(cvCreateBlobTrackerOneMSPF); } - diff --git a/modules/legacy/src/blobtrackingmsfgs.cpp b/modules/legacy/src/blobtrackingmsfgs.cpp index 3e1c7a066e..f3b3cf3753 100644 --- a/modules/legacy/src/blobtrackingmsfgs.cpp +++ b/modules/legacy/src/blobtrackingmsfgs.cpp @@ -454,4 +454,3 @@ CvBlobTracker* cvCreateBlobTrackerMSFGS() { return cvCreateBlobTrackerList(cvCreateBlobTrackerOneMSFGS); } - diff --git a/modules/legacy/src/blobtrackpostprockalman.cpp b/modules/legacy/src/blobtrackpostprockalman.cpp index debe89d3f5..ab86885931 100644 --- a/modules/legacy/src/blobtrackpostprockalman.cpp +++ b/modules/legacy/src/blobtrackpostprockalman.cpp @@ -324,4 +324,3 @@ CvBlobTrackPredictor* cvCreateModuleBlobTrackPredictKalman() return (CvBlobTrackPredictor*) new CvBlobTrackPredictKalman; } /*======================= KALMAN PREDICTOR =========================*/ - diff --git a/modules/legacy/src/calcimagehomography.cpp b/modules/legacy/src/calcimagehomography.cpp index 502c24d983..928e056b45 100644 --- a/modules/legacy/src/calcimagehomography.cpp +++ b/modules/legacy/src/calcimagehomography.cpp @@ -111,4 +111,3 @@ cvCalcImageHomography( float* line, CvPoint3D32f* _center, } /* End of file. */ - diff --git a/modules/legacy/src/calibfilter.cpp b/modules/legacy/src/calibfilter.cpp index 99cc04ce82..64b9957beb 100644 --- a/modules/legacy/src/calibfilter.cpp +++ b/modules/legacy/src/calibfilter.cpp @@ -919,5 +919,3 @@ bool CvCalibFilter::Undistort( CvMat** srcarr, CvMat** dstarr ) return true; } - - diff --git a/modules/legacy/src/clique.cpp b/modules/legacy/src/clique.cpp index 9280cb17b7..d8f2f59da2 100644 --- a/modules/legacy/src/clique.cpp +++ b/modules/legacy/src/clique.cpp @@ -706,4 +706,3 @@ void cvBronKerbosch( CvGraph* graph ) }//end cvBronKerbosch #endif - diff --git a/modules/legacy/src/decomppoly.cpp b/modules/legacy/src/decomppoly.cpp index c577a9c1f5..0cb10551c1 100644 --- a/modules/legacy/src/decomppoly.cpp +++ b/modules/legacy/src/decomppoly.cpp @@ -626,4 +626,3 @@ void cvDecompPoly( CvContour* cont, #endif // End of file decomppoly.cpp - diff --git a/modules/legacy/src/dpstereo.cpp b/modules/legacy/src/dpstereo.cpp index a55e1cafbb..c920462aa8 100644 --- a/modules/legacy/src/dpstereo.cpp +++ b/modules/legacy/src/dpstereo.cpp @@ -551,4 +551,3 @@ cvFindStereoCorrespondence( } /* End of file. */ - diff --git a/modules/legacy/src/enteringblobdetection.cpp b/modules/legacy/src/enteringblobdetection.cpp index 32a83bf0fa..d66a997a70 100644 --- a/modules/legacy/src/enteringblobdetection.cpp +++ b/modules/legacy/src/enteringblobdetection.cpp @@ -1060,5 +1060,3 @@ int CvBlobDetectorCC::DetectNewBlob(IplImage* /*pImg*/, IplImage* pFGMask, CvBlo return result; } /* cvDetectNewBlob */ - - diff --git a/modules/legacy/src/enteringblobdetectionreal.cpp b/modules/legacy/src/enteringblobdetectionreal.cpp index b0ec792a75..9458ab53ee 100644 --- a/modules/legacy/src/enteringblobdetectionreal.cpp +++ b/modules/legacy/src/enteringblobdetectionreal.cpp @@ -161,4 +161,3 @@ public: /* Blob detector constructor: */ //CvBlobDetector* cvCreateBlobDetectorReal(CvTestSeq* pTestSeq){return new CvBlobDetectorReal(pTestSeq);} - diff --git a/modules/legacy/src/epilines.cpp b/modules/legacy/src/epilines.cpp index 7d952111dc..7196d5109a 100644 --- a/modules/legacy/src/epilines.cpp +++ b/modules/legacy/src/epilines.cpp @@ -3698,5 +3698,3 @@ int cvComputeEssentialMatrix( CvMatr32f rotMatr, return CV_OK; } - - diff --git a/modules/legacy/src/extendededges.cpp b/modules/legacy/src/extendededges.cpp index 8ade446e1e..aa2488f832 100644 --- a/modules/legacy/src/extendededges.cpp +++ b/modules/legacy/src/extendededges.cpp @@ -263,7 +263,3 @@ CvSeq* icvCutContourRaster( CvSeq* current, CvMemStorage* storage, IplImage* ima */ #endif /* WIN32 */ - - - - diff --git a/modules/legacy/src/face.cpp b/modules/legacy/src/face.cpp index 7d2a5f13e1..b188a10def 100644 --- a/modules/legacy/src/face.cpp +++ b/modules/legacy/src/face.cpp @@ -351,4 +351,3 @@ inline void RFace::ResizeRect(CvRect Rect,CvRect * lpRect,long lDir,long lD) } }// inline void RFace::ResizeRect(CvRect * lpRect,long lDir,long lD) - diff --git a/modules/legacy/src/face.h b/modules/legacy/src/face.h index e7bda1a0c6..74a96f8de5 100644 --- a/modules/legacy/src/face.h +++ b/modules/legacy/src/face.h @@ -133,4 +133,3 @@ private: #endif //__FACE_H__ - diff --git a/modules/legacy/src/facedetection.cpp b/modules/legacy/src/facedetection.cpp index 4487fdad15..b93d9aa6b2 100644 --- a/modules/legacy/src/facedetection.cpp +++ b/modules/legacy/src/facedetection.cpp @@ -499,5 +499,3 @@ Face * FaceDetectionList::GetData() m_pCurElem = m_pCurElem->m_pNext; return m_pCurElem->m_pFace; }//Face * FaceDetectionList::GetData() - - diff --git a/modules/legacy/src/facetemplate.h b/modules/legacy/src/facetemplate.h index b0ff47c2ce..31a3a8303c 100644 --- a/modules/legacy/src/facetemplate.h +++ b/modules/legacy/src/facetemplate.h @@ -199,4 +199,3 @@ inline MouthFaceTemplate::MouthFaceTemplate(long lNumber,CvRect rect,double dEye #endif//__FACETEMPLATE_H__ - diff --git a/modules/legacy/src/features2d.cpp b/modules/legacy/src/features2d.cpp index 93ab461c04..a87c2bde70 100644 --- a/modules/legacy/src/features2d.cpp +++ b/modules/legacy/src/features2d.cpp @@ -122,5 +122,3 @@ cvGetStarKeypoints( const CvArr* _img, CvMemStorage* storage, } return seq; } - - diff --git a/modules/legacy/src/findface.cpp b/modules/legacy/src/findface.cpp index 8190994819..a41c579d4e 100644 --- a/modules/legacy/src/findface.cpp +++ b/modules/legacy/src/findface.cpp @@ -65,4 +65,3 @@ CvSeq * cvPostBoostingFindFace(IplImage * Image,CvMemStorage* lpStorage) return lpSeq; }//cvPostBoostingFindFace(IplImage * Image) - diff --git a/modules/legacy/src/findhandregion.cpp b/modules/legacy/src/findhandregion.cpp index 8a568833ef..23fc41935e 100644 --- a/modules/legacy/src/findhandregion.cpp +++ b/modules/legacy/src/findhandregion.cpp @@ -631,4 +631,3 @@ cvFindHandRegionA( CvPoint3D32f * points, int count, IPPI_CALL( icvFindHandRegionA( points, count, indexs, line, size, jc, center, storage, numbers )); } - diff --git a/modules/legacy/src/hmm.cpp b/modules/legacy/src/hmm.cpp index d1af33618d..d1196feaca 100644 --- a/modules/legacy/src/hmm.cpp +++ b/modules/legacy/src/hmm.cpp @@ -1695,4 +1695,3 @@ cvMixSegmL2( CvImgObsInfo ** obs_info_array, int num_img, CvEHMM * hmm ) } /* End of file */ - diff --git a/modules/legacy/src/hmm1d.cpp b/modules/legacy/src/hmm1d.cpp index 056bbf8c73..5daee8693b 100644 --- a/modules/legacy/src/hmm1d.cpp +++ b/modules/legacy/src/hmm1d.cpp @@ -1148,4 +1148,3 @@ CvStatus icvEstimate1DHMMStateParams(CvImgObsInfo** obs_info_array, int num_img, #endif - diff --git a/modules/legacy/src/image.cpp b/modules/legacy/src/image.cpp index 3f691bc27f..a3fc8b9141 100644 --- a/modules/legacy/src/image.cpp +++ b/modules/legacy/src/image.cpp @@ -330,4 +330,3 @@ void CvMatrix::show( const char* window_name ) /* End of file. */ - diff --git a/modules/legacy/src/lcm.cpp b/modules/legacy/src/lcm.cpp index eefe70d970..8416952a35 100644 --- a/modules/legacy/src/lcm.cpp +++ b/modules/legacy/src/lcm.cpp @@ -718,7 +718,3 @@ void _cvProjectionPointToSegment(CvPoint2D32f* PointO, PrPoint->y = PointO->y - VectorAO.y + alfa*VectorAB.y; return; }//end of _cvProjectionPointToSegment - - - - diff --git a/modules/legacy/src/levmar.cpp b/modules/legacy/src/levmar.cpp index aa2514e335..9b16b5a0fb 100644 --- a/modules/legacy/src/levmar.cpp +++ b/modules/legacy/src/levmar.cpp @@ -315,6 +315,3 @@ void TestOptimX2Y2() } #endif - - - diff --git a/modules/legacy/src/lines.cpp b/modules/legacy/src/lines.cpp index d0e243dfb4..48eaf797d8 100644 --- a/modules/legacy/src/lines.cpp +++ b/modules/legacy/src/lines.cpp @@ -477,4 +477,3 @@ cvPostWarpImage( int numLines, /* number of scanlines */ } /* End of file */ - diff --git a/modules/legacy/src/lmeds.cpp b/modules/legacy/src/lmeds.cpp index 42272345c3..7794640769 100644 --- a/modules/legacy/src/lmeds.cpp +++ b/modules/legacy/src/lmeds.cpp @@ -1683,4 +1683,3 @@ icvPoint7( int *ml, int *mr, double *F, int *amount ) return error; } /* icvPoint7 */ - diff --git a/modules/legacy/src/morphing.cpp b/modules/legacy/src/morphing.cpp index 44451414db..ab85b3b939 100644 --- a/modules/legacy/src/morphing.cpp +++ b/modules/legacy/src/morphing.cpp @@ -389,4 +389,3 @@ cvMorphEpilinesMulti( int lines, /* number of lines */ second_corr /* correspond information for the 2nd seq */ )); } - diff --git a/modules/legacy/src/testseq.cpp b/modules/legacy/src/testseq.cpp index d3521a5ae2..0dbc2c0c20 100644 --- a/modules/legacy/src/testseq.cpp +++ b/modules/legacy/src/testseq.cpp @@ -1367,4 +1367,3 @@ void cvAddNoise(IplImage* pImg, int noise_type, double Ampl, CvRandState* rnd_st cvReleaseImage(&pImgAdd); } /* cvAddNoise */ - diff --git a/modules/legacy/src/texture.cpp b/modules/legacy/src/texture.cpp index 4b7cb061cc..07fd087269 100644 --- a/modules/legacy/src/texture.cpp +++ b/modules/legacy/src/texture.cpp @@ -645,4 +645,3 @@ cvCreateGLCMImage( CvGLCM* GLCM, int step ) return dest; } - diff --git a/modules/legacy/src/trifocal.cpp b/modules/legacy/src/trifocal.cpp index 87aadf696d..f340283f1d 100644 --- a/modules/legacy/src/trifocal.cpp +++ b/modules/legacy/src/trifocal.cpp @@ -2785,4 +2785,3 @@ static void icvDecomposeQ(CvMat* /*matrQ*/,CvMat* /*matrH*/) } #endif - diff --git a/modules/legacy/src/vecfacetracking.cpp b/modules/legacy/src/vecfacetracking.cpp index 3a11ea9256..bcf309f706 100644 --- a/modules/legacy/src/vecfacetracking.cpp +++ b/modules/legacy/src/vecfacetracking.cpp @@ -971,4 +971,3 @@ inline double CalculateTransformationLMS3_0( CvPoint* pTemplPoints, CvPoint* pSr dbLMS = dbXtXt + dbYtYt - ((double)pow(dbXtXs + dbYtYs,2) + (double)pow(dbXtYs - dbYtXs,2)) / del; return dbLMS; } - diff --git a/modules/legacy/src/video.cpp b/modules/legacy/src/video.cpp index 3c6191ac95..f0bb6bca4d 100644 --- a/modules/legacy/src/video.cpp +++ b/modules/legacy/src/video.cpp @@ -80,5 +80,3 @@ cvDeInterlace( const CvArr* framearr, CvArr* fieldEven, CvArr* fieldOdd ) } /* End of file. */ - - diff --git a/modules/legacy/test/test_bruteforcematcher.cpp b/modules/legacy/test/test_bruteforcematcher.cpp index b9b2502008..d0a9ec666f 100644 --- a/modules/legacy/test/test_bruteforcematcher.cpp +++ b/modules/legacy/test/test_bruteforcematcher.cpp @@ -112,4 +112,3 @@ protected: }; TEST(Legacy_BruteForceMatcher, accuracy) { CV_BruteForceMatcherTest test; test.safe_run(); } - diff --git a/modules/legacy/test/test_optflow.cpp b/modules/legacy/test/test_optflow.cpp index f72d4c36af..3d74ff6b56 100644 --- a/modules/legacy/test/test_optflow.cpp +++ b/modules/legacy/test/test_optflow.cpp @@ -352,5 +352,3 @@ void CV_OptFlowTest::run( int /* start_from */) TEST(Legacy_OpticalFlow, accuracy) { CV_OptFlowTest test; test.safe_run(); } - - diff --git a/modules/legacy/test/test_subdivisions.cpp b/modules/legacy/test/test_subdivisions.cpp index 3dafd17ba3..0df71ab5f6 100644 --- a/modules/legacy/test/test_subdivisions.cpp +++ b/modules/legacy/test/test_subdivisions.cpp @@ -338,4 +338,3 @@ _exit_: TEST(Legacy_Subdiv, correctness) { CV_SubdivTest test; test.safe_run(); } /* End of file. */ - diff --git a/modules/ml/doc/decision_trees.rst b/modules/ml/doc/decision_trees.rst index 4bf9c116b9..de6fc99d63 100644 --- a/modules/ml/doc/decision_trees.rst +++ b/modules/ml/doc/decision_trees.rst @@ -318,4 +318,3 @@ decision tree. .. [Breiman84] Breiman, L., Friedman, J. Olshen, R. and Stone, C. (1984), *Classification and Regression Trees*, Wadsworth. - diff --git a/modules/ml/doc/k_nearest_neighbors.rst b/modules/ml/doc/k_nearest_neighbors.rst index 171be3dc1c..05413c7785 100644 --- a/modules/ml/doc/k_nearest_neighbors.rst +++ b/modules/ml/doc/k_nearest_neighbors.rst @@ -194,5 +194,3 @@ The sample below (currently using the obsolete ``CvMat`` structures) demonstrate cvReleaseMat( &trainData ); return 0; } - - diff --git a/modules/ml/doc/neural_networks.rst b/modules/ml/doc/neural_networks.rst index f955f15b11..0496e2201a 100644 --- a/modules/ml/doc/neural_networks.rst +++ b/modules/ml/doc/neural_networks.rst @@ -278,4 +278,3 @@ Returns neurons weights of the particular layer. .. ocv:function:: double* CvANN_MLP::get_weights(int layer) :param layer: Index of the particular layer. - diff --git a/modules/ml/doc/statistical_models.rst b/modules/ml/doc/statistical_models.rst index 76da927b19..af250b7864 100644 --- a/modules/ml/doc/statistical_models.rst +++ b/modules/ml/doc/statistical_models.rst @@ -161,4 +161,3 @@ Predicts the response for a sample. The method is used to predict the response for a new sample. In case of a classification, the method returns the class label. In case of a regression, the method returns the output function value. The input sample must have as many components as the ``train_data`` passed to ``train`` contains. If the ``var_idx`` parameter is passed to ``train``, it is remembered and then is used to extract only the necessary components from the input sample in the method ``predict``. The suffix ``const`` means that prediction does not affect the internal model state, so the method can be safely called from within different threads. - diff --git a/modules/ml/src/ertrees.cpp b/modules/ml/src/ertrees.cpp index 31d20398a9..d911834ee5 100644 --- a/modules/ml/src/ertrees.cpp +++ b/modules/ml/src/ertrees.cpp @@ -1847,4 +1847,3 @@ bool CvERTrees::train( const Mat& _train_data, int _tflag, } // End of file. - diff --git a/modules/ml/src/knearest.cpp b/modules/ml/src/knearest.cpp index 78012baa0a..a05a30da86 100644 --- a/modules/ml/src/knearest.cpp +++ b/modules/ml/src/knearest.cpp @@ -480,4 +480,3 @@ float CvKNearest::find_nearest( const cv::Mat& _samples, int k, CV_OUT cv::Mat& } /* End of file */ - diff --git a/modules/ml/src/nbayes.cpp b/modules/ml/src/nbayes.cpp index f1f7a24ec0..b9a966cd1d 100644 --- a/modules/ml/src/nbayes.cpp +++ b/modules/ml/src/nbayes.cpp @@ -623,4 +623,3 @@ float CvNormalBayesClassifier::predict( const Mat& _samples, Mat* _results ) con } /* End of file. */ - diff --git a/modules/ml/src/svm.cpp b/modules/ml/src/svm.cpp index 2e1b2e3565..8900e1e82c 100644 --- a/modules/ml/src/svm.cpp +++ b/modules/ml/src/svm.cpp @@ -2949,4 +2949,3 @@ cvTrainSVM_CrossValidation( const CvMat* train_data, int tflag, #endif /* End of file. */ - diff --git a/modules/ml/test/test_emknearestkmeans.cpp b/modules/ml/test/test_emknearestkmeans.cpp index b75e477f3a..1dac7a7a2d 100644 --- a/modules/ml/test/test_emknearestkmeans.cpp +++ b/modules/ml/test/test_emknearestkmeans.cpp @@ -678,4 +678,3 @@ TEST(ML_KNearest, accuracy) { CV_KNearestTest test; test.safe_run(); } TEST(ML_EM, accuracy) { CV_EMTest test; test.safe_run(); } TEST(ML_EM, save_load) { CV_EMTest_SaveLoad test; test.safe_run(); } TEST(ML_EM, classification) { CV_EMTest_Classification test; test.safe_run(); } - diff --git a/modules/nonfree/doc/feature_detection.rst b/modules/nonfree/doc/feature_detection.rst index 5c2b2a0786..f97dec1002 100644 --- a/modules/nonfree/doc/feature_detection.rst +++ b/modules/nonfree/doc/feature_detection.rst @@ -338,4 +338,4 @@ The class ``SURF_OCL`` uses some buffers and provides access to it. All buffers .. note:: - * OCL : An example of the SURF detector can be found at opencv_source_code/samples/ocl/surf_matcher.cpp \ No newline at end of file + * OCL : An example of the SURF detector can be found at opencv_source_code/samples/ocl/surf_matcher.cpp diff --git a/modules/nonfree/include/opencv2/nonfree/ocl.hpp b/modules/nonfree/include/opencv2/nonfree/ocl.hpp index 61b3c00a6f..78b6b466c4 100644 --- a/modules/nonfree/include/opencv2/nonfree/ocl.hpp +++ b/modules/nonfree/include/opencv2/nonfree/ocl.hpp @@ -121,4 +121,4 @@ namespace cv } } -#endif //__OPENCV_NONFREE_OCL_HPP__ \ No newline at end of file +#endif //__OPENCV_NONFREE_OCL_HPP__ diff --git a/modules/nonfree/perf/perf_surf.ocl.cpp b/modules/nonfree/perf/perf_surf.ocl.cpp index 23b1f1ecd0..fdd1931bd8 100644 --- a/modules/nonfree/perf/perf_surf.ocl.cpp +++ b/modules/nonfree/perf/perf_surf.ocl.cpp @@ -108,4 +108,4 @@ PERF_TEST_P(OCL_SURF, DISABLED_without_data_transfer, testing::Values(SURF_IMAGE SANITY_CHECK(cpu_dp, 1); } -#endif // HAVE_OPENCV_OCL \ No newline at end of file +#endif // HAVE_OPENCV_OCL diff --git a/modules/nonfree/test/test_detectors.cpp b/modules/nonfree/test/test_detectors.cpp index e675d3f99e..a45f29a642 100644 --- a/modules/nonfree/test/test_detectors.cpp +++ b/modules/nonfree/test/test_detectors.cpp @@ -312,6 +312,3 @@ void CV_DetectorsTest::run( int /*start_from*/ ) TEST(Features2d_Detectors, regression) { CV_DetectorsTest test; test.safe_run(); } - - - diff --git a/modules/nonfree/test/test_features2d.cpp b/modules/nonfree/test/test_features2d.cpp index 4cce77b9d5..b680d948b8 100644 --- a/modules/nonfree/test/test_features2d.cpp +++ b/modules/nonfree/test/test_features2d.cpp @@ -1218,4 +1218,3 @@ TEST(DISABLED_Features2d_SURF_using_mask, regression) FeatureDetectorUsingMaskTest test(Algorithm::create("Feature2D.SURF")); test.safe_run(); } - diff --git a/modules/objdetect/doc/latent_svm.rst b/modules/objdetect/doc/latent_svm.rst index 86fb0edc1e..9bb3ed727b 100644 --- a/modules/objdetect/doc/latent_svm.rst +++ b/modules/objdetect/doc/latent_svm.rst @@ -260,5 +260,3 @@ Return a count of loaded models (classes). .. [Felzenszwalb2010] Felzenszwalb, P. F. and Girshick, R. B. and McAllester, D. and Ramanan, D. *Object Detection with Discriminatively Trained Part Based Models*. PAMI, vol. 32, no. 9, pp. 1627-1645, September 2010 - - diff --git a/modules/objdetect/src/_lsvm_tbbversion.h b/modules/objdetect/src/_lsvm_tbbversion.h index fb02d8ac04..8bfca1bc11 100644 --- a/modules/objdetect/src/_lsvm_tbbversion.h +++ b/modules/objdetect/src/_lsvm_tbbversion.h @@ -48,4 +48,4 @@ int tbbTasksThresholdFunctionalScore(const CvLSVMFilterObject **filters, const i int *kPoints, CvPoint ****partsDisplacement); -#endif \ No newline at end of file +#endif diff --git a/modules/objdetect/src/cascadedetect.hpp b/modules/objdetect/src/cascadedetect.hpp index 904c207b3b..6c0821a830 100644 --- a/modules/objdetect/src/cascadedetect.hpp +++ b/modules/objdetect/src/cascadedetect.hpp @@ -487,4 +487,3 @@ inline int predictCategoricalStump( CascadeClassifier& cascade, Ptr(0, 0) - 1.f); } - - - - diff --git a/modules/ocl/perf/perf_pyramid.cpp b/modules/ocl/perf/perf_pyramid.cpp index b98f531b5e..10262799f1 100644 --- a/modules/ocl/perf/perf_pyramid.cpp +++ b/modules/ocl/perf/perf_pyramid.cpp @@ -129,4 +129,4 @@ PERFTEST(pyrUp) TestSystem::instance().ExpectedMatNear(dst, ocl_dst, (src.depth() == CV_32F ? 1e-4f : 1.0)); } } -} \ No newline at end of file +} diff --git a/modules/ocl/src/blend.cpp b/modules/ocl/src/blend.cpp index ed4a40069b..ec73c8662c 100644 --- a/modules/ocl/src/blend.cpp +++ b/modules/ocl/src/blend.cpp @@ -90,4 +90,4 @@ void cv::ocl::blendLinear(const oclMat &img1, const oclMat &img2, const oclMat & openCLExecuteKernel(ctx, &blend_linear, kernelName, globalSize, localSize, args, channels, depth); } -} \ No newline at end of file +} diff --git a/modules/ocl/src/columnsum.cpp b/modules/ocl/src/columnsum.cpp index 037ff234e9..1d6939f4e1 100644 --- a/modules/ocl/src/columnsum.cpp +++ b/modules/ocl/src/columnsum.cpp @@ -82,4 +82,4 @@ void cv::ocl::columnSum(const oclMat &src, oclMat &dst) openCLExecuteKernel(clCxt, &imgproc_columnsum, kernelName, globalThreads, localThreads, args, src.channels(), src.depth()); -} \ No newline at end of file +} diff --git a/modules/ocl/src/gftt.cpp b/modules/ocl/src/gftt.cpp index 2219e7763d..37ebaafa38 100644 --- a/modules/ocl/src/gftt.cpp +++ b/modules/ocl/src/gftt.cpp @@ -348,5 +348,3 @@ void cv::ocl::GoodFeaturesToTrackDetector_OCL::downloadPoints(const oclMat &poin NULL, NULL)); } - - diff --git a/modules/ocl/src/hog.cpp b/modules/ocl/src/hog.cpp index e532d31fd7..4aafb47d9c 100644 --- a/modules/ocl/src/hog.cpp +++ b/modules/ocl/src/hog.cpp @@ -1955,4 +1955,4 @@ void cv::ocl::device::hog::compute_gradients_8UC4(int height, int width, openCLExecuteKernel(clCxt, &objdetect_hog, kernelName, globalThreads, localThreads, args, -1, -1); -} \ No newline at end of file +} diff --git a/modules/ocl/src/interpolate_frames.cpp b/modules/ocl/src/interpolate_frames.cpp index 4a7d7d8355..3932f87ac1 100644 --- a/modules/ocl/src/interpolate_frames.cpp +++ b/modules/ocl/src/interpolate_frames.cpp @@ -236,4 +236,3 @@ void interpolate::bindImgTex(const oclMat &img, cl_mem &texture) } texture = bindTexture(img); } - diff --git a/modules/ocl/src/kmeans.cpp b/modules/ocl/src/kmeans.cpp index 22f86600a8..4de42fce55 100644 --- a/modules/ocl/src/kmeans.cpp +++ b/modules/ocl/src/kmeans.cpp @@ -435,4 +435,3 @@ double cv::ocl::kmeans(const oclMat &_src, int K, oclMat &_bestLabels, return best_compactness; } - diff --git a/modules/ocl/src/moments.cpp b/modules/ocl/src/moments.cpp index 8dfc664577..926b94c9b3 100644 --- a/modules/ocl/src/moments.cpp +++ b/modules/ocl/src/moments.cpp @@ -338,4 +338,3 @@ Moments ocl_moments( InputArray _array, bool binaryImage ) } } - diff --git a/modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl b/modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl index 9c6475cf29..9af6589adf 100644 --- a/modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl +++ b/modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl @@ -745,4 +745,3 @@ __kernel void arithm_s_bitwise_binary_with_mask_C4_D6 ( } } #endif - diff --git a/modules/ocl/src/opencl/arithm_compare_eq.cl b/modules/ocl/src/opencl/arithm_compare_eq.cl index 0681c6f100..16a56acef3 100644 --- a/modules/ocl/src/opencl/arithm_compare_eq.cl +++ b/modules/ocl/src/opencl/arithm_compare_eq.cl @@ -1014,4 +1014,3 @@ __kernel void arithm_compare_ge_D6 (__global double *src1, int src1_step, int sr } } #endif - diff --git a/modules/ocl/src/opencl/arithm_compare_ne.cl b/modules/ocl/src/opencl/arithm_compare_ne.cl index d0e862d721..fb5859d3b2 100644 --- a/modules/ocl/src/opencl/arithm_compare_ne.cl +++ b/modules/ocl/src/opencl/arithm_compare_ne.cl @@ -1011,5 +1011,3 @@ __kernel void arithm_compare_le_D6 (__global double *src1, int src1_step, int sr } } #endif - - diff --git a/modules/ocl/src/opencl/arithm_div.cl b/modules/ocl/src/opencl/arithm_div.cl index b79da976b7..1dce3853ff 100644 --- a/modules/ocl/src/opencl/arithm_div.cl +++ b/modules/ocl/src/opencl/arithm_div.cl @@ -466,5 +466,3 @@ __kernel void arithm_s_div_D6 (__global double *src, int src_step, int src_offse } } #endif - - diff --git a/modules/ocl/src/opencl/arithm_minMaxLoc.cl b/modules/ocl/src/opencl/arithm_minMaxLoc.cl index 761cd70f8b..94cc14d258 100644 --- a/modules/ocl/src/opencl/arithm_minMaxLoc.cl +++ b/modules/ocl/src/opencl/arithm_minMaxLoc.cl @@ -377,4 +377,4 @@ __kernel void arithm_op_minMaxLoc_mask (int cols,int invalid_cols,int offset,int } } -*/ \ No newline at end of file +*/ diff --git a/modules/ocl/src/opencl/arithm_mul.cl b/modules/ocl/src/opencl/arithm_mul.cl index f853629436..bfbb5942e0 100644 --- a/modules/ocl/src/opencl/arithm_mul.cl +++ b/modules/ocl/src/opencl/arithm_mul.cl @@ -300,4 +300,4 @@ __kernel void arithm_muls_D5 (__global float *src1, int src1_step, int src1_offs *((__global float *)((__global char *)dst + dst_index)) = tmp; } -} \ No newline at end of file +} diff --git a/modules/ocl/src/opencl/filter_sep_row.cl b/modules/ocl/src/opencl/filter_sep_row.cl index 30d65c59a7..9dc498399d 100644 --- a/modules/ocl/src/opencl/filter_sep_row.cl +++ b/modules/ocl/src/opencl/filter_sep_row.cl @@ -467,5 +467,3 @@ __kernel __attribute__((reqd_work_group_size(LSIZE0,LSIZE1,1))) void row_filter_ } } - - diff --git a/modules/ocl/src/opencl/haarobjectdetect.cl b/modules/ocl/src/opencl/haarobjectdetect.cl index 003505ec64..22a7fe7cbf 100644 --- a/modules/ocl/src/opencl/haarobjectdetect.cl +++ b/modules/ocl/src/opencl/haarobjectdetect.cl @@ -421,5 +421,3 @@ __kernel void __attribute__((reqd_work_group_size(8,8,1)))gpuRunHaarClassifierCa }//end for(int grploop=grpidx;grploop& ob1, std::vector& o } return final_test_result; } - diff --git a/modules/photo/doc/denoising.rst b/modules/photo/doc/denoising.rst index 97625d3b31..0894275b43 100644 --- a/modules/photo/doc/denoising.rst +++ b/modules/photo/doc/denoising.rst @@ -88,4 +88,3 @@ Modification of ``fastNlMeansDenoisingMulti`` function for colored images sequen :param hForColorComponents: The same as h but for color components. The function converts images to CIELAB colorspace and then separately denoise L and AB components with given h parameters using ``fastNlMeansDenoisingMulti`` function. - diff --git a/modules/photo/doc/inpainting.rst b/modules/photo/doc/inpainting.rst index 6c967969df..b39f01acd4 100644 --- a/modules/photo/doc/inpainting.rst +++ b/modules/photo/doc/inpainting.rst @@ -36,4 +36,4 @@ for more details. * An example using the inpainting technique can be found at opencv_source_code/samples/cpp/inpaint.cpp - * (Python) An example using the inpainting technique can be found at opencv_source_code/samples/python2/inpaint.py \ No newline at end of file + * (Python) An example using the inpainting technique can be found at opencv_source_code/samples/python2/inpaint.py diff --git a/modules/photo/src/arrays.hpp b/modules/photo/src/arrays.hpp index cb434a611f..5216716170 100644 --- a/modules/photo/src/arrays.hpp +++ b/modules/photo/src/arrays.hpp @@ -157,5 +157,3 @@ template struct Array4d { }; #endif - - diff --git a/modules/photo/src/denoising.cpp b/modules/photo/src/denoising.cpp index 191926ccb7..4762eda31a 100644 --- a/modules/photo/src/denoising.cpp +++ b/modules/photo/src/denoising.cpp @@ -238,5 +238,3 @@ void cv::fastNlMeansDenoisingColoredMulti( InputArrayOfArrays _srcImgs, OutputAr cvtColor(dst_lab, dst, CV_Lab2LBGR); } - - diff --git a/modules/python/src2/cv2.cpp b/modules/python/src2/cv2.cpp index 3a6137a498..3c28555b77 100644 --- a/modules/python/src2/cv2.cpp +++ b/modules/python/src2/cv2.cpp @@ -1258,4 +1258,3 @@ void initcv2() #include "pyopencv_generated_const_reg.h" } - diff --git a/modules/python/src2/cv2.cv.hpp b/modules/python/src2/cv2.cv.hpp index 31bb77687b..909ef64b0f 100644 --- a/modules/python/src2/cv2.cv.hpp +++ b/modules/python/src2/cv2.cv.hpp @@ -4054,4 +4054,3 @@ static PyObject* init_cv() return m; } - diff --git a/modules/python/test/calchist.py b/modules/python/test/calchist.py index 287e22f91e..dba6796b3a 100755 --- a/modules/python/test/calchist.py +++ b/modules/python/test/calchist.py @@ -51,4 +51,3 @@ if __name__ == '__main__': cv.ShowImage("H-S Histogram", hs_histogram(src)) cv.WaitKey(0) - diff --git a/modules/stitching/CMakeLists.txt b/modules/stitching/CMakeLists.txt index 5d48bd378f..fda44591f7 100644 --- a/modules/stitching/CMakeLists.txt +++ b/modules/stitching/CMakeLists.txt @@ -1,3 +1,2 @@ set(the_description "Images stitching") ocv_define_module(stitching opencv_imgproc opencv_features2d opencv_calib3d opencv_objdetect OPTIONAL opencv_gpu opencv_nonfree) - diff --git a/modules/stitching/doc/autocalib.rst b/modules/stitching/doc/autocalib.rst index a9c0c35fdd..021e7b394d 100644 --- a/modules/stitching/doc/autocalib.rst +++ b/modules/stitching/doc/autocalib.rst @@ -30,4 +30,3 @@ Estimates focal lengths for each given camera. :param pairwise_matches: Matches between all image pairs. :param focals: Estimated focal lengths for each camera. - diff --git a/modules/stitching/doc/exposure_compensation.rst b/modules/stitching/doc/exposure_compensation.rst index d27701e25b..eff98c01ca 100644 --- a/modules/stitching/doc/exposure_compensation.rst +++ b/modules/stitching/doc/exposure_compensation.rst @@ -108,4 +108,3 @@ Exposure compensator which tries to remove exposure related artifacts by adjusti }; .. seealso:: :ocv:class:`detail::ExposureCompensator` - diff --git a/modules/stitching/doc/high_level.rst b/modules/stitching/doc/high_level.rst index bd75765222..955f8f2481 100644 --- a/modules/stitching/doc/high_level.rst +++ b/modules/stitching/doc/high_level.rst @@ -208,4 +208,3 @@ Spherical warper factory class. :: }; .. seealso:: :ocv:class:`detail::SphericalWarper` - diff --git a/modules/stitching/doc/stitching.rst b/modules/stitching/doc/stitching.rst index 983b310e78..f071a23501 100644 --- a/modules/stitching/doc/stitching.rst +++ b/modules/stitching/doc/stitching.rst @@ -15,5 +15,3 @@ stitching. Images stitching seam_estimation exposure_compensation blenders - - diff --git a/modules/stitching/doc/warpers.rst b/modules/stitching/doc/warpers.rst index b6826a01a6..1025ffa0cb 100644 --- a/modules/stitching/doc/warpers.rst +++ b/modules/stitching/doc/warpers.rst @@ -260,4 +260,4 @@ Construct an instance of the cylindrical warper class. .. ocv:function:: void detail::CylindricalWarper::CylindricalWarper(float scale) - :param scale: Projected image scale multiplier \ No newline at end of file + :param scale: Projected image scale multiplier diff --git a/modules/stitching/src/motion_estimators.cpp b/modules/stitching/src/motion_estimators.cpp index c873bc721a..98f4ec2e2d 100644 --- a/modules/stitching/src/motion_estimators.cpp +++ b/modules/stitching/src/motion_estimators.cpp @@ -851,4 +851,3 @@ void findMaxSpanningTree(int num_images, const vector &pairwise_mat } // namespace detail } // namespace cv - diff --git a/modules/stitching/src/seam_finders.cpp b/modules/stitching/src/seam_finders.cpp index 1439a6919b..784209c935 100644 --- a/modules/stitching/src/seam_finders.cpp +++ b/modules/stitching/src/seam_finders.cpp @@ -1646,4 +1646,3 @@ void GraphCutSeamFinderGpu::setGraphWeightsColorGrad( } // namespace detail } // namespace cv - diff --git a/modules/stitching/test/test_matchers.cpp b/modules/stitching/test/test_matchers.cpp index baa02ec8d5..ba5c43ae22 100644 --- a/modules/stitching/test/test_matchers.cpp +++ b/modules/stitching/test/test_matchers.cpp @@ -75,4 +75,4 @@ TEST(SurfFeaturesFinder, CanFindInROIs) ASSERT_EQ(bad_count, 0); } -#endif \ No newline at end of file +#endif diff --git a/modules/superres/src/btv_l1_ocl.cpp b/modules/superres/src/btv_l1_ocl.cpp index c458b24ca8..2f27d50259 100644 --- a/modules/superres/src/btv_l1_ocl.cpp +++ b/modules/superres/src/btv_l1_ocl.cpp @@ -745,4 +745,4 @@ Ptr cv::superres::createSuperResolution_BTVL1_OCL() { return new BTVL1_OCL; } -#endif \ No newline at end of file +#endif diff --git a/modules/superres/src/opencl/superres_btvl1.cl b/modules/superres/src/opencl/superres_btvl1.cl index 0a8c62fa1e..4720623234 100644 --- a/modules/superres/src/opencl/superres_btvl1.cl +++ b/modules/superres/src/opencl/superres_btvl1.cl @@ -258,4 +258,4 @@ __kernel void calcBtvRegularizationKernel(__global float* src, dst[y * dst_step + 4 * x + 3] = dstVal.w; } } -} \ No newline at end of file +} diff --git a/modules/superres/src/optical_flow.cpp b/modules/superres/src/optical_flow.cpp index 125969b3e2..9df4c3b79d 100644 --- a/modules/superres/src/optical_flow.cpp +++ b/modules/superres/src/optical_flow.cpp @@ -984,4 +984,4 @@ Ptr cv::superres::createOptFlow_Farneback_OCL() return new FarneBack_OCL; } -#endif \ No newline at end of file +#endif diff --git a/modules/ts/misc/perf_tests_timing.py b/modules/ts/misc/perf_tests_timing.py index d082f9c265..dd44f1a639 100644 --- a/modules/ts/misc/perf_tests_timing.py +++ b/modules/ts/misc/perf_tests_timing.py @@ -156,4 +156,4 @@ if __name__ == "__main__": if not options.failedOnly: print '\nOverall time: %.2f min\n' % overall_time tbl.consolePrintTable(sys.stdout) - print 2 * '\n' \ No newline at end of file + print 2 * '\n' diff --git a/modules/ts/misc/report.py b/modules/ts/misc/report.py index 6da89e512b..045fee8d15 100755 --- a/modules/ts/misc/report.py +++ b/modules/ts/misc/report.py @@ -100,4 +100,4 @@ if __name__ == "__main__": tbl.htmlPrintTable(sys.stdout) htmlPrintFooter(sys.stdout) else: - tbl.consolePrintTable(sys.stdout) \ No newline at end of file + tbl.consolePrintTable(sys.stdout) diff --git a/modules/ts/src/ts_perf.cpp b/modules/ts/src/ts_perf.cpp index f36ff09dfe..dc7f45320e 100644 --- a/modules/ts/src/ts_perf.cpp +++ b/modules/ts/src/ts_perf.cpp @@ -1415,4 +1415,3 @@ void PrintTo(const Size& sz, ::std::ostream* os) } } // namespace cv - diff --git a/modules/video/src/bgfg_gaussmix.cpp b/modules/video/src/bgfg_gaussmix.cpp index 4d8f565301..61c0ec9d19 100644 --- a/modules/video/src/bgfg_gaussmix.cpp +++ b/modules/video/src/bgfg_gaussmix.cpp @@ -418,4 +418,3 @@ void BackgroundSubtractorMOG::operator()(InputArray _image, OutputArray _fgmask, } /* End of file. */ - diff --git a/modules/video/src/kalman.cpp b/modules/video/src/kalman.cpp index a5485751ec..00211e8cf0 100644 --- a/modules/video/src/kalman.cpp +++ b/modules/video/src/kalman.cpp @@ -297,5 +297,3 @@ const Mat& KalmanFilter::correct(const Mat& measurement) } }; - - diff --git a/modules/video/src/lkpyramid.hpp b/modules/video/src/lkpyramid.hpp index 4aff37ef84..1b9d50bc64 100644 --- a/modules/video/src/lkpyramid.hpp +++ b/modules/video/src/lkpyramid.hpp @@ -34,4 +34,3 @@ namespace detail }// namespace detail }// namespace cv - diff --git a/modules/video/src/optflowgf.cpp b/modules/video/src/optflowgf.cpp index 0f63bb47a5..abe824660b 100644 --- a/modules/video/src/optflowgf.cpp +++ b/modules/video/src/optflowgf.cpp @@ -658,4 +658,3 @@ CV_IMPL void cvCalcOpticalFlowFarneback( cv::calcOpticalFlowFarneback( prev, next, flow, pyr_scale, levels, winsize, iterations, poly_n, poly_sigma, flags ); } - diff --git a/modules/video/src/simpleflow.cpp b/modules/video/src/simpleflow.cpp index 7a32245555..ef2db70185 100644 --- a/modules/video/src/simpleflow.cpp +++ b/modules/video/src/simpleflow.cpp @@ -648,4 +648,3 @@ CV_EXPORTS_W void calcOpticalFlowSF(Mat& from, } } - diff --git a/modules/videostab/CMakeLists.txt b/modules/videostab/CMakeLists.txt index 5becdc8050..ac5cb0d69b 100644 --- a/modules/videostab/CMakeLists.txt +++ b/modules/videostab/CMakeLists.txt @@ -1,3 +1,2 @@ set(the_description "Video stabilization") ocv_define_module(videostab opencv_imgproc opencv_features2d opencv_video opencv_photo opencv_calib3d opencv_highgui OPTIONAL opencv_gpu) - diff --git a/modules/videostab/src/precomp.hpp b/modules/videostab/src/precomp.hpp index f718d0e8ed..5febaaa948 100644 --- a/modules/videostab/src/precomp.hpp +++ b/modules/videostab/src/precomp.hpp @@ -80,4 +80,3 @@ template inline const T& at(int index, const std::vector &items) } #endif - diff --git a/platforms/android/package/CMakeLists.txt b/platforms/android/package/CMakeLists.txt index 0bfb3fe899..1382a078cf 100644 --- a/platforms/android/package/CMakeLists.txt +++ b/platforms/android/package/CMakeLists.txt @@ -91,4 +91,4 @@ add_custom_command( install(FILES "${APK_NAME}" DESTINATION "apk/" COMPONENT main) add_custom_target(android_package ALL SOURCES "${APK_NAME}" ) -add_dependencies(android_package opencv_java) \ No newline at end of file +add_dependencies(android_package opencv_java) diff --git a/platforms/android/refman.rst b/platforms/android/refman.rst index 12d7ea6ec0..b830bbe09a 100644 --- a/platforms/android/refman.rst +++ b/platforms/android/refman.rst @@ -6,4 +6,4 @@ OpenCV4Android Reference :maxdepth: 2 service/doc/index.rst - java.rst \ No newline at end of file + java.rst diff --git a/platforms/android/service/all.py b/platforms/android/service/all.py index 0993b89acf..18ab4570bd 100755 --- a/platforms/android/service/all.py +++ b/platforms/android/service/all.py @@ -40,4 +40,4 @@ if (__name__ == "__main__"): os.system(PushCommand) print("Testing on device \"%s\"" % Name) TestCommand = "%s \"%s\" \"%s\" 2>&1" % (os.path.join(HomeDir, "test_native.py"), Arch, Name) - os.system(TestCommand) \ No newline at end of file + os.system(TestCommand) diff --git a/platforms/android/service/device.conf b/platforms/android/service/device.conf index 2953b54510..f8c6b5a865 100644 --- a/platforms/android/service/device.conf +++ b/platforms/android/service/device.conf @@ -1,3 +1,3 @@ armeabi;15c000000581404; x86;0123456789ABCDEF; -mips;Novo7 Basic; \ No newline at end of file +mips;Novo7 Basic; diff --git a/platforms/android/service/doc/Intro.rst b/platforms/android/service/doc/Intro.rst index d0e9d73470..4b00b8e4a8 100644 --- a/platforms/android/service/doc/Intro.rst +++ b/platforms/android/service/doc/Intro.rst @@ -41,4 +41,4 @@ Subsequent launches of OpenCV apps\: Architecture of OpenCV Manager ------------------------------ -.. image:: img/Structure.png \ No newline at end of file +.. image:: img/Structure.png diff --git a/platforms/android/service/doc/LoaderCallbackInterface.rst b/platforms/android/service/doc/LoaderCallbackInterface.rst index 440b6b6737..63838a1272 100644 --- a/platforms/android/service/doc/LoaderCallbackInterface.rst +++ b/platforms/android/service/doc/LoaderCallbackInterface.rst @@ -46,4 +46,4 @@ Initialization status constants .. data:: INIT_FAILED - OpenCV library initialization failed \ No newline at end of file + OpenCV library initialization failed diff --git a/platforms/android/service/doc/UseCases.rst b/platforms/android/service/doc/UseCases.rst index bbc7da02c3..50ac050e9c 100644 --- a/platforms/android/service/doc/UseCases.rst +++ b/platforms/android/service/doc/UseCases.rst @@ -29,4 +29,4 @@ Regular application start OpenCV Manager and OpenCV library has been already installed. -.. image:: img/LibInstalled.png \ No newline at end of file +.. image:: img/LibInstalled.png diff --git a/platforms/android/service/doc/build_uml.py b/platforms/android/service/doc/build_uml.py index df9eb7bcd5..94b61d6aed 100755 --- a/platforms/android/service/doc/build_uml.py +++ b/platforms/android/service/doc/build_uml.py @@ -20,4 +20,4 @@ if (not os.path.exists(TARGET_PATH)): for filename in os.listdir("."): if ("dia" == filename[-3:]): - os.system("%s --export %s %s" % (DiaPath, os.path.join(TARGET_PATH, filename[0:len(filename)-4] + ".png"), filename)) \ No newline at end of file + os.system("%s --export %s %s" % (DiaPath, os.path.join(TARGET_PATH, filename[0:len(filename)-4] + ".png"), filename)) diff --git a/platforms/android/service/engine/jni/Android.mk b/platforms/android/service/engine/jni/Android.mk index 71d2c464c9..a5c1881109 100644 --- a/platforms/android/service/engine/jni/Android.mk +++ b/platforms/android/service/engine/jni/Android.mk @@ -83,4 +83,4 @@ include $(BUILD_SHARED_LIBRARY) # Native test application #--------------------------------------------------------------------- -#include $(LOCAL_PATH)/Tests/Tests.mk \ No newline at end of file +#include $(LOCAL_PATH)/Tests/Tests.mk diff --git a/platforms/android/service/engine/jni/Application.mk b/platforms/android/service/engine/jni/Application.mk index 5647110fa2..e530dc1915 100644 --- a/platforms/android/service/engine/jni/Application.mk +++ b/platforms/android/service/engine/jni/Application.mk @@ -3,4 +3,4 @@ APP_PLATFORM := android-8 APP_STL := stlport_static APP_CPPFLAGS := -fno-rtti -fno-exceptions NDK_TOOLCHAIN_VERSION=4.4.3 -#APP_OPTIM := debug \ No newline at end of file +#APP_OPTIM := debug diff --git a/platforms/android/service/engine/jni/BinderComponent/BnOpenCVEngine.cpp b/platforms/android/service/engine/jni/BinderComponent/BnOpenCVEngine.cpp index 997b8d6ce0..fccb329e90 100644 --- a/platforms/android/service/engine/jni/BinderComponent/BnOpenCVEngine.cpp +++ b/platforms/android/service/engine/jni/BinderComponent/BnOpenCVEngine.cpp @@ -69,4 +69,4 @@ status_t BnOpenCVEngine::onTransact(uint32_t code, const Parcel& data, android:: } return android::NO_ERROR; -} \ No newline at end of file +} diff --git a/platforms/android/service/engine/jni/BinderComponent/BnOpenCVEngine.h b/platforms/android/service/engine/jni/BinderComponent/BnOpenCVEngine.h index bdb88ae1ab..cda2b03e91 100644 --- a/platforms/android/service/engine/jni/BinderComponent/BnOpenCVEngine.h +++ b/platforms/android/service/engine/jni/BinderComponent/BnOpenCVEngine.h @@ -18,4 +18,4 @@ public: }; -#endif \ No newline at end of file +#endif diff --git a/platforms/android/service/engine/jni/BinderComponent/BpOpenCVEngine.cpp b/platforms/android/service/engine/jni/BinderComponent/BpOpenCVEngine.cpp index b1a88ffb66..a9cbc11a21 100644 --- a/platforms/android/service/engine/jni/BinderComponent/BpOpenCVEngine.cpp +++ b/platforms/android/service/engine/jni/BinderComponent/BpOpenCVEngine.cpp @@ -68,4 +68,4 @@ bool BpOpenCVEngine::InstallVersion(String16 version) return static_cast(reply.readInt32()); } -IMPLEMENT_META_INTERFACE(OpenCVEngine, OPECV_ENGINE_CLASSNAME) \ No newline at end of file +IMPLEMENT_META_INTERFACE(OpenCVEngine, OPECV_ENGINE_CLASSNAME) diff --git a/platforms/android/service/engine/jni/BinderComponent/BpOpenCVEngine.h b/platforms/android/service/engine/jni/BinderComponent/BpOpenCVEngine.h index 01df00eaf6..cb2af532db 100644 --- a/platforms/android/service/engine/jni/BinderComponent/BpOpenCVEngine.h +++ b/platforms/android/service/engine/jni/BinderComponent/BpOpenCVEngine.h @@ -17,4 +17,4 @@ public: virtual bool InstallVersion(android::String16 version); }; -#endif \ No newline at end of file +#endif diff --git a/platforms/android/service/engine/jni/BinderComponent/HardwareDetector.cpp b/platforms/android/service/engine/jni/BinderComponent/HardwareDetector.cpp index eab49ac5f3..15f70f08a7 100644 --- a/platforms/android/service/engine/jni/BinderComponent/HardwareDetector.cpp +++ b/platforms/android/service/engine/jni/BinderComponent/HardwareDetector.cpp @@ -172,4 +172,4 @@ int DetectKnownPlatforms() { return PLATFORM_UNKNOWN; } -} \ No newline at end of file +} diff --git a/platforms/android/service/engine/jni/BinderComponent/HardwareDetector.h b/platforms/android/service/engine/jni/BinderComponent/HardwareDetector.h index 135684418b..1dda8bd14b 100644 --- a/platforms/android/service/engine/jni/BinderComponent/HardwareDetector.h +++ b/platforms/android/service/engine/jni/BinderComponent/HardwareDetector.h @@ -34,4 +34,4 @@ int GetProcessorCount(); std::string GetPlatformName(); int GetCpuID(); -#endif \ No newline at end of file +#endif diff --git a/platforms/android/service/engine/jni/BinderComponent/ProcReader.h b/platforms/android/service/engine/jni/BinderComponent/ProcReader.h index 333e7c2937..f703ccf9cd 100644 --- a/platforms/android/service/engine/jni/BinderComponent/ProcReader.h +++ b/platforms/android/service/engine/jni/BinderComponent/ProcReader.h @@ -26,4 +26,4 @@ // public part std::map GetCpuInfo(); -#endif \ No newline at end of file +#endif diff --git a/platforms/android/service/engine/jni/BinderComponent/StringUtils.cpp b/platforms/android/service/engine/jni/BinderComponent/StringUtils.cpp index 3809f5aa65..2e6b35a7b1 100644 --- a/platforms/android/service/engine/jni/BinderComponent/StringUtils.cpp +++ b/platforms/android/service/engine/jni/BinderComponent/StringUtils.cpp @@ -89,4 +89,4 @@ vector SplitStringVector(const string& src, const char seporator) } return result; -} \ No newline at end of file +} diff --git a/platforms/android/service/engine/jni/BinderComponent/StringUtils.h b/platforms/android/service/engine/jni/BinderComponent/StringUtils.h index d1fe36ce77..e36bfcc7c6 100644 --- a/platforms/android/service/engine/jni/BinderComponent/StringUtils.h +++ b/platforms/android/service/engine/jni/BinderComponent/StringUtils.h @@ -10,4 +10,4 @@ std::set SplitString(const std::string& src, const char seporator); bool ParseString(const std::string& src, std::string& key, std::string& value); std::vector SplitStringVector(const std::string& src, const char seporator); -#endif \ No newline at end of file +#endif diff --git a/platforms/android/service/engine/jni/BinderComponent/TegraDetector.cpp b/platforms/android/service/engine/jni/BinderComponent/TegraDetector.cpp index 3933efe499..6564c707fe 100644 --- a/platforms/android/service/engine/jni/BinderComponent/TegraDetector.cpp +++ b/platforms/android/service/engine/jni/BinderComponent/TegraDetector.cpp @@ -58,4 +58,4 @@ int DetectTegra() } return result; -} \ No newline at end of file +} diff --git a/platforms/android/service/engine/jni/BinderComponent/TegraDetector.h b/platforms/android/service/engine/jni/BinderComponent/TegraDetector.h index 8fbdb607a1..e2b0441ec8 100644 --- a/platforms/android/service/engine/jni/BinderComponent/TegraDetector.h +++ b/platforms/android/service/engine/jni/BinderComponent/TegraDetector.h @@ -6,4 +6,4 @@ int DetectTegra(); -#endif \ No newline at end of file +#endif diff --git a/platforms/android/service/engine/jni/JNIWrapper/HardwareDetector_jni.cpp b/platforms/android/service/engine/jni/JNIWrapper/HardwareDetector_jni.cpp index be30d877b7..3e490a3160 100644 --- a/platforms/android/service/engine/jni/JNIWrapper/HardwareDetector_jni.cpp +++ b/platforms/android/service/engine/jni/JNIWrapper/HardwareDetector_jni.cpp @@ -22,4 +22,4 @@ JNIEXPORT jint JNICALL Java_org_opencv_engine_HardwareDetector_GetProcessorCount JNIEXPORT jint JNICALL Java_org_opencv_engine_HardwareDetector_DetectKnownPlatforms(JNIEnv* , jclass) { return DetectKnownPlatforms(); -} \ No newline at end of file +} diff --git a/platforms/android/service/engine/jni/NativeClient/ClientMain.cpp b/platforms/android/service/engine/jni/NativeClient/ClientMain.cpp index 4e9bba2961..e9075dc9ab 100644 --- a/platforms/android/service/engine/jni/NativeClient/ClientMain.cpp +++ b/platforms/android/service/engine/jni/NativeClient/ClientMain.cpp @@ -39,4 +39,4 @@ int main(int argc, char *argv[]) printf("OpenCVEngine version %d started", EngineVersion); return 0; -} \ No newline at end of file +} diff --git a/platforms/android/service/engine/jni/NativeService/NativePackageManager.cpp b/platforms/android/service/engine/jni/NativeService/NativePackageManager.cpp index aba13de1e9..87d0ea0c17 100644 --- a/platforms/android/service/engine/jni/NativeService/NativePackageManager.cpp +++ b/platforms/android/service/engine/jni/NativeService/NativePackageManager.cpp @@ -16,4 +16,4 @@ vector NativePackageManager::GetInstalledPackages() NativePackageManager::~NativePackageManager() { -} \ No newline at end of file +} diff --git a/platforms/android/service/engine/jni/NativeService/NativePackageManager.h b/platforms/android/service/engine/jni/NativeService/NativePackageManager.h index c74a083598..329047f0bf 100644 --- a/platforms/android/service/engine/jni/NativeService/NativePackageManager.h +++ b/platforms/android/service/engine/jni/NativeService/NativePackageManager.h @@ -13,4 +13,4 @@ protected: virtual std::vector GetInstalledPackages(); }; -#endif \ No newline at end of file +#endif diff --git a/platforms/android/service/engine/jni/NativeService/ServiceMain.cpp b/platforms/android/service/engine/jni/NativeService/ServiceMain.cpp index 66ea995980..20cafa6c4f 100644 --- a/platforms/android/service/engine/jni/NativeService/ServiceMain.cpp +++ b/platforms/android/service/engine/jni/NativeService/ServiceMain.cpp @@ -29,4 +29,4 @@ int main(int argc, char *argv[]) delete PackageManager; return 0; -} \ No newline at end of file +} diff --git a/platforms/android/service/engine/jni/Tests/PackageManagerStub.cpp b/platforms/android/service/engine/jni/Tests/PackageManagerStub.cpp index 20be63a9b7..e154658629 100644 --- a/platforms/android/service/engine/jni/Tests/PackageManagerStub.cpp +++ b/platforms/android/service/engine/jni/Tests/PackageManagerStub.cpp @@ -15,4 +15,4 @@ vector PackageManagerStub::GetInstalledPackages() PackageManagerStub::~PackageManagerStub() { -} \ No newline at end of file +} diff --git a/platforms/android/service/engine/jni/Tests/PackageManagerStub.h b/platforms/android/service/engine/jni/Tests/PackageManagerStub.h index a37e6b0559..8d1d3a80b5 100644 --- a/platforms/android/service/engine/jni/Tests/PackageManagerStub.h +++ b/platforms/android/service/engine/jni/Tests/PackageManagerStub.h @@ -14,4 +14,4 @@ protected: virtual std::vector GetInstalledPackages(); }; -#endif \ No newline at end of file +#endif diff --git a/platforms/android/service/engine/jni/Tests/TestMain.cpp b/platforms/android/service/engine/jni/Tests/TestMain.cpp index 4c994ef447..96d7200ccd 100644 --- a/platforms/android/service/engine/jni/Tests/TestMain.cpp +++ b/platforms/android/service/engine/jni/Tests/TestMain.cpp @@ -4,4 +4,4 @@ int main(int argc, char **argv) { ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); -} \ No newline at end of file +} diff --git a/platforms/android/service/engine/jni/Tests/Tests.mk b/platforms/android/service/engine/jni/Tests/Tests.mk index 4cfe1c16a3..5b46bde529 100644 --- a/platforms/android/service/engine/jni/Tests/Tests.mk +++ b/platforms/android/service/engine/jni/Tests/Tests.mk @@ -44,4 +44,4 @@ LOCAL_LDLIBS += -lz -lbinder -llog -lutils LOCAL_SHARED_LIBRARIES += libOpenCVEngine -include $(BUILD_EXECUTABLE) \ No newline at end of file +include $(BUILD_EXECUTABLE) diff --git a/platforms/android/service/engine/jni/include/EngineCommon.h b/platforms/android/service/engine/jni/include/EngineCommon.h index 2bee139ea3..a03f02c68d 100644 --- a/platforms/android/service/engine/jni/include/EngineCommon.h +++ b/platforms/android/service/engine/jni/include/EngineCommon.h @@ -19,4 +19,4 @@ typedef const char* (*InfoFunctionType)(); -#endif \ No newline at end of file +#endif diff --git a/platforms/android/service/engine/jni/include/IOpenCVEngine.h b/platforms/android/service/engine/jni/include/IOpenCVEngine.h index 4dbb251c56..735d3746bb 100644 --- a/platforms/android/service/engine/jni/include/IOpenCVEngine.h +++ b/platforms/android/service/engine/jni/include/IOpenCVEngine.h @@ -29,4 +29,4 @@ public: virtual bool InstallVersion(android::String16 version) = 0; }; -#endif \ No newline at end of file +#endif diff --git a/platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineInterface.aidl b/platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineInterface.aidl index 91de3940c3..a6cf193e30 100644 --- a/platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineInterface.aidl +++ b/platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineInterface.aidl @@ -30,4 +30,4 @@ interface OpenCVEngineInterface * @return Returns OpenCV libraries names seporated by symbol ";" in loading order */ String getLibraryList(String version); -} \ No newline at end of file +} diff --git a/platforms/android/service/push_native.py b/platforms/android/service/push_native.py index 408fefc285..cc14a2fa10 100755 --- a/platforms/android/service/push_native.py +++ b/platforms/android/service/push_native.py @@ -24,4 +24,4 @@ if (__name__ == "__main__"): os.system("adb %s push ./engine/libs/%s/OpenCVEngineNativeService %s" % (DEVICE_STR, DEVICE_ARCH, TARGET_DEVICE_PATH)) os.system("adb %s push ./engine/libs/%s/OpenCVEngineTest %s" % (DEVICE_STR, DEVICE_ARCH, TARGET_DEVICE_PATH)) os.system("adb %s push ./engine/libs/%s/OpenCVEngineTestApp %s" % (DEVICE_STR, DEVICE_ARCH, TARGET_DEVICE_PATH)) - os.system("adb %s push ./engine/libs/%s/libOpenCVEngine_jni.so %s" % (DEVICE_STR, DEVICE_ARCH, TARGET_DEVICE_PATH)) \ No newline at end of file + os.system("adb %s push ./engine/libs/%s/libOpenCVEngine_jni.so %s" % (DEVICE_STR, DEVICE_ARCH, TARGET_DEVICE_PATH)) diff --git a/platforms/ios/build_framework.py b/platforms/ios/build_framework.py index bc385bb1bb..7dfd39460e 100755 --- a/platforms/ios/build_framework.py +++ b/platforms/ios/build_framework.py @@ -122,4 +122,4 @@ if __name__ == "__main__": print "Usage:\n\t./build_framework.py \n\n" sys.exit(0) - build_framework(os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "../..")), os.path.abspath(sys.argv[1])) \ No newline at end of file + build_framework(os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "../..")), os.path.abspath(sys.argv[1])) diff --git a/platforms/ios/cmake/Modules/Platform/iOS.cmake b/platforms/ios/cmake/Modules/Platform/iOS.cmake index 4d196e65d9..e021aca55f 100644 --- a/platforms/ios/cmake/Modules/Platform/iOS.cmake +++ b/platforms/ios/cmake/Modules/Platform/iOS.cmake @@ -160,4 +160,4 @@ list (APPEND CMAKE_SYSTEM_PREFIX_PATH # Project install destination. "${CMAKE_INSTALL_PREFIX}" -) \ No newline at end of file +) diff --git a/platforms/ios/cmake/Toolchains/Toolchain-iPhoneOS_Xcode.cmake b/platforms/ios/cmake/Toolchains/Toolchain-iPhoneOS_Xcode.cmake index 6493deb459..14555cd6a9 100644 --- a/platforms/ios/cmake/Toolchains/Toolchain-iPhoneOS_Xcode.cmake +++ b/platforms/ios/cmake/Toolchains/Toolchain-iPhoneOS_Xcode.cmake @@ -28,4 +28,4 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY) SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -message (STATUS "iPhoneOS toolchain loaded") \ No newline at end of file +message (STATUS "iPhoneOS toolchain loaded") diff --git a/platforms/ios/cmake/Toolchains/Toolchain-iPhoneSimulator_Xcode.cmake b/platforms/ios/cmake/Toolchains/Toolchain-iPhoneSimulator_Xcode.cmake index 0056c8dbd4..937079d182 100644 --- a/platforms/ios/cmake/Toolchains/Toolchain-iPhoneSimulator_Xcode.cmake +++ b/platforms/ios/cmake/Toolchains/Toolchain-iPhoneSimulator_Xcode.cmake @@ -28,4 +28,4 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY) SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -message (STATUS "iPhoneSimulator toolchain loaded") \ No newline at end of file +message (STATUS "iPhoneSimulator toolchain loaded") diff --git a/platforms/ios/readme.txt b/platforms/ios/readme.txt index 8f1f206b03..0c39e7213c 100644 --- a/platforms/ios/readme.txt +++ b/platforms/ios/readme.txt @@ -4,4 +4,4 @@ Building OpenCV from Source, using CMake and Command Line cd ~/ python opencv/platforms/ios/build_framework.py ios -If everything's fine, a few minutes later you will get ~//ios/opencv2.framework. You can add this framework to your Xcode projects. \ No newline at end of file +If everything's fine, a few minutes later you will get ~//ios/opencv2.framework. You can add this framework to your Xcode projects. diff --git a/platforms/readme.txt b/platforms/readme.txt index dfe0461422..b039d3dc8a 100644 --- a/platforms/readme.txt +++ b/platforms/readme.txt @@ -1,3 +1,3 @@ This folder contains toolchains and additional files that are needed for cross compilation. For more information see introduction tutorials for target platform in documentation: -http://docs.opencv.org/doc/tutorials/introduction/table_of_content_introduction/table_of_content_introduction.html#table-of-content-introduction \ No newline at end of file +http://docs.opencv.org/doc/tutorials/introduction/table_of_content_introduction/table_of_content_introduction.html#table-of-content-introduction diff --git a/platforms/scripts/cmake_winrt.cmd b/platforms/scripts/cmake_winrt.cmd index 3cdff97b75..ef5c27656a 100644 --- a/platforms/scripts/cmake_winrt.cmd +++ b/platforms/scripts/cmake_winrt.cmd @@ -6,4 +6,4 @@ set msvc_path=C:\Program Files\Microsoft Visual Studio 11.0 call "%msvc_path%\Common7\Tools\VsDevCmd.bat" call "%msvc_path%\VC\bin\x86_arm\vcvarsx86_arm.bat" -cmake.exe -GNinja -DCMAKE_BUILD_TYPE=Release -DENABLE_WINRT_MODE=ON -DWITH_FFMPEG=OFF -DWITH_MSMF=OFF -DWITH_DSHOW=OFF -DWITH_VFW=OFF -DWITH_TIFF=OFF -DWITH_OPENEXR=OFF -DWITH_CUDA=OFF -DBUILD_opencv_gpu=OFF -DBUILD_opencv_python=OFF -DBUILD_opencv_java=OFF -DCMAKE_TOOLCHAIN_FILE=..\winrt\arm.winrt.toolchain.cmake %* ..\.. \ No newline at end of file +cmake.exe -GNinja -DCMAKE_BUILD_TYPE=Release -DENABLE_WINRT_MODE=ON -DWITH_FFMPEG=OFF -DWITH_MSMF=OFF -DWITH_DSHOW=OFF -DWITH_VFW=OFF -DWITH_TIFF=OFF -DWITH_OPENEXR=OFF -DWITH_CUDA=OFF -DBUILD_opencv_gpu=OFF -DBUILD_opencv_python=OFF -DBUILD_opencv_java=OFF -DCMAKE_TOOLCHAIN_FILE=..\winrt\arm.winrt.toolchain.cmake %* ..\.. diff --git a/platforms/winrt/arm.winrt.toolchain.cmake b/platforms/winrt/arm.winrt.toolchain.cmake index b34056cd5e..a5158d01fa 100644 --- a/platforms/winrt/arm.winrt.toolchain.cmake +++ b/platforms/winrt/arm.winrt.toolchain.cmake @@ -3,4 +3,4 @@ set(CMAKE_SYSTEM_PROCESSOR "arm-v7a") set(CMAKE_FIND_ROOT_PATH "${CMAKE_SOURCE_DIR}/platforms/winrt") set(CMAKE_REQUIRED_DEFINITIONS -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE) -add_definitions(-D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE) \ No newline at end of file +add_definitions(-D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE) diff --git a/samples/android/.gitignore b/samples/android/.gitignore index 2d406cbbcc..a21956836e 100644 --- a/samples/android/.gitignore +++ b/samples/android/.gitignore @@ -4,4 +4,4 @@ build.xml local.properties proguard-project.txt project.properties -default.properties \ No newline at end of file +default.properties diff --git a/samples/android/color-blob-detection/CMakeLists.txt b/samples/android/color-blob-detection/CMakeLists.txt index 400db29ceb..42051bc3a2 100644 --- a/samples/android/color-blob-detection/CMakeLists.txt +++ b/samples/android/color-blob-detection/CMakeLists.txt @@ -4,4 +4,3 @@ add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenC if(TARGET ${sample}) add_dependencies(opencv_android_examples ${sample}) endif() - diff --git a/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java b/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java index e6e1c036c4..17d14beb56 100644 --- a/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java +++ b/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java @@ -187,4 +187,4 @@ public class ColorBlobDetectionActivity extends Activity implements OnTouchListe return new Scalar(pointMatRgba.get(0, 0)); } -} \ No newline at end of file +} diff --git a/samples/android/face-detection/CMakeLists.txt b/samples/android/face-detection/CMakeLists.txt index 70658a799b..0f89b2a362 100644 --- a/samples/android/face-detection/CMakeLists.txt +++ b/samples/android/face-detection/CMakeLists.txt @@ -10,4 +10,3 @@ add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenC if(TARGET ${sample}) add_dependencies(opencv_android_examples ${sample}) endif() - diff --git a/samples/android/face-detection/jni/Android.mk b/samples/android/face-detection/jni/Android.mk index e6db280c15..6b6642602d 100644 --- a/samples/android/face-detection/jni/Android.mk +++ b/samples/android/face-detection/jni/Android.mk @@ -13,4 +13,4 @@ LOCAL_LDLIBS += -llog -ldl LOCAL_MODULE := detection_based_tracker -include $(BUILD_SHARED_LIBRARY) \ No newline at end of file +include $(BUILD_SHARED_LIBRARY) diff --git a/samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp b/samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp index 22eda9ec11..974a5f62af 100644 --- a/samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp +++ b/samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp @@ -190,4 +190,4 @@ JNIEXPORT void JNICALL Java_org_opencv_samples_facedetect_DetectionBasedTracker_ jenv->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1VideoCapture__()}"); } LOGD("Java_org_opencv_samples_facedetect_DetectionBasedTracker_nativeDetect exit"); -} \ No newline at end of file +} diff --git a/samples/android/hello-android/main.cpp b/samples/android/hello-android/main.cpp index 2b985c6421..04341415c0 100644 --- a/samples/android/hello-android/main.cpp +++ b/samples/android/hello-android/main.cpp @@ -24,4 +24,3 @@ int main(int argc, char* argv[]) #endif return 0; } - diff --git a/samples/android/native-activity/src/org/opencv/samples/NativeActivity/CvNativeActivity.java b/samples/android/native-activity/src/org/opencv/samples/NativeActivity/CvNativeActivity.java index 1a9302b1d5..04da9a9496 100644 --- a/samples/android/native-activity/src/org/opencv/samples/NativeActivity/CvNativeActivity.java +++ b/samples/android/native-activity/src/org/opencv/samples/NativeActivity/CvNativeActivity.java @@ -40,4 +40,4 @@ public class CvNativeActivity extends Activity { super.onResume(); OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_3, this, mLoaderCallback); } -} \ No newline at end of file +} diff --git a/samples/android/tutorial-1-camerapreview/CMakeLists.txt b/samples/android/tutorial-1-camerapreview/CMakeLists.txt index 77ed5bce8f..7e5c5cb1b5 100644 --- a/samples/android/tutorial-1-camerapreview/CMakeLists.txt +++ b/samples/android/tutorial-1-camerapreview/CMakeLists.txt @@ -4,4 +4,3 @@ add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenC if(TARGET ${sample}) add_dependencies(opencv_android_examples ${sample}) endif() - diff --git a/samples/android/tutorial-3-cameracontrol/CMakeLists.txt b/samples/android/tutorial-3-cameracontrol/CMakeLists.txt index 45c0af2c31..3fd69c929c 100644 --- a/samples/android/tutorial-3-cameracontrol/CMakeLists.txt +++ b/samples/android/tutorial-3-cameracontrol/CMakeLists.txt @@ -4,4 +4,3 @@ add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenC if(TARGET ${sample}) add_dependencies(opencv_android_examples ${sample}) endif() - diff --git a/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/Tutorial3View.java b/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/Tutorial3View.java index 7ba2d9f967..d102cbcdef 100644 --- a/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/Tutorial3View.java +++ b/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/Tutorial3View.java @@ -84,4 +84,4 @@ public class Tutorial3View extends JavaCameraView implements PictureCallback { } } -} \ No newline at end of file +} diff --git a/samples/c/CMakeLists.txt b/samples/c/CMakeLists.txt index dfab5e00af..7ea20b9b2f 100644 --- a/samples/c/CMakeLists.txt +++ b/samples/c/CMakeLists.txt @@ -57,4 +57,3 @@ if (INSTALL_C_EXAMPLES AND NOT WIN32) DESTINATION share/OpenCV/samples/c PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) endif () - diff --git a/samples/c/adaptiveskindetector.cpp b/samples/c/adaptiveskindetector.cpp index b81bff92d2..a21f13e4dc 100644 --- a/samples/c/adaptiveskindetector.cpp +++ b/samples/c/adaptiveskindetector.cpp @@ -410,4 +410,3 @@ int main(int argc, char** argv ) return 0; } - diff --git a/samples/c/blobtrack_sample.cpp b/samples/c/blobtrack_sample.cpp index d8209fa305..e4f766cf3d 100644 --- a/samples/c/blobtrack_sample.cpp +++ b/samples/c/blobtrack_sample.cpp @@ -751,6 +751,3 @@ int main(int argc, char* argv[]) return 0; } /* main() */ - - - diff --git a/samples/c/example_cmake/CMakeLists.txt b/samples/c/example_cmake/CMakeLists.txt index 85129a7528..475677a090 100644 --- a/samples/c/example_cmake/CMakeLists.txt +++ b/samples/c/example_cmake/CMakeLists.txt @@ -13,6 +13,3 @@ ADD_EXECUTABLE(opencv_example minarea.c) TARGET_LINK_LIBRARIES(opencv_example ${OpenCV_LIBS}) #MESSAGE(STATUS "OpenCV_LIBS: ${OpenCV_LIBS}") - - - diff --git a/samples/c/example_cmake/README.txt b/samples/c/example_cmake/README.txt index 7bf53e7acc..7d573e3732 100755 --- a/samples/c/example_cmake/README.txt +++ b/samples/c/example_cmake/README.txt @@ -25,8 +25,3 @@ the CMake gui with: $ cmake-gui /samples/c/example_cmake/ And pick the correct value for OpenCV_DIR. - - - - - diff --git a/samples/c/example_cmake/minarea.c b/samples/c/example_cmake/minarea.c index 916acb0efe..c6e0cf310c 100644 --- a/samples/c/example_cmake/minarea.c +++ b/samples/c/example_cmake/minarea.c @@ -114,4 +114,3 @@ int main( int argc, char** argv ) #ifdef _EiC main(1,"convexhull.c"); #endif - diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt index ac61ec359e..39e6b40b47 100644 --- a/samples/cpp/CMakeLists.txt +++ b/samples/cpp/CMakeLists.txt @@ -86,4 +86,3 @@ if (INSTALL_C_EXAMPLES AND NOT WIN32) DESTINATION share/OpenCV/samples/cpp PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) endif() - diff --git a/samples/cpp/OpenEXRimages_HighDynamicRange_Retina_toneMapping.cpp b/samples/cpp/OpenEXRimages_HighDynamicRange_Retina_toneMapping.cpp index bfae1ebce4..1636e41f66 100644 --- a/samples/cpp/OpenEXRimages_HighDynamicRange_Retina_toneMapping.cpp +++ b/samples/cpp/OpenEXRimages_HighDynamicRange_Retina_toneMapping.cpp @@ -274,5 +274,3 @@ static void drawPlot(const cv::Mat curve, const std::string figureTitle, const i return 0; } - - diff --git a/samples/cpp/OpenEXRimages_HighDynamicRange_Retina_toneMapping_video.cpp b/samples/cpp/OpenEXRimages_HighDynamicRange_Retina_toneMapping_video.cpp index 7c47fcf66e..2cd42c77d6 100644 --- a/samples/cpp/OpenEXRimages_HighDynamicRange_Retina_toneMapping_video.cpp +++ b/samples/cpp/OpenEXRimages_HighDynamicRange_Retina_toneMapping_video.cpp @@ -357,5 +357,3 @@ static void loadNewFrame(const std::string filenamePrototype, const int currentF return 0; } - - diff --git a/samples/cpp/bgfg_gmg.cpp b/samples/cpp/bgfg_gmg.cpp index 3d2da44ab2..ac59abbb47 100644 --- a/samples/cpp/bgfg_gmg.cpp +++ b/samples/cpp/bgfg_gmg.cpp @@ -79,4 +79,3 @@ int main(int argc, char** argv) return 0; } - diff --git a/samples/cpp/calibration_artificial.cpp b/samples/cpp/calibration_artificial.cpp index a95113c1db..c22cb528f8 100644 --- a/samples/cpp/calibration_artificial.cpp +++ b/samples/cpp/calibration_artificial.cpp @@ -332,4 +332,3 @@ Mat cv::ChessBoardGenerator::operator ()(const Mat& bg, const Mat& camMat, const return generageChessBoard(bg, camMat, distCoeffs, zero, pb1, pb2, sqWidth, sqHeight, pts3d, corners); } - diff --git a/samples/cpp/dft.cpp b/samples/cpp/dft.cpp index dbbc2cc775..d47877d8c1 100644 --- a/samples/cpp/dft.cpp +++ b/samples/cpp/dft.cpp @@ -79,4 +79,3 @@ int main(int argc, const char ** argv) waitKey(); return 0; } - diff --git a/samples/cpp/houghlines.cpp b/samples/cpp/houghlines.cpp index b79ea2f5ff..5ecc54ce18 100644 --- a/samples/cpp/houghlines.cpp +++ b/samples/cpp/houghlines.cpp @@ -61,4 +61,3 @@ int main(int argc, char** argv) return 0; } - diff --git a/samples/cpp/opencv_version.cpp b/samples/cpp/opencv_version.cpp index ce84ac174e..dfb3bbafb6 100644 --- a/samples/cpp/opencv_version.cpp +++ b/samples/cpp/opencv_version.cpp @@ -25,4 +25,4 @@ int main(int argc, const char* argv[]) } return 0; -} \ No newline at end of file +} diff --git a/samples/cpp/phase_corr.cpp b/samples/cpp/phase_corr.cpp index f9088a0e83..e53f094311 100644 --- a/samples/cpp/phase_corr.cpp +++ b/samples/cpp/phase_corr.cpp @@ -43,7 +43,3 @@ int main(int, char* []) return 0; } - - - - diff --git a/samples/cpp/retinaDemo.cpp b/samples/cpp/retinaDemo.cpp index 7b8d81a49c..887b2a5443 100644 --- a/samples/cpp/retinaDemo.cpp +++ b/samples/cpp/retinaDemo.cpp @@ -154,4 +154,3 @@ int main(int argc, char* argv[]) { return 0; } - diff --git a/samples/cpp/stereo_calib.cpp b/samples/cpp/stereo_calib.cpp index 2c65fb0992..92135d6eda 100644 --- a/samples/cpp/stereo_calib.cpp +++ b/samples/cpp/stereo_calib.cpp @@ -401,4 +401,3 @@ int main(int argc, char** argv) StereoCalib(imagelist, boardSize, true, showRectified); return 0; } - diff --git a/samples/cpp/stitching.cpp b/samples/cpp/stitching.cpp index b4980507b6..901423f9ea 100644 --- a/samples/cpp/stitching.cpp +++ b/samples/cpp/stitching.cpp @@ -134,5 +134,3 @@ int parseCmdArgs(int argc, char** argv) } return 0; } - - diff --git a/samples/cpp/stitching_detailed.cpp b/samples/cpp/stitching_detailed.cpp index e795fdb8f6..49d86086de 100644 --- a/samples/cpp/stitching_detailed.cpp +++ b/samples/cpp/stitching_detailed.cpp @@ -762,5 +762,3 @@ int main(int argc, char* argv[]) LOGLN("Finished, total time: " << ((getTickCount() - app_start_time) / getTickFrequency()) << " sec"); return 0; } - - diff --git a/samples/cpp/tutorial_code/ImgProc/Morphology_2.cpp b/samples/cpp/tutorial_code/ImgProc/Morphology_2.cpp index c501bfd328..2a1327d9df 100644 --- a/samples/cpp/tutorial_code/ImgProc/Morphology_2.cpp +++ b/samples/cpp/tutorial_code/ImgProc/Morphology_2.cpp @@ -76,5 +76,3 @@ void Morphology_Operations( int, void* ) morphologyEx( src, dst, operation, element ); imshow( window_name, dst ); } - - diff --git a/samples/cpp/tutorial_code/ImgProc/Pyramids.cpp b/samples/cpp/tutorial_code/ImgProc/Pyramids.cpp index d0cae3c4f6..0c90520956 100644 --- a/samples/cpp/tutorial_code/ImgProc/Pyramids.cpp +++ b/samples/cpp/tutorial_code/ImgProc/Pyramids.cpp @@ -66,10 +66,3 @@ int main( void ) return 0; } - - - - - - - diff --git a/samples/cpp/tutorial_code/ImgTrans/Sobel_Demo.cpp b/samples/cpp/tutorial_code/ImgTrans/Sobel_Demo.cpp index 0ac9eb1a30..cbd03e8b98 100644 --- a/samples/cpp/tutorial_code/ImgTrans/Sobel_Demo.cpp +++ b/samples/cpp/tutorial_code/ImgTrans/Sobel_Demo.cpp @@ -61,5 +61,3 @@ int main( int, char** argv ) return 0; } - - diff --git a/samples/cpp/tutorial_code/ImgTrans/copyMakeBorder_demo.cpp b/samples/cpp/tutorial_code/ImgTrans/copyMakeBorder_demo.cpp index a4b8bad4dd..0d84e738c5 100644 --- a/samples/cpp/tutorial_code/ImgTrans/copyMakeBorder_demo.cpp +++ b/samples/cpp/tutorial_code/ImgTrans/copyMakeBorder_demo.cpp @@ -71,5 +71,3 @@ int main( int, char** argv ) return 0; } - - diff --git a/samples/cpp/tutorial_code/ShapeDescriptors/moments_demo.cpp b/samples/cpp/tutorial_code/ShapeDescriptors/moments_demo.cpp index efd3c63d9e..941edccd21 100644 --- a/samples/cpp/tutorial_code/ShapeDescriptors/moments_demo.cpp +++ b/samples/cpp/tutorial_code/ShapeDescriptors/moments_demo.cpp @@ -92,4 +92,3 @@ void thresh_callback(int, void* ) circle( drawing, mc[i], 4, color, -1, 8, 0 ); } } - diff --git a/samples/cpp/tutorial_code/ShapeDescriptors/pointPolygonTest_demo.cpp b/samples/cpp/tutorial_code/ShapeDescriptors/pointPolygonTest_demo.cpp index c15bc22c6f..25195d3e49 100644 --- a/samples/cpp/tutorial_code/ShapeDescriptors/pointPolygonTest_demo.cpp +++ b/samples/cpp/tutorial_code/ShapeDescriptors/pointPolygonTest_demo.cpp @@ -79,5 +79,3 @@ int main( void ) waitKey(0); return(0); } - - diff --git a/samples/cpp/tutorial_code/TrackingMotion/cornerDetector_Demo.cpp b/samples/cpp/tutorial_code/TrackingMotion/cornerDetector_Demo.cpp index b4789e3345..5a37da4d4b 100644 --- a/samples/cpp/tutorial_code/TrackingMotion/cornerDetector_Demo.cpp +++ b/samples/cpp/tutorial_code/TrackingMotion/cornerDetector_Demo.cpp @@ -120,4 +120,3 @@ void myHarris_function( int, void* ) } imshow( myHarris_window, myHarris_copy ); } - diff --git a/samples/cpp/tutorial_code/TrackingMotion/cornerSubPix_Demo.cpp b/samples/cpp/tutorial_code/TrackingMotion/cornerSubPix_Demo.cpp index 3b538119e8..45da0f9559 100644 --- a/samples/cpp/tutorial_code/TrackingMotion/cornerSubPix_Demo.cpp +++ b/samples/cpp/tutorial_code/TrackingMotion/cornerSubPix_Demo.cpp @@ -102,4 +102,3 @@ void goodFeaturesToTrack_Demo( int, void* ) for( size_t i = 0; i < corners.size(); i++ ) { cout<<" -- Refined Corner ["< - \ No newline at end of file + diff --git a/samples/winrt/ImageManipulations/MediaExtensions/Common/BufferLock.h b/samples/winrt/ImageManipulations/MediaExtensions/Common/BufferLock.h index 92de15eacc..1c47deabd0 100644 --- a/samples/winrt/ImageManipulations/MediaExtensions/Common/BufferLock.h +++ b/samples/winrt/ImageManipulations/MediaExtensions/Common/BufferLock.h @@ -99,4 +99,3 @@ private: IMFMediaBuffer *m_pBuffer; IMF2DBuffer *m_p2DBuffer; }; - diff --git a/samples/winrt/ImageManipulations/MediaExtensions/Common/OpQueue.h b/samples/winrt/ImageManipulations/MediaExtensions/Common/OpQueue.h index dd0813be30..73f3042ce3 100644 --- a/samples/winrt/ImageManipulations/MediaExtensions/Common/OpQueue.h +++ b/samples/winrt/ImageManipulations/MediaExtensions/Common/OpQueue.h @@ -219,4 +219,4 @@ HRESULT OpQueue::ProcessQueueAsync(IMFAsyncResult *pResult) return hr; } -#pragma warning( pop ) \ No newline at end of file +#pragma warning( pop ) diff --git a/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvImageManipulations.idl b/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvImageManipulations.idl index 8e33c4af4c..83bddfc497 100644 --- a/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvImageManipulations.idl +++ b/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvImageManipulations.idl @@ -8,4 +8,4 @@ namespace OcvTransform runtimeclass OcvImageManipulations { } -} \ No newline at end of file +} diff --git a/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.cpp b/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.cpp index c96c0423db..798649dbbe 100644 --- a/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.cpp +++ b/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.cpp @@ -1483,4 +1483,3 @@ HRESULT GetDefaultStride(IMFMediaType *pType, LONG *plStride) } return hr; } - diff --git a/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.def b/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.def index 0b801908c5..453349adf5 100644 --- a/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.def +++ b/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.def @@ -1,4 +1,4 @@ EXPORTS DllCanUnloadNow PRIVATE DllGetActivationFactory PRIVATE - DllGetClassObject PRIVATE \ No newline at end of file + DllGetClassObject PRIVATE diff --git a/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.h b/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.h index 118f6e432b..9162593fc0 100644 --- a/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.h +++ b/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.h @@ -244,4 +244,4 @@ private: IMFAttributes *m_pAttributes; }; -#endif \ No newline at end of file +#endif diff --git a/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.vcxproj b/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.vcxproj index fbe768cc93..54c0ce40ab 100644 --- a/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.vcxproj +++ b/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.vcxproj @@ -316,4 +316,4 @@ - \ No newline at end of file + diff --git a/samples/winrt/ImageManipulations/Package.appxmanifest b/samples/winrt/ImageManipulations/Package.appxmanifest index 9d63dea7cc..b66e01465e 100644 --- a/samples/winrt/ImageManipulations/Package.appxmanifest +++ b/samples/winrt/ImageManipulations/Package.appxmanifest @@ -33,4 +33,4 @@ - \ No newline at end of file +