Skip to content

Commit f55740d

Browse files
author
Roman Donchenko
committed
Deleted all trailing whitespace.
1 parent 0d8cb2e commit f55740d

File tree

193 files changed

+1685
-1685
lines changed

Some content is hidden

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

193 files changed

+1685
-1685
lines changed

3rdparty/ffmpeg/readme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ How to update opencv_ffmpeg.dll and opencv_ffmpeg_64.dll when a new version of F
1616
2. Install 64-bit MinGW. http://mingw-w64.sourceforge.net/
1717
Let's assume, it's installed in C:\MSYS64
1818
3. Copy C:\MSYS32\msys to C:\MSYS64\msys. Edit C:\MSYS64\msys\etc\fstab, change C:\MSYS32 to C:\MSYS64.
19-
19+
2020
4. Now you have working MSYS32 and MSYS64 environments.
2121
Launch, one by one, C:\MSYS32\msys\msys.bat and C:\MSYS64\msys\msys.bat to create your home directories.
2222

3rdparty/readme.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ jasper-1.900.1 - JasPer is a collection of software
4545
and manipulation of images. This software can handle image data in a
4646
variety of formats. One such format supported by JasPer is the JPEG-2000
4747
format defined in ISO/IEC 15444-1.
48-
48+
4949
Copyright (c) 1999-2000 Image Power, Inc.
5050
Copyright (c) 1999-2000 The University of British Columbia
5151
Copyright (c) 2001-2003 Michael David Adams
5252

5353
The JasPer license can be found in src/libjasper.
54-
54+
5555
OpenCV on Windows uses pre-built libjasper library
5656
(lib/libjasper*). To get the latest source code,
5757
please, visit the project homepage:

cmake/OpenCVFindIPP.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ endfunction()
140140
# ------------------------------------------------------------------------
141141
function(set_ipp_new_libraries _LATEST_VERSION)
142142
set(IPP_PREFIX "ipp")
143-
143+
144144
if(${_LATEST_VERSION} VERSION_LESS "8.0")
145145
set(IPP_SUFFIX "_l") # static not threaded libs suffix IPP 7.x
146146
else()

cmake/OpenCVFindXimea.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ set(XIMEA_LIBRARY_DIR)
1919
if(WIN32)
2020
# Try to find the XIMEA API path in registry.
2121
GET_FILENAME_COMPONENT(XIMEA_PATH "[HKEY_CURRENT_USER\\Software\\XIMEA\\CamSupport\\API;Path]" ABSOLUTE)
22-
22+
2323
if(EXISTS ${XIMEA_PATH})
2424
set(XIMEA_FOUND 1)
2525
# set LIB folders

doc/_static/insertIframe.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function insertIframe (elementId, iframeSrc)
1+
function insertIframe (elementId, iframeSrc)
22
{
33
var iframe;
44
if (document.createElement && (iframe = document.createElement('iframe')))

doc/packaging.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ INSTRUCTIONS TO BUILD WIN32 PACKAGES WITH CMAKE+CPACK
44

55
- Install NSIS.
66
- Generate OpenCV solutions for MSVC using CMake as usual.
7-
- In cmake-gui:
7+
- In cmake-gui:
88
- Mark BUILD_PACKAGE
99
- Mark BUILD_EXAMPLES (If examples are desired to be shipped as binaries...)
1010
- Unmark ENABLE_OPENMP, since this feature seems to have some issues yet...
1111
- Mark INSTALL_*_EXAMPLES
1212
- Open the OpenCV solution and build ALL in Debug and Release.
13-
- Build PACKAGE, from the Release configuration. An NSIS installer package will be
13+
- Build PACKAGE, from the Release configuration. An NSIS installer package will be
1414
created with both release and debug LIBs and DLLs.
1515

16-
16+
1717
Jose Luis Blanco, 2009/JUL/29

doc/tutorials/calib3d/camera_calibration/camera_calibration.rst

Lines changed: 54 additions & 54 deletions
Large diffs are not rendered by default.

doc/tutorials/calib3d/camera_calibration_square_chess/camera_calibration_square_chess.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ Camera calibration with square chessboard
77

88
The goal of this tutorial is to learn how to calibrate a camera given a set of chessboard images.
99

10-
*Test data*: use images in your data/chess folder.
10+
*Test data*: use images in your data/chess folder.
1111

1212
#.
13-
Compile opencv with samples by setting ``BUILD_EXAMPLES`` to ``ON`` in cmake configuration.
13+
Compile opencv with samples by setting ``BUILD_EXAMPLES`` to ``ON`` in cmake configuration.
1414

1515
#.
1616
Go to ``bin`` folder and use ``imagelist_creator`` to create an ``XML/YAML`` list of your images.
17-
17+
1818
#.
19-
Then, run ``calibration`` sample to get camera parameters. Use square size equal to 3cm.
19+
Then, run ``calibration`` sample to get camera parameters. Use square size equal to 3cm.
2020

2121
Pose estimation
2222
===============
@@ -57,6 +57,6 @@ Now, let us write a code that detects a chessboard in a new image and finds its
5757
distCoeffs, rvec, tvec, false);
5858

