Skip to content

Commit

Permalink
Normalized file endings.
Browse files Browse the repository at this point in the history
  • Loading branch information
Roman Donchenko committed Aug 21, 2013
1 parent f55740d commit e9a28f6
Show file tree
Hide file tree
Showing 486 changed files with 166 additions and 606 deletions.
2 changes: 1 addition & 1 deletion 3rdparty/ffmpeg/ffmpeg_version.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ set(HAVE_GENTOO_FFMPEG 1)
set(ALIASOF_libavcodec_VERSION 53.61.100)
set(ALIASOF_libavformat_VERSION 53.32.100)
set(ALIASOF_libavutil_VERSION 51.35.100)
set(ALIASOF_libswscale_VERSION 2.1.100)
set(ALIASOF_libswscale_VERSION 2.1.100)
2 changes: 1 addition & 1 deletion 3rdparty/ffmpeg/make.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
set path=c:\dev\msys32\bin;%path% & gcc -Wall -shared -o opencv_ffmpeg.dll -O2 -x c++ -I../include -I../include/ffmpeg_ -I../../modules/highgui/src ffopencv.c -L../lib -lavformat -lavcodec -lavdevice -lswscale -lavutil -lwsock32
set path=c:\dev\msys64\bin;%path% & gcc -m64 -Wall -shared -o opencv_ffmpeg_64.dll -O2 -x c++ -I../include -I../include/ffmpeg_ -I../../modules/highgui/src ffopencv.c -L../lib -lavformat64 -lavcodec64 -lavdevice64 -lswscale64 -lavutil64 -lavcore64 -lwsock32 -lws2_32
set path=c:\dev\msys64\bin;%path% & gcc -m64 -Wall -shared -o opencv_ffmpeg_64.dll -O2 -x c++ -I../include -I../include/ffmpeg_ -I../../modules/highgui/src ffopencv.c -L../lib -lavformat64 -lavcodec64 -lavdevice64 -lswscale64 -lavutil64 -lavcore64 -lwsock32 -lws2_32
2 changes: 0 additions & 2 deletions 3rdparty/ffmpeg/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,3 @@ How to update opencv_ffmpeg.dll and opencv_ffmpeg_64.dll when a new version of F

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


1 change: 0 additions & 1 deletion 3rdparty/libjasper/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,3 @@ endif()
if(NOT BUILD_SHARED_LIBS)
install(TARGETS ${JASPER_LIBRARY} ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT main)
endif()

1 change: 0 additions & 1 deletion 3rdparty/libtiff/tif_config.h.cmakein
Original file line number Diff line number Diff line change
Expand Up @@ -168,4 +168,3 @@

/* Support Deflate compression */
#define ZIP_SUPPORT 1

2 changes: 1 addition & 1 deletion 3rdparty/tbb/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
tbb*.tgz
tbb*.tgz
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

1 change: 0 additions & 1 deletion apps/haartraining/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

1 change: 0 additions & 1 deletion apps/haartraining/_cvcommon.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,3 @@ int icvGetIdxAt( CvMat* idx, int pos )
void icvSave( const CvArr* ptr, const char* filename, int line );

#endif /* __CVCOMMON_H_ */

1 change: 0 additions & 1 deletion apps/haartraining/performance.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -376,4 +376,3 @@ int main( int argc, char* argv[] )

return 0;
}

1 change: 0 additions & 1 deletion apps/traincascade/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,3 @@ if(ENABLE_SOLUTION_FOLDERS)
endif()

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

1 change: 0 additions & 1 deletion cmake/OpenCVCRTLinkage.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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()

2 changes: 1 addition & 1 deletion cmake/OpenCVCompilerOptions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -294,4 +294,4 @@ if(MSVC)
if(NOT ENABLE_NOISY_WARNINGS)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251") #class 'std::XXX' needs to have dll-interface to be used by clients of YYY
endif()
endif()
endif()
1 change: 0 additions & 1 deletion cmake/OpenCVConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -156,4 +156,3 @@ else()
set(OpenCV_FOUND FALSE CACHE BOOL "" FORCE)
set(OPENCV_FOUND FALSE CACHE BOOL "" FORCE)
endif()

