From 2f780ed994b958db70d6ef46ac9dbbe2e7bf3005 Mon Sep 17 00:00:00 2001 From: Roman Donchenko Date: Tue, 6 Aug 2013 15:22:46 +0400 Subject: [PATCH] Fix whitespace errors. --- cmake/checks/winrttest.cpp | 2 +- cmake/templates/cvconfig.h.cmake | 1 - .../windows_install/windows_install.rst | 4 +- ...mera_calibration_and_3d_reconstruction.rst | 2 +- ...on_interfaces_of_descriptor_extractors.rst | 2 +- .../features2d/doc/object_categorization.rst | 2 +- modules/highgui/src/cap_ximea.cpp | 14 +++---- modules/ml/doc/k_nearest_neighbors.rst | 2 +- modules/ocl/perf/perf_gftt.cpp | 4 +- .../camera-calibration/AndroidManifest.xml | 40 +++++++++---------- 10 files changed, 36 insertions(+), 37 deletions(-) diff --git a/cmake/checks/winrttest.cpp b/cmake/checks/winrttest.cpp index 4172afe557..2b1d5fa2ad 100644 --- a/cmake/checks/winrttest.cpp +++ b/cmake/checks/winrttest.cpp @@ -2,5 +2,5 @@ int main(int, char**) { - return 0; + return 0; } \ No newline at end of file diff --git a/cmake/templates/cvconfig.h.cmake b/cmake/templates/cvconfig.h.cmake index f4b07d0531..72cf58b5fc 100644 --- a/cmake/templates/cvconfig.h.cmake +++ b/cmake/templates/cvconfig.h.cmake @@ -160,4 +160,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/doc/tutorials/introduction/windows_install/windows_install.rst b/doc/tutorials/introduction/windows_install/windows_install.rst index d9ec05f786..c29c13aede 100644 --- a/doc/tutorials/introduction/windows_install/windows_install.rst +++ b/doc/tutorials/introduction/windows_install/windows_install.rst @@ -314,10 +314,10 @@ First we set an enviroment variable to make easier our work. This will hold the setx -m OPENCV_DIR D:\OpenCV\Build\x86\vc10 (suggested for Visual Studio 2010 - 32 bit Windows) setx -m OPENCV_DIR D:\OpenCV\Build\x64\vc10 (suggested for Visual Studio 2010 - 64 bit Windows) - + setx -m OPENCV_DIR D:\OpenCV\Build\x86\vc11 (suggested for Visual Studio 2012 - 32 bit Windows) setx -m OPENCV_DIR D:\OpenCV\Build\x64\vc11 (suggested for Visual Studio 2012 - 64 bit Windows) - + Here the directory is where you have your OpenCV binaries (*extracted* or *built*). You can have different platform (e.g. x64 instead of x86) or compiler type, so substitute appropriate value. Inside this you should have two folders called *lib* and *bin*. The -m should be added if you wish to make the settings computer wise, instead of user wise. If you built static libraries then you are done. Otherwise, you need to add the *bin* folders path to the systems path. This is cause you will use the OpenCV library in form of *\"Dynamic-link libraries\"* (also known as **DLL**). Inside these are stored all the algorithms and information the OpenCV library contains. The operating system will load them only on demand, during runtime. However, to do this he needs to know where they are. The systems **PATH** contains a list of folders where DLLs can be found. Add the OpenCV library path to this and the OS will know where to look if he ever needs the OpenCV binaries. Otherwise, you will need to copy the used DLLs right beside the applications executable file (*exe*) for the OS to find it, which is highly unpleasent if you work on many projects. To do this start up again the |PathEditor|_ and add the following new entry (right click in the application to bring up the menu): diff --git a/modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst b/modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst index 83bec3cf28..60eeebb4d2 100644 --- a/modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst +++ b/modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst @@ -1184,7 +1184,7 @@ Class for computing stereo correspondence using the block matching algorithm, in .. Sample code: - * : OCL : An example for using the stereoBM matching algorithm can be found at opencv_source_code/samples/ocl/stereo_match.cpp + * : OCL : An example for using the stereoBM matching algorithm can be found at opencv_source_code/samples/ocl/stereo_match.cpp createStereoBM ------------------ diff --git a/modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst b/modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst index 39706b72d7..3ab2e870b4 100644 --- a/modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst +++ b/modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst @@ -145,6 +145,6 @@ Strecha C., Fua P. *BRIEF: Binary Robust Independent Elementary Features* , ... }; -.. Sample code:: +.. Sample code:: * : A complete BRIEF extractor sample can be found at opencv_source_code/samples/cpp/brief_match_test.cpp diff --git a/modules/features2d/doc/object_categorization.rst b/modules/features2d/doc/object_categorization.rst index ec7b6d879b..ca2d3a90cf 100644 --- a/modules/features2d/doc/object_categorization.rst +++ b/modules/features2d/doc/object_categorization.rst @@ -5,7 +5,7 @@ Object Categorization This section describes approaches based on local 2D features and used to categorize objects. -.. Sample code:: +.. Sample code:: * : A complete Bag-Of-Words sample can be found at opencv_source_code/samples/cpp/bagofwords_classification.cpp diff --git a/modules/highgui/src/cap_ximea.cpp b/modules/highgui/src/cap_ximea.cpp index 98279e05b5..b14c113e81 100644 --- a/modules/highgui/src/cap_ximea.cpp +++ b/modules/highgui/src/cap_ximea.cpp @@ -138,7 +138,7 @@ void CvCaptureCAM_XIMEA::close() { if(frame) cvReleaseImage(&frame); - + if(hmv) { xiStopAcquisition(hmv); @@ -176,11 +176,11 @@ IplImage* CvCaptureCAM_XIMEA::retrieveFrame(int) { // update cvImage after format has changed resetCvImage(); - + // copy pixel data switch( image.frm) { - case XI_MONO8 : + case XI_MONO8 : case XI_RAW8 : memcpy( frame->imageData, image.bp, image.width*image.height); break; case XI_MONO16 : case XI_RAW16 : memcpy( frame->imageData, image.bp, image.width*image.height*sizeof(WORD)); break; @@ -210,9 +210,9 @@ void CvCaptureCAM_XIMEA::resetCvImage() { case XI_MONO8 : case XI_RAW8 : frame = cvCreateImage(cvSize( image.width, image.height), IPL_DEPTH_8U, 1); break; - case XI_MONO16 : + case XI_MONO16 : case XI_RAW16 : frame = cvCreateImage(cvSize( image.width, image.height), IPL_DEPTH_16U, 1); break; - case XI_RGB24 : + case XI_RGB24 : case XI_RGB_PLANAR : frame = cvCreateImage(cvSize( image.width, image.height), IPL_DEPTH_8U, 3); break; case XI_RGB32 : frame = cvCreateImage(cvSize( image.width, image.height), IPL_DEPTH_8U, 4); break; default : @@ -338,9 +338,9 @@ int CvCaptureCAM_XIMEA::getBpp() { case XI_MONO8 : case XI_RAW8 : return 1; - case XI_MONO16 : + case XI_MONO16 : case XI_RAW16 : return 2; - case XI_RGB24 : + case XI_RGB24 : case XI_RGB_PLANAR : return 3; case XI_RGB32 : return 4; default : diff --git a/modules/ml/doc/k_nearest_neighbors.rst b/modules/ml/doc/k_nearest_neighbors.rst index 8f5f45c12a..9a3fca4554 100644 --- a/modules/ml/doc/k_nearest_neighbors.rst +++ b/modules/ml/doc/k_nearest_neighbors.rst @@ -15,7 +15,7 @@ The class implements K-Nearest Neighbors model as described in the beginning of * : PYTHON : An example of digit recognition using KNearest can be found at opencv_source/samples/python2/digits.py * : PYTHON : An example of grid search digit recognition using KNearest can be found at opencv_source/samples/python2/digits_adjust.py - * : PYTHON : An example of video digit recognition using KNearest can be found at opencv_source/samples/python2/digits_video.py + * : PYTHON : An example of video digit recognition using KNearest can be found at opencv_source/samples/python2/digits_video.py CvKNearest::CvKNearest ---------------------- diff --git a/modules/ocl/perf/perf_gftt.cpp b/modules/ocl/perf/perf_gftt.cpp index bca6f398a2..bdc62b622e 100644 --- a/modules/ocl/perf/perf_gftt.cpp +++ b/modules/ocl/perf/perf_gftt.cpp @@ -55,14 +55,14 @@ PERFTEST(GoodFeaturesToTrack) double qualityLevel = 0.01; std::string images[] = { "rubberwhale1.png", "aloeL.jpg" }; - + std::vector pts_gold, pts_ocl; for(size_t imgIdx = 0; imgIdx < (sizeof(images)/sizeof(std::string)); ++imgIdx) { Mat frame = imread(abspath(images[imgIdx]), IMREAD_GRAYSCALE); CV_Assert(!frame.empty()); - + for(float minDistance = 0; minDistance < 4; minDistance += 3.0) { SUBTEST << "image = " << images[imgIdx] << "; "; diff --git a/samples/android/camera-calibration/AndroidManifest.xml b/samples/android/camera-calibration/AndroidManifest.xml index d47576abec..c8885db033 100644 --- a/samples/android/camera-calibration/AndroidManifest.xml +++ b/samples/android/camera-calibration/AndroidManifest.xml @@ -1,25 +1,25 @@ - - + + - - - - - - - + android:configChanges="keyboardHidden|orientation" > + + + + + - + - - - + + +