Skip to content

Commit

Permalink
Fix whitespace errors.
Browse files Browse the repository at this point in the history
  • Loading branch information
Roman Donchenko committed Aug 6, 2013
1 parent dcaf923 commit 2f780ed
Show file tree
Hide file tree
Showing 10 changed files with 36 additions and 37 deletions.
2 changes: 1 addition & 1 deletion cmake/checks/winrttest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

int main(int, char**)
{
return 0;
return 0;
}
1 change: 0 additions & 1 deletion cmake/templates/cvconfig.h.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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

Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion modules/features2d/doc/object_categorization.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions modules/highgui/src/cap_ximea.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ void CvCaptureCAM_XIMEA::close()
{
if(frame)
cvReleaseImage(&frame);

if(hmv)
{
xiStopAcquisition(hmv);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 :
Expand Down Expand Up @@ -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 :
Expand Down
2 changes: 1 addition & 1 deletion modules/ml/doc/k_nearest_neighbors.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
----------------------
Expand Down
4 changes: 2 additions & 2 deletions modules/ocl/perf/perf_gftt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ PERFTEST(GoodFeaturesToTrack)
double qualityLevel = 0.01;

std::string images[] = { "rubberwhale1.png", "aloeL.jpg" };

std::vector<cv::Point2f> 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] << "; ";
Expand Down
40 changes: 20 additions & 20 deletions samples/android/camera-calibration/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.opencv.samples.cameracalibration"
android:versionCode="1"
android:versionName="1.0" >

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.opencv.samples.cameracalibration"
android:versionCode="1"
android:versionName="1.0" >

<application
android:label="@string/app_name"
android:icon="@drawable/icon"
android:label="@string/app_name"
android:icon="@drawable/icon"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
<activity android:name="CameraCalibrationActivity"
android:label="@string/app_name"

<activity android:name="CameraCalibrationActivity"
android:label="@string/app_name"
android:screenOrientation="landscape"
android:configChanges="keyboardHidden|orientation" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
android:configChanges="keyboardHidden|orientation" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>

<supports-screens android:resizeable="true"
android:smallScreens="true"
android:normalScreens="true"
Expand All @@ -33,6 +33,6 @@
<uses-feature android:name="android.hardware.camera" android:required="false"/>
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
<uses-feature android:name="android.hardware.camera.front.autofocus" android:required="false"/>

</manifest>
<uses-feature android:name="android.hardware.camera.front.autofocus" android:required="false"/>

</manifest>

0 comments on commit 2f780ed

Please sign in to comment.