2 changes: 1 addition & 1 deletion cmake/OpenCVFindIPP.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -346,4 +346,4 @@ if(WIN32 AND MINGW AND NOT IPP_LATEST_VERSION_MAJOR LESS 7)
# See http://code.opencv.org/issues/1906 for additional details
set(MSV_NTDLL "ntdll")
set(IPP_LIBRARIES ${IPP_LIBRARIES} ${MSV_NTDLL}${IPP_LIB_SUFFIX})
endif()
endif()
2 changes: 1 addition & 1 deletion cmake/OpenCVFindXimea.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ endif()

mark_as_advanced(FORCE XIMEA_FOUND)
mark_as_advanced(FORCE XIMEA_PATH)
mark_as_advanced(FORCE XIMEA_LIBRARY_DIR)
mark_as_advanced(FORCE XIMEA_LIBRARY_DIR)
1 change: 0 additions & 1 deletion cmake/OpenCVLegacyOptions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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()

2 changes: 1 addition & 1 deletion cmake/OpenCVUtils.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -515,4 +515,4 @@ function(ocv_source_group group)
cmake_parse_arguments(OCV_SOURCE_GROUP "" "" "GLOB" ${ARGN})
file(GLOB srcs ${OCV_SOURCE_GROUP_GLOB})
source_group(${group} FILES ${srcs})
endfunction()
endfunction()
2 changes: 1 addition & 1 deletion cmake/checks/OpenCVDetectCudaArch.cu
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ int main()
printf("%d.%d ", prop.major, prop.minor);
}
return 0;
}
}
2 changes: 1 addition & 1 deletion cmake/checks/vfwtest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ int main()
AVIFileInit();
AVIFileExit();
return 0;
}
}
2 changes: 1 addition & 1 deletion cmake/checks/winrttest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
int main(int, char**)
{
return 0;
}
}
2 changes: 1 addition & 1 deletion cmake/cl2cpp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ foreach(cl ${cl_list})
file(APPEND ${OUTPUT} "const char* ${cl_filename}=\"${lines};\n")
endforeach()

file(APPEND ${OUTPUT} "}\n}\n")
file(APPEND ${OUTPUT} "}\n}\n")
2 changes: 0 additions & 2 deletions cmake/templates/cmake_uninstall.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,3 @@ FOREACH(file ${files})
MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
ENDIF(EXISTS "$ENV{DESTDIR}${file}")
ENDFOREACH(file)


1 change: 0 additions & 1 deletion cmake/templates/cvconfig.h.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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

2 changes: 1 addition & 1 deletion cmake/templates/opencv_modules.hpp.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
*
*/

@OPENCV_MODULE_DEFINITIONS_CONFIGMAKE@
@OPENCV_MODULE_DEFINITIONS_CONFIGMAKE@
2 changes: 1 addition & 1 deletion doc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,4 @@ if(BUILD_DOCS AND HAVE_SPHINX)
install(FILES "${f}" DESTINATION "${OPENCV_DOC_INSTALL_PATH}" OPTIONAL)
endforeach()

endif()
endif()
1 change: 0 additions & 1 deletion doc/_static/insertIframe.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,3 @@ function insertIframe (elementId, iframeSrc)
element.parentNode.replaceChild(iframe, element);
}
}

2 changes: 1 addition & 1 deletion doc/_themes/blue/static/default.css_t
Original file line number Diff line number Diff line change
Expand Up @@ -402,4 +402,4 @@ div.sphinxsidebar #searchbox input[type="text"] {

div.sphinxsidebar #searchbox input[type="submit"] {
width:auto;
}
}
2 changes: 1 addition & 1 deletion doc/_themes/blue/theme.conf
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ feedbacklinkcolor = #ffffff
bodyfont = sans-serif
headfont = 'Trebuchet MS', sans-serif
guifont = "Lucida Sans","Lucida Sans Unicode","Lucida Grande",Verdana,Arial,Helvetica,sans-serif
lang = none
lang = none
2 changes: 0 additions & 2 deletions doc/check_docs.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,5 +184,3 @@ def check_module_docs(self, name):
for m in opencv_module_list:
print "\n\n*************************** " + m + " *************************\n"
p.check_module_docs(m)


1 change: 0 additions & 1 deletion doc/mymath.sty
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,3 @@
#7 & #8 & #9
\end{bmatrix}
}

