Skip to content

Commit e9a28f6

Browse files
author
Roman Donchenko
committed
Normalized file endings.
1 parent f55740d commit e9a28f6

File tree

486 files changed

+166
-606
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

486 files changed

+166
-606
lines changed

3rdparty/ffmpeg/ffmpeg_version.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ set(HAVE_GENTOO_FFMPEG 1)
77
set(ALIASOF_libavcodec_VERSION 53.61.100)
88
set(ALIASOF_libavformat_VERSION 53.32.100)
99
set(ALIASOF_libavutil_VERSION 51.35.100)
10-
set(ALIASOF_libswscale_VERSION 2.1.100)
10+
set(ALIASOF_libswscale_VERSION 2.1.100)

3rdparty/ffmpeg/make.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
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
2-
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
2+
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

3rdparty/ffmpeg/readme.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,3 @@ How to update opencv_ffmpeg.dll and opencv_ffmpeg_64.dll when a new version of F
4040

4141
8. Then, go to <opencv>\3rdparty\ffmpeg, edit make.bat
4242
(change paths to the actual paths to your msys32 and msys64 distributions) and then run make.bat
43-
44-

3rdparty/libjasper/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,3 @@ endif()
4848
if(NOT BUILD_SHARED_LIBS)
4949
install(TARGETS ${JASPER_LIBRARY} ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT main)
5050
endif()
51-

3rdparty/libtiff/tif_config.h.cmakein

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,4 +168,3 @@
168168

169169
/* Support Deflate compression */
170170
#define ZIP_SUPPORT 1
171-

3rdparty/tbb/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
tbb*.tgz
1+
tbb*.tgz

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -891,4 +891,3 @@ ocv_finalize_status()
891891
if("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
892892
message(WARNING "The source directory is the same as binary directory. \"make clean\" may damage the source tree")
893893
endif()
894-

apps/haartraining/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,3 @@ if(ENABLE_SOLUTION_FOLDERS)
7979
set_target_properties(opencv_haartraining PROPERTIES FOLDER "applications")
8080
set_target_properties(opencv_haartraining_engine PROPERTIES FOLDER "applications")
8181
endif()
82-

apps/haartraining/_cvcommon.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,3 @@ int icvGetIdxAt( CvMat* idx, int pos )
100100
void icvSave( const CvArr* ptr, const char* filename, int line );
101101

102102
#endif /* __CVCOMMON_H_ */
103-

apps/haartraining/performance.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,4 +376,3 @@ int main( int argc, char* argv[] )
376376

377377
return 0;
378378
}
379-

apps/traincascade/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,3 @@ if(ENABLE_SOLUTION_FOLDERS)
3434
endif()
3535

3636
install(TARGETS ${the_target} RUNTIME DESTINATION bin COMPONENT main)
37-

cmake/OpenCVCRTLinkage.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,4 +98,3 @@ if(NOT BUILD_WITH_DEBUG_INFO AND NOT MSVC)
9898
string(REPLACE "/Zi" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
9999
string(REPLACE "/Zi" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
100100
endif()
101-

cmake/OpenCVCompilerOptions.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,4 +294,4 @@ if(MSVC)
294294
if(NOT ENABLE_NOISY_WARNINGS)
295295
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251") #class 'std::XXX' needs to have dll-interface to be used by clients of YYY
296296
endif()
297-
endif()
297+
endif()

cmake/OpenCVConfig.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,4 +156,3 @@ else()
156156
set(OpenCV_FOUND FALSE CACHE BOOL "" FORCE)
157157
set(OPENCV_FOUND FALSE CACHE BOOL "" FORCE)
158158
endif()
159-

cmake/OpenCVFindIPP.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,4 +346,4 @@ if(WIN32 AND MINGW AND NOT IPP_LATEST_VERSION_MAJOR LESS 7)
346346
# See http://code.opencv.org/issues/1906 for additional details
347347
set(MSV_NTDLL "ntdll")
348348
set(IPP_LIBRARIES ${IPP_LIBRARIES} ${MSV_NTDLL}${IPP_LIB_SUFFIX})
349-
endif()
349+
endif()

cmake/OpenCVFindXimea.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ endif()
4343

4444
mark_as_advanced(FORCE XIMEA_FOUND)
4545
mark_as_advanced(FORCE XIMEA_PATH)
46-
mark_as_advanced(FORCE XIMEA_LIBRARY_DIR)
46+
mark_as_advanced(FORCE XIMEA_LIBRARY_DIR)

cmake/OpenCVLegacyOptions.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,3 @@ if(DEFINED OPENCV_BUILD_3RDPARTY_LIBS)
2222
set(BUILD_PNG ${OPENCV_BUILD_3RDPARTY_LIBS} CACHE BOOL "Set via depricated OPENCV_BUILD_3RDPARTY_LIBS" FORCE)
2323
unset(OPENCV_BUILD_3RDPARTY_LIBS CACHE)
2424
endif()
25-

cmake/OpenCVUtils.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,4 +515,4 @@ function(ocv_source_group group)
515515
cmake_parse_arguments(OCV_SOURCE_GROUP "" "" "GLOB" ${ARGN})
516516
file(GLOB srcs ${OCV_SOURCE_GROUP_GLOB})
517517
source_group(${group} FILES ${srcs})
518-
endfunction()
518+
endfunction()

cmake/checks/OpenCVDetectCudaArch.cu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ int main()
1111
printf("%d.%d ", prop.major, prop.minor);
1212
}
1313
return 0;
14-
}
14+
}

