diff --git a/doc/tutorials/core/interoperability_with_OpenCV_1/interoperability_with_OpenCV_1.markdown b/doc/tutorials/core/interoperability_with_OpenCV_1/interoperability_with_OpenCV_1.markdown index bb445179d0..42fdb3483e 100644 --- a/doc/tutorials/core/interoperability_with_OpenCV_1/interoperability_with_OpenCV_1.markdown +++ b/doc/tutorials/core/interoperability_with_OpenCV_1/interoperability_with_OpenCV_1.markdown @@ -46,7 +46,7 @@ and the subsequent words start with a capital letter (like *copyMakeBorder*). Now, remember that you need to link to your application all the modules you use, and in case you are on Windows using the *DLL* system you will need to add, again, to the path all the binaries. For -more in-depth information if you're on Windows read @ref tutorial_windows_visual_studio_Opencv and for +more in-depth information if you're on Windows read @ref tutorial_windows_visual_studio_opencv and for Linux an example usage is explained in @ref tutorial_linux_eclipse. Now for converting the *Mat* object you can use either the *IplImage* or the *CvMat* operators. diff --git a/doc/tutorials/introduction/table_of_content_introduction.markdown b/doc/tutorials/introduction/table_of_content_introduction.markdown index ebd2793039..9e64d47597 100644 --- a/doc/tutorials/introduction/table_of_content_introduction.markdown +++ b/doc/tutorials/introduction/table_of_content_introduction.markdown @@ -36,7 +36,7 @@ Additionally you can find very basic sample source code to introduce you to the You will learn how to setup OpenCV in your Windows Operating System! -- @subpage tutorial_windows_visual_studio_Opencv +- @subpage tutorial_windows_visual_studio_opencv _Compatibility:_ \> OpenCV 2.0 diff --git a/doc/tutorials/introduction/windows_install/windows_install.markdown b/doc/tutorials/introduction/windows_install/windows_install.markdown index d703311642..d12c4ee12a 100644 --- a/doc/tutorials/introduction/windows_install/windows_install.markdown +++ b/doc/tutorials/introduction/windows_install/windows_install.markdown @@ -401,6 +401,6 @@ Save it to the registry and you are done. If you ever change the location of you or want to try out your application with a different build, all you will need to do is to update the OPENCV_DIR variable via the *setx* command inside a command window. -Now you can continue reading the tutorials with the @ref tutorial_windows_visual_studio_Opencv section. +Now you can continue reading the tutorials with the @ref tutorial_windows_visual_studio_opencv section. There you will find out how to use the OpenCV library in your own projects with the help of the Microsoft Visual Studio IDE. diff --git a/doc/tutorials/introduction/windows_visual_studio_image_watch/windows_visual_studio_image_watch.markdown b/doc/tutorials/introduction/windows_visual_studio_image_watch/windows_visual_studio_image_watch.markdown index 93baedd281..6c957b3fd5 100644 --- a/doc/tutorials/introduction/windows_visual_studio_image_watch/windows_visual_studio_image_watch.markdown +++ b/doc/tutorials/introduction/windows_visual_studio_image_watch/windows_visual_studio_image_watch.markdown @@ -13,7 +13,7 @@ This tutorial assumes that you have the following available: -# Visual Studio 2012 Professional (or better) with Update 1 installed. Update 1 can be downloaded [here](http://www.microsoft.com/en-us/download/details.aspx?id=35774). -# An OpenCV installation on your Windows machine (Tutorial: @ref tutorial_windows_install). --# Ability to create and build OpenCV projects in Visual Studio (Tutorial: @ref tutorial_windows_visual_studio_Opencv). +-# Ability to create and build OpenCV projects in Visual Studio (Tutorial: @ref tutorial_windows_visual_studio_opencv). Installation ------------ diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/AddNewPropertySheet.jpg b/doc/tutorials/introduction/windows_visual_studio_opencv/images/AddNewPropertySheet.jpg similarity index 100% rename from doc/tutorials/introduction/windows_visual_studio_Opencv/images/AddNewPropertySheet.jpg rename to doc/tutorials/introduction/windows_visual_studio_opencv/images/AddNewPropertySheet.jpg diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/NewProjectVisualStudio.jpg b/doc/tutorials/introduction/windows_visual_studio_opencv/images/NewProjectVisualStudio.jpg similarity index 100% rename from doc/tutorials/introduction/windows_visual_studio_Opencv/images/NewProjectVisualStudio.jpg rename to doc/tutorials/introduction/windows_visual_studio_opencv/images/NewProjectVisualStudio.jpg diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/OpenCVEditEnviromentVisual.jpg b/doc/tutorials/introduction/windows_visual_studio_opencv/images/OpenCVEditEnviromentVisual.jpg similarity index 100% rename from doc/tutorials/introduction/windows_visual_studio_Opencv/images/OpenCVEditEnviromentVisual.jpg rename to doc/tutorials/introduction/windows_visual_studio_opencv/images/OpenCVEditEnviromentVisual.jpg diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/OpenCV_Install_Directory.jpg b/doc/tutorials/introduction/windows_visual_studio_opencv/images/OpenCV_Install_Directory.jpg similarity index 100% rename from doc/tutorials/introduction/windows_visual_studio_Opencv/images/OpenCV_Install_Directory.jpg rename to doc/tutorials/introduction/windows_visual_studio_opencv/images/OpenCV_Install_Directory.jpg diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertyPageAddExisting.jpg b/doc/tutorials/introduction/windows_visual_studio_opencv/images/PropertyPageAddExisting.jpg similarity index 100% rename from doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertyPageAddExisting.jpg rename to doc/tutorials/introduction/windows_visual_studio_opencv/images/PropertyPageAddExisting.jpg diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertyPageExample.jpg b/doc/tutorials/introduction/windows_visual_studio_opencv/images/PropertyPageExample.jpg similarity index 100% rename from doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertyPageExample.jpg rename to doc/tutorials/introduction/windows_visual_studio_opencv/images/PropertyPageExample.jpg diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetInsideFolder.jpg b/doc/tutorials/introduction/windows_visual_studio_opencv/images/PropertySheetInsideFolder.jpg similarity index 100% rename from doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetInsideFolder.jpg rename to doc/tutorials/introduction/windows_visual_studio_opencv/images/PropertySheetInsideFolder.jpg diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVInclude.jpg b/doc/tutorials/introduction/windows_visual_studio_opencv/images/PropertySheetOpenCVInclude.jpg similarity index 100% rename from doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVInclude.jpg rename to doc/tutorials/introduction/windows_visual_studio_opencv/images/PropertySheetOpenCVInclude.jpg diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVLib.jpg b/doc/tutorials/introduction/windows_visual_studio_opencv/images/PropertySheetOpenCVLib.jpg similarity index 100% rename from doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVLib.jpg rename to doc/tutorials/introduction/windows_visual_studio_opencv/images/PropertySheetOpenCVLib.jpg diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVLibrariesDebug.jpg b/doc/tutorials/introduction/windows_visual_studio_opencv/images/PropertySheetOpenCVLibrariesDebug.jpg similarity index 100% rename from doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVLibrariesDebug.jpg rename to doc/tutorials/introduction/windows_visual_studio_opencv/images/PropertySheetOpenCVLibrariesDebug.jpg diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVLibrariesDebugSmple.jpg b/doc/tutorials/introduction/windows_visual_studio_opencv/images/PropertySheetOpenCVLibrariesDebugSmple.jpg similarity index 100% rename from doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVLibrariesDebugSmple.jpg rename to doc/tutorials/introduction/windows_visual_studio_opencv/images/PropertySheetOpenCVLibrariesDebugSmple.jpg diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVLibrariesRelease.jpg b/doc/tutorials/introduction/windows_visual_studio_opencv/images/PropertySheetOpenCVLibrariesRelease.jpg similarity index 100% rename from doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetOpenCVLibrariesRelease.jpg rename to doc/tutorials/introduction/windows_visual_studio_opencv/images/PropertySheetOpenCVLibrariesRelease.jpg diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetVS2010.jpg b/doc/tutorials/introduction/windows_visual_studio_opencv/images/PropertySheetVS2010.jpg similarity index 100% rename from doc/tutorials/introduction/windows_visual_studio_Opencv/images/PropertySheetVS2010.jpg rename to doc/tutorials/introduction/windows_visual_studio_opencv/images/PropertySheetVS2010.jpg diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/SuccessVisualStudioWindows.jpg b/doc/tutorials/introduction/windows_visual_studio_opencv/images/SuccessVisualStudioWindows.jpg similarity index 100% rename from doc/tutorials/introduction/windows_visual_studio_Opencv/images/SuccessVisualStudioWindows.jpg rename to doc/tutorials/introduction/windows_visual_studio_opencv/images/SuccessVisualStudioWindows.jpg diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/VCDirectories2008.jpg b/doc/tutorials/introduction/windows_visual_studio_opencv/images/VCDirectories2008.jpg similarity index 100% rename from doc/tutorials/introduction/windows_visual_studio_Opencv/images/VCDirectories2008.jpg rename to doc/tutorials/introduction/windows_visual_studio_opencv/images/VCDirectories2008.jpg diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/VCDirectories2010.jpg b/doc/tutorials/introduction/windows_visual_studio_opencv/images/VCDirectories2010.jpg similarity index 100% rename from doc/tutorials/introduction/windows_visual_studio_Opencv/images/VCDirectories2010.jpg rename to doc/tutorials/introduction/windows_visual_studio_opencv/images/VCDirectories2010.jpg diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/images/VisualStudioCommandLineArguments.jpg b/doc/tutorials/introduction/windows_visual_studio_opencv/images/VisualStudioCommandLineArguments.jpg similarity index 100% rename from doc/tutorials/introduction/windows_visual_studio_Opencv/images/VisualStudioCommandLineArguments.jpg rename to doc/tutorials/introduction/windows_visual_studio_opencv/images/VisualStudioCommandLineArguments.jpg diff --git a/doc/tutorials/introduction/windows_visual_studio_Opencv/windows_visual_studio_Opencv.markdown b/doc/tutorials/introduction/windows_visual_studio_opencv/windows_visual_studio_opencv.markdown similarity index 98% rename from doc/tutorials/introduction/windows_visual_studio_Opencv/windows_visual_studio_Opencv.markdown rename to doc/tutorials/introduction/windows_visual_studio_opencv/windows_visual_studio_opencv.markdown index f2f319313a..e8ef112b02 100644 --- a/doc/tutorials/introduction/windows_visual_studio_Opencv/windows_visual_studio_Opencv.markdown +++ b/doc/tutorials/introduction/windows_visual_studio_opencv/windows_visual_studio_opencv.markdown @@ -1,4 +1,4 @@ -How to build applications with OpenCV inside the "Microsoft Visual Studio" {#tutorial_windows_visual_studio_Opencv} +How to build applications with OpenCV inside the "Microsoft Visual Studio" {#tutorial_windows_visual_studio_opencv} ========================================================================== Everything I describe here will apply to the `C\C++` interface of OpenCV. I start out from the @@ -194,11 +194,11 @@ Test it! -------- Now to try this out download our little test [source code -](https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/introduction_windows_vs.cpp) +](https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/introduction/windows_visual_studio_opencv/introduction_windows_vs.cpp) or get it from the sample code folder of the OpenCV sources. Add this to your project and build it. Here's its content: -@include cpp/tutorial_code/introduction/windows_visual_studio_Opencv/introduction_windows_vs.cpp +@include cpp/tutorial_code/introduction/windows_visual_studio_opencv/introduction_windows_vs.cpp You can start a Visual Studio build from two places. Either inside from the *IDE* (keyboard combination: Control-F5) or by navigating to your build directory and start the application with a diff --git a/modules/imgproc/perf/opencl/perf_houghLines.cpp b/modules/imgproc/perf/opencl/perf_houghlines.cpp similarity index 100% rename from modules/imgproc/perf/opencl/perf_houghLines.cpp rename to modules/imgproc/perf/opencl/perf_houghlines.cpp diff --git a/modules/imgproc/perf/perf_houghLines.cpp b/modules/imgproc/perf/perf_houghlines.cpp similarity index 100% rename from modules/imgproc/perf/perf_houghLines.cpp rename to modules/imgproc/perf/perf_houghlines.cpp diff --git a/modules/imgproc/test/ocl/test_sepfilter2D.cpp b/modules/imgproc/test/ocl/test_sepfilter2d.cpp similarity index 100% rename from modules/imgproc/test/ocl/test_sepfilter2D.cpp rename to modules/imgproc/test/ocl/test_sepfilter2d.cpp diff --git a/modules/imgproc/test/test_fitellipseAMS.cpp b/modules/imgproc/test/test_fitellipse_ams.cpp similarity index 100% rename from modules/imgproc/test/test_fitellipseAMS.cpp rename to modules/imgproc/test/test_fitellipse_ams.cpp diff --git a/modules/imgproc/test/test_fitellipseDirect.cpp b/modules/imgproc/test/test_fitellipse_direct.cpp similarity index 100% rename from modules/imgproc/test/test_fitellipseDirect.cpp rename to modules/imgproc/test/test_fitellipse_direct.cpp diff --git a/modules/imgproc/test/test_houghLines.cpp b/modules/imgproc/test/test_houghlines.cpp similarity index 100% rename from modules/imgproc/test/test_houghLines.cpp rename to modules/imgproc/test/test_houghlines.cpp diff --git a/samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/introduction_windows_vs.cpp b/samples/cpp/tutorial_code/introduction/windows_visual_studio_opencv/introduction_windows_vs.cpp similarity index 100% rename from samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/introduction_windows_vs.cpp rename to samples/cpp/tutorial_code/introduction/windows_visual_studio_opencv/introduction_windows_vs.cpp