1 change: 0 additions & 1 deletion doc/pattern_tools/svgfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -3667,4 +3667,3 @@ def SVG(self, trans=None):
output.append(LineAxis(x, start, x, end, start, end, bars, False, False, **self.attr).SVG(trans))

return output

Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@ Now, let us write a code that detects a chessboard in a new image and finds its
#.
Calculate reprojection error like it is done in ``calibration`` sample (see ``opencv/samples/cpp/calibration.cpp``, function ``computeReprojectionErrors``).

Question: how to calculate the distance from the camera origin to any of the corners?
Question: how to calculate the distance from the camera origin to any of the corners?
Original file line number Diff line number Diff line change
Expand Up @@ -277,4 +277,3 @@ You may observe a runtime instance of this on the `YouTube here <https://www.you
<div align="center">
<iframe title="File Input and Output using XML and YAML files in OpenCV" width="560" height="349" src="http://www.youtube.com/embed/A4yqVnByMMM?rel=0&loop=1" frameborder="0" allowfullscreen align="middle"></iframe>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,3 @@ You may observe a runtime instance of this on the `YouTube here <https://www.you
<div align="center">
<iframe title="Interoperability with OpenCV 1" width="560" height="349" src="http://www.youtube.com/embed/qckm-zvo31w?rel=0&loop=1" frameborder="0" allowfullscreen align="middle"></iframe>
</div>



Original file line number Diff line number Diff line change
Expand Up @@ -218,4 +218,4 @@ Here you will learn the about the basic building blocks of the library. A must r
../random_generator_and_text/random_generator_and_text
../discrete_fourier_transform/discrete_fourier_transform
../file_input_output_with_xml_yml/file_input_output_with_xml_yml
../interoperability_with_OpenCV_1/interoperability_with_OpenCV_1
../interoperability_with_OpenCV_1/interoperability_with_OpenCV_1
2 changes: 1 addition & 1 deletion doc/tutorials/definitions/README.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Include in this directory only defintion files. None of the reST files entered here will be parsed by the Sphinx Builder.
Include in this directory only defintion files. None of the reST files entered here will be parsed by the Sphinx Builder.
2 changes: 1 addition & 1 deletion doc/tutorials/definitions/noContent.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

.. note::
Unfortunetly we have no tutorials into this section. And you can help us with that, since OpenCV is a community effort. If you have a tutorial suggestion or you have written a tutorial yourself (or coded a sample code) that you would like to see here, please contact follow these instructions: :ref:`howToWriteTutorial` and :how_to_contribute:`How to contribute <>`.
Unfortunetly we have no tutorials into this section. And you can help us with that, since OpenCV is a community effort. If you have a tutorial suggestion or you have written a tutorial yourself (or coded a sample code) that you would like to see here, please contact follow these instructions: :ref:`howToWriteTutorial` and :how_to_contribute:`How to contribute <>`.
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,3 @@ Result
.. image:: images/Feature_Description_BruteForce_Result.jpg
:align: center
:height: 200pt



Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,3 @@ Result
.. image:: images/Feature_Detection_Result_b.jpg
:align: center
:height: 200pt

Original file line number Diff line number Diff line change
Expand Up @@ -146,4 +146,3 @@ Result
.. image:: images/Feature_Homography_Result.jpg
:align: center
:height: 200pt

Original file line number Diff line number Diff line change
Expand Up @@ -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

Original file line number Diff line number Diff line change
Expand Up @@ -135,4 +135,3 @@ Here is the result:

.. image:: images/Corner_Subpixeles_Result.jpg
:align: center

Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,3 @@ Result

.. image:: images/My_Shi_Tomasi_corner_detector_Result.jpg
:align: center

Original file line number Diff line number Diff line change
Expand Up @@ -118,5 +118,3 @@ Result

.. image:: images/Feature_Detection_Result_a.jpg
:align: center


Original file line number Diff line number Diff line change
Expand Up @@ -243,5 +243,3 @@ The detected corners are surrounded by a small black circle

.. image:: images/Harris_Detector_Result.jpg
:align: center


Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,3 @@ These tutorials are the bottom of the iceberg as they link together multiple of
.. raw:: latex

\pagebreak

Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@ This section contains valuable tutorials about how to read/save your image/video