cmake/checks/vfwtest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ int main()
77
AVIFileInit();
88
AVIFileExit();
99
return 0;
10-
}
10+
}

cmake/checks/winrttest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
int main(int, char**)
44
{
55
return 0;
6-
}
6+
}

cmake/cl2cpp.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ foreach(cl ${cl_list})
3232
file(APPEND ${OUTPUT} "const char* ${cl_filename}=\"${lines};\n")
3333
endforeach()
3434

35-
file(APPEND ${OUTPUT} "}\n}\n")
35+
file(APPEND ${OUTPUT} "}\n}\n")

cmake/templates/cmake_uninstall.cmake.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,3 @@ FOREACH(file ${files})
2323
MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
2424
ENDIF(EXISTS "$ENV{DESTDIR}${file}")
2525
ENDFOREACH(file)
26-
27-

cmake/templates/cvconfig.h.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,4 +163,3 @@
163163
/* Define to 1 if your processor stores words with the most significant byte
164164
first (like Motorola and SPARC, unlike Intel and VAX). */
165165
#cmakedefine WORDS_BIGENDIAN
166-

cmake/templates/opencv_modules.hpp.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
*
77
*/
88

9-
@OPENCV_MODULE_DEFINITIONS_CONFIGMAKE@
9+
@OPENCV_MODULE_DEFINITIONS_CONFIGMAKE@

doc/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,4 @@ if(BUILD_DOCS AND HAVE_SPHINX)
122122
install(FILES "${f}" DESTINATION "${OPENCV_DOC_INSTALL_PATH}" OPTIONAL)
123123
endforeach()
124124

125-
endif()
125+
endif()

doc/_static/insertIframe.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,3 @@ function insertIframe (elementId, iframeSrc)
1010
element.parentNode.replaceChild(iframe, element);
1111
}
1212
}
13-

doc/_themes/blue/static/default.css_t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,4 +402,4 @@ div.sphinxsidebar #searchbox input[type="text"] {
402402

403403
div.sphinxsidebar #searchbox input[type="submit"] {
404404
width:auto;
405-
}
405+
}

doc/_themes/blue/theme.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ feedbacklinkcolor = #ffffff
2828
bodyfont = sans-serif
2929
headfont = 'Trebuchet MS', sans-serif
3030
guifont = "Lucida Sans","Lucida Sans Unicode","Lucida Grande",Verdana,Arial,Helvetica,sans-serif
31-
lang = none
31+
lang = none

doc/check_docs.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,5 +184,3 @@ def check_module_docs(self, name):
184184
for m in opencv_module_list:
185185
print "\n\n*************************** " + m + " *************************\n"
186186
p.check_module_docs(m)
187-
188-

doc/mymath.sty

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,3 @@
3939
#7 & #8 & #9
4040
\end{bmatrix}
4141
}
42-

doc/pattern_tools/svgfig.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3667,4 +3667,3 @@ def SVG(self, trans=None):
36673667
output.append(LineAxis(x, start, x, end, start, end, bars, False, False, **self.attr).SVG(trans))
36683668

36693669
return output
3670-

doc/tutorials/calib3d/camera_calibration_square_chess/camera_calibration_square_chess.rst

Lines changed: 1 addition & 1 deletion