5959
#.
60-
Calculate reprojection error like it is done in ``calibration`` sample (see ``opencv/samples/cpp/calibration.cpp``, function ``computeReprojectionErrors``).
60+
Calculate reprojection error like it is done in ``calibration`` sample (see ``opencv/samples/cpp/calibration.cpp``, function ``computeReprojectionErrors``).
6161

62-
Question: how to calculate the distance from the camera origin to any of the corners?
62+
Question: how to calculate the distance from the camera origin to any of the corners?

doc/tutorials/calib3d/table_of_content_calib3d/table_of_content_calib3d.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
*calib3d* module. Camera calibration and 3D reconstruction
44
-----------------------------------------------------------
55

6-
Although we got most of our images in a 2D format they do come from a 3D world. Here you will learn how to find out from the 2D images information about the 3D world.
6+
Although we got most of our images in a 2D format they do come from a 3D world. Here you will learn how to find out from the 2D images information about the 3D world.
77

8-
.. include:: ../../definitions/tocDefinitions.rst
8+
.. include:: ../../definitions/tocDefinitions.rst
99

10-
+
10+
+
1111
.. tabularcolumns:: m{100pt} m{300pt}
1212
.. cssclass:: toctableopencv
1313

@@ -26,7 +26,7 @@ Although we got most of our images in a 2D format they do come from a 3D world.
2626
:height: 90pt
2727
:width: 90pt
2828

29-
+
29+
+
3030
.. tabularcolumns:: m{100pt} m{300pt}
3131
.. cssclass:: toctableopencv
3232

doc/tutorials/core/adding_images/adding_images.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Theory
1818

1919
.. note::
2020

21-
The explanation below belongs to the book `Computer Vision: Algorithms and Applications <http://szeliski.org/Book/>`_ by Richard Szeliski
21+
The explanation below belongs to the book `Computer Vision: Algorithms and Applications <http://szeliski.org/Book/>`_ by Richard Szeliski
2222

2323
From our previous tutorial, we know already a bit of *Pixel operators*. An interesting dyadic (two-input) operator is the *linear blend operator*:
2424