../trackbar/trackbar
../video-input-psnr-ssim/video-input-psnr-ssim
../video-write/video-write
../video-write/video-write
5 changes: 0 additions & 5 deletions doc/tutorials/highgui/trackbar/trackbar.rst
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,3 @@ Result
.. image:: images/Adding_Trackbars_Tutorial_Result_1.jpg
:alt: Adding Trackbars - Lena
:align: center





Original file line number Diff line number Diff line change
Expand Up @@ -329,4 +329,3 @@ Result

.. image:: images/Histogram_Calculation_Result.jpg
:align: center

Original file line number Diff line number Diff line change
Expand Up @@ -369,4 +369,3 @@ Results

.. image:: images/Template_Matching_Image_Result.jpg
:align: center

Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,3 @@ Result
:align: center

* Notice how the image is superposed to the black background on the edge regions.



1 change: 0 additions & 1 deletion doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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).

1 change: 0 additions & 1 deletion doc/tutorials/imgproc/imgtrans/remap/remap.rst
Original file line number Diff line number Diff line change
Expand Up @@ -311,4 +311,3 @@ Result
:alt: Result 0 for remapping
:width: 250pt
:align: center

1 change: 0 additions & 1 deletion doc/tutorials/imgproc/imgtrans/warp_affine/warp_affine.rst
Original file line number Diff line number Diff line change
Expand Up @@ -306,4 +306,3 @@ Result
:alt: Original image
:width: 250pt
:align: center

Original file line number Diff line number Diff line change
Expand Up @@ -279,4 +279,3 @@ Results
.. image:: images/Morphology_2_Tutorial_Cover.jpg
:alt: Morphology 2: Result sample
:align: center

2 changes: 0 additions & 2 deletions doc/tutorials/imgproc/pyramids/pyramids.rst
Original file line number Diff line number Diff line change
Expand Up @@ -259,5 +259,3 @@ Results
.. image:: images/Pyramids_Tutorial_PyrUp_Result.jpg
:alt: Pyramids: PyrUp Result
:align: center


Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,3 @@ Result

.. |BRC_1| image:: images/Bounding_Rects_Circles_Result.jpg
:align: middle

Original file line number Diff line number Diff line change
Expand Up @@ -123,4 +123,3 @@ Result

.. |BRE_1| image:: images/Bounding_Rotated_Ellipses_Result.jpg
:align: middle

Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,3 @@ Result

.. |contour_1| image:: images/Find_Contours_Result.jpg
:align: middle

1 change: 0 additions & 1 deletion doc/tutorials/imgproc/shapedescriptors/hull/hull.rst
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,3 @@ Result

.. |Hull_1| image:: images/Hull_Result.jpg
:align: middle

1 change: 0 additions & 1 deletion doc/tutorials/imgproc/shapedescriptors/moments/moments.rst
Original file line number Diff line number Diff line change
Expand Up @@ -133,4 +133,3 @@ Result
.. |MU_2| image:: images/Moments_Result2.jpg
:width: 250pt
:align: middle

Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,3 @@ Result

.. |PPT_1| image:: images/Point_Polygon_Test_Result.jpg
:align: middle

Original file line number Diff line number Diff line change
Expand Up @@ -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



Original file line number Diff line number Diff line change
Expand Up @@ -384,4 +384,4 @@ upcoming issues. During this it may take a little longer to see your work online
however if you submitted it, be sure that eventually it will show up.

If you have any questions or advices relating to this tutorial you can contact us at
-delete-admin@-delete-opencv.org (delete the -delete- parts of that email address).
-delete-admin@-delete-opencv.org (delete the -delete- parts of that email address).
3 changes: 0 additions & 3 deletions doc/tutorials/introduction/linux_eclipse/linux_eclipse.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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!



1 change: 0 additions & 1 deletion doc/tutorials/introduction/linux_install/linux_install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

1 change: 0 additions & 1 deletion doc/tutorials/ios/hello/hello.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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

Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,4 @@ Check out an instance of running code with more Image Effects on `YouTube <http:

<div align="center">
<iframe width="560" height="350" src="http://www.youtube.com/embed/Ko3K_xdhJ1I" frameborder="0" allowfullscreen></iframe>
</div>
</div>
Loading

0 comments on commit e9a28f6

Please sign in to comment.