doc/tutorials/core/file_input_output_with_xml_yml/file_input_output_with_xml_yml.rst

Lines changed: 0 additions & 1 deletion

doc/tutorials/core/interoperability_with_OpenCV_1/interoperability_with_OpenCV_1.rst

Lines changed: 0 additions & 3 deletions

doc/tutorials/core/table_of_content_core/table_of_content_core.rst

Lines changed: 1 addition & 1 deletion

doc/tutorials/definitions/README.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Include in this directory only defintion files. None of the reST files entered here will be parsed by the Sphinx Builder.
1+
Include in this directory only defintion files. None of the reST files entered here will be parsed by the Sphinx Builder.
Lines changed: 1 addition & 1 deletion

doc/tutorials/features2d/feature_description/feature_description.rst

Lines changed: 0 additions & 3 deletions

doc/tutorials/features2d/feature_detection/feature_detection.rst

Lines changed: 0 additions & 1 deletion

doc/tutorials/features2d/feature_homography/feature_homography.rst

Lines changed: 0 additions & 1 deletion

doc/tutorials/features2d/table_of_content_features2d/table_of_content_features2d.rst

Lines changed: 0 additions & 1 deletion

doc/tutorials/features2d/trackingmotion/corner_subpixeles/corner_subpixeles.rst

Lines changed: 0 additions & 1 deletion

doc/tutorials/features2d/trackingmotion/generic_corner_detector/generic_corner_detector.rst

Lines changed: 0 additions & 1 deletion

doc/tutorials/features2d/trackingmotion/good_features_to_track/good_features_to_track.rst

Lines changed: 0 additions & 2 deletions

doc/tutorials/features2d/trackingmotion/harris_detector/harris_detector.rst

Lines changed: 0 additions & 2 deletions

doc/tutorials/general/table_of_content_general/table_of_content_general.rst

Lines changed: 0 additions & 1 deletion

doc/tutorials/highgui/table_of_content_highgui/table_of_content_highgui.rst

Lines changed: 1 addition & 1 deletion

doc/tutorials/highgui/trackbar/trackbar.rst

Lines changed: 0 additions & 5 deletions

doc/tutorials/imgproc/histograms/histogram_calculation/histogram_calculation.rst

Lines changed: 0 additions & 1 deletion

doc/tutorials/imgproc/histograms/template_matching/template_matching.rst

Lines changed: 0 additions & 1 deletion

doc/tutorials/imgproc/imgtrans/canny_detector/canny_detector.rst

Lines changed: 0 additions & 3 deletions

doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.rst

Lines changed: 0 additions & 1 deletion

doc/tutorials/imgproc/imgtrans/remap/remap.rst

Lines changed: 0 additions & 1 deletion

doc/tutorials/imgproc/imgtrans/warp_affine/warp_affine.rst

Lines changed: 0 additions & 1 deletion

doc/tutorials/imgproc/opening_closing_hats/opening_closing_hats.rst

Lines changed: 0 additions & 1 deletion

doc/tutorials/imgproc/pyramids/pyramids.rst

Lines changed: 0 additions & 2 deletions

doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/bounding_rects_circles.rst

Lines changed: 0 additions & 1 deletion

doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/bounding_rotated_ellipses.rst

Lines changed: 0 additions & 1 deletion

doc/tutorials/imgproc/shapedescriptors/find_contours/find_contours.rst

Lines changed: 0 additions & 1 deletion

doc/tutorials/imgproc/shapedescriptors/hull/hull.rst

Lines changed: 0 additions & 1 deletion

doc/tutorials/imgproc/shapedescriptors/moments/moments.rst

Lines changed: 0 additions & 1 deletion

doc/tutorials/imgproc/shapedescriptors/point_polygon_test/point_polygon_test.rst

Lines changed: 0 additions & 1 deletion

doc/tutorials/imgproc/table_of_content_imgproc/table_of_content_imgproc.rst

Lines changed: 0 additions & 3 deletions

doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst

Lines changed: 1 addition & 1 deletion

doc/tutorials/introduction/linux_eclipse/linux_eclipse.rst

Lines changed: 0 additions & 3 deletions

doc/tutorials/introduction/linux_install/linux_install.rst

Lines changed: 0 additions & 1 deletion

doc/tutorials/ios/hello/hello.rst

Lines changed: 0 additions & 1 deletion

doc/tutorials/ios/image_manipulation/image_manipulation.rst

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)