@@ -43,7 +43,7 @@ As usual, after the not-so-lengthy explanation, let's go to the code:
4343
4444
int main( int argc, char** argv )
4545
{
46-
double alpha = 0.5; double beta; double input;
46+
double alpha = 0.5; double beta; double input;
4747
4848
Mat src1, src2, dst;
4949
@@ -69,7 +69,7 @@ As usual, after the not-so-lengthy explanation, let's go to the code:
6969
7070
beta = ( 1.0 - alpha );
7171
addWeighted( src1, alpha, src2, beta, 0.0, dst);
72-
72+
7373
imshow( "Linear Blend", dst );
7474
7575
waitKey(0);
@@ -99,23 +99,23 @@ Explanation
9999
#. Now we need to generate the :math:`g(x)` image. For this, the function :add_weighted:`addWeighted <>` comes quite handy:
100100

101101
.. code-block:: cpp
102-
102+
103103
beta = ( 1.0 - alpha );
104104
addWeighted( src1, alpha, src2, beta, 0.0, dst);
105-
105+
106106
since :add_weighted:`addWeighted <>` produces:
107107

108108
.. math::
109109
110110
dst = \alpha \cdot src1 + \beta \cdot src2 + \gamma
111111
112112
In this case, :math:`\gamma` is the argument :math:`0.0` in the code above.
113-
114-
#. Create windows, show the images and wait for the user to end the program.
113+
114+
#. Create windows, show the images and wait for the user to end the program.
115115

116116
Result
117117
=======
118118

119119
.. image:: images/Adding_Images_Tutorial_Result_0.jpg
120120
:alt: Blending Images Tutorial - Final Result
121-
:align: center
121+
:align: center

doc/tutorials/core/basic_linear_transform/basic_linear_transform.rst

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ In this tutorial you will learn how to:
1010

1111
.. container:: enumeratevisibleitemswithsquare
1212

13-
+ Access pixel values
13+
+ Access pixel values
1414

1515
+ Initialize a matrix with zeros
1616

@@ -20,16 +20,16 @@ In this tutorial you will learn how to:
2020

2121
Theory
2222
=======
23-
23+
2424
.. note::
25-
The explanation below belongs to the book `Computer Vision: Algorithms and Applications <http://szeliski.org/Book/>`_ by Richard Szeliski
25+
The explanation below belongs to the book `Computer Vision: Algorithms and Applications <http://szeliski.org/Book/>`_ by Richard Szeliski
2626

2727
Image Processing
2828
--------------------
2929

3030
.. container:: enumeratevisibleitemswithsquare
3131

32-
* A general image processing operator is a function that takes one or more input images and produces an output image.
32+
* A general image processing operator is a function that takes one or more input images and produces an output image.
3333

3434
* Image transforms can be seen as:
3535

@@ -54,18 +54,18 @@ Brightness and contrast adjustments
5454
* Two commonly used point processes are *multiplication* and *addition* with a constant:
5555

5656
.. math::
57-
57+
5858
g(x) = \alpha f(x) + \beta
59-
59+
6060
* The parameters :math:`\alpha > 0` and :math:`\beta` are often called the *gain* and *bias* parameters; sometimes these parameters are said to control *contrast* and *brightness* respectively.
6161

6262
* You can think of :math:`f(x)` as the source image pixels and :math:`g(x)` as the output image pixels. Then, more conveniently we can write the expression as:
6363

6464
.. math::
65-
65+
6666
g(i,j) = \alpha \cdot f(i,j) + \beta
67-
68-
where :math:`i` and :math:`j` indicates that the pixel is located in the *i-th* row and *j-th* column.
67+
68+
where :math:`i` and :math:`j` indicates that the pixel is located in the *i-th* row and *j-th* column.
6969

7070
Code
7171
=====
@@ -91,7 +91,7 @@ Code
9191
Mat image = imread( argv[1] );
9292
Mat new_image = Mat::zeros( image.size(), image.type() );
9393
94-
/// Initialize values
94+
/// Initialize values
9595
std::cout<<" Basic Linear Transforms "<<std::endl;
9696
std::cout<<"-------------------------"<<std::endl;
9797
std::cout<<"* Enter the alpha value [1.0-3.0]: ";std::cin>>alpha;
@@ -102,7 +102,7 @@ Code
102102
{ for( int x = 0; x < image.cols; x++ )
103103
{ for( int c = 0; c < 3; c++ )
104104
{
105-
new_image.at<Vec3b>(y,x)[c] =
105+
new_image.at<Vec3b>(y,x)[c] =
106106
saturate_cast<uchar>( alpha*( image.at<Vec3b>(y,x)[c] ) + beta );
107107
}
108108
}
@@ -133,49 +133,49 @@ Explanation
133133
134134
135135
#. We load an image using :imread:`imread <>` and save it in a Mat object:
136-
136+
137137
.. code-block:: cpp
138138
139139
Mat image = imread( argv[1] );
140140
141141
#. Now, since we will make some transformations to this image, we need a new Mat object to store it. Also, we want this to have the following features:
142-
142+
143143
.. container:: enumeratevisibleitemswithsquare
144144

145145
* Initial pixel values equal to zero
146146
* Same size and type as the original image
147-
147+
148148
.. code-block:: cpp
149149
150-
Mat new_image = Mat::zeros( image.size(), image.type() );
151-
152-
We observe that :mat_zeros:`Mat::zeros <>` returns a Matlab-style zero initializer based on *image.size()* and *image.type()*
150+
Mat new_image = Mat::zeros( image.size(), image.type() );
151+
152+
We observe that :mat_zeros:`Mat::zeros <>` returns a Matlab-style zero initializer based on *image.size()* and *image.type()*
153153

154154
#. Now, to perform the operation :math:`g(i,j) = \alpha \cdot f(i,j) + \beta` we will access to each pixel in image. Since we are operating with RGB images, we will have three values per pixel (R, G and B), so we will also access them separately. Here is the piece of code:
155155

156156
.. code-block:: cpp
157-
157+
158158
for( int y = 0; y < image.rows; y++ )
159159
{ for( int x = 0; x < image.cols; x++ )
160160
{ for( int c = 0; c < 3; c++ )
161-
{ new_image.at<Vec3b>(y,x)[c] =
161+
{ new_image.at<Vec3b>(y,x)[c] =
162162
saturate_cast<uchar>( alpha*( image.at<Vec3b>(y,x)[c] ) + beta ); }
163163
}
164164
}
165-
165+
166166
Notice the following:
167167

168168
.. container:: enumeratevisibleitemswithsquare
169169

170-
* To access each pixel in the images we are using this syntax: *image.at<Vec3b>(y,x)[c]* where *y* is the row, *x* is the column and *c* is R, G or B (0, 1 or 2).
170+
* To access each pixel in the images we are using this syntax: *image.at<Vec3b>(y,x)[c]* where *y* is the row, *x* is the column and *c* is R, G or B (0, 1 or 2).
171171

172172
* Since the operation :math:`\alpha \cdot p(i,j) + \beta` can give values out of range or not integers (if :math:`\alpha` is float), we use :saturate_cast:`saturate_cast <>` to make sure the values are valid.
173173

174174

175175
#. Finally, we create windows and show the images, the usual way.
176176

177177
.. code-block:: cpp
178-
178+
179179
namedWindow("Original Image", 1);
180180
namedWindow("New Image", 1);
181181
@@ -185,9 +185,9 @@ Explanation
185185
waitKey(0);
186186
187187
.. note::
188-
188+
189189
Instead of using the **for** loops to access each pixel, we could have simply used this command:
190-
190+
191191
.. code-block:: cpp
192192
193193
image.convertTo(new_image, -1, alpha, beta);
@@ -211,4 +211,4 @@ Result
211211

212212
.. image:: images/Basic_Linear_Transform_Tutorial_Result_0.jpg
213213
:alt: Basic Linear Transform - Final Result
214-
:align: center
214+
:align: center

0 commit comments

Comments
 (0)