Skip to content

Commit 0e7ca71

Browse files
author
Andrey Kamaev
committed
Normalize whitespace in documentation and text files
1 parent 9337246 commit 0e7ca71

File tree

95 files changed

+1243
-1243
lines changed

Some content is hidden

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

95 files changed

+1243
-1243
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:

android/java.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ Java API
33
********
44

55

6-
`Java API reference external link (JavaDoc) <http://docs.opencv.org/java/>`_
6+
`Java API reference external link (JavaDoc) <http://docs.opencv.org/java/>`_

android/service/ReadMe.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ The package provides new OpenCV SDK that uses OpenCV Manager for library initial
88
* Hardware specific optimizations for all supported platforms;
99
* Trusted OpenCV library source. All packages with OpenCV are published on Google Play service;
1010
* Regular updates and bug fixes;
11-
11+
1212
Package consists from Library Project for Java development with Eclipse, C++ headers and libraries for native application development, javadoc samples and prebuilt binaries for ARM and X86 platforms.
1313
To try new SDK on serial device with Google Play just install sample package and follow application messages (Google Play service access will be needed).
1414
TO start example on device without Google Play you need to install OpenCV manager package and OpenCV binary pack for your platform from apk folder before.

android/service/doc/BaseLoaderCallback.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ There is a very base code snippet implementing the async initialization with Bas
5555
Using in Service
5656
----------------
5757
58-
Default BaseLoaderCallback implementation treat application context as Activity and calls Activity.finish() method to exit in case of initialization failure.
59-
To override this behavior you need to override finish() method of BaseLoaderCallback class and implement your own finalization method.
58+
Default BaseLoaderCallback implementation treat application context as Activity and calls Activity.finish() method to exit in case of initialization failure.
59+
To override this behavior you need to override finish() method of BaseLoaderCallback class and implement your own finalization method.
6060

android/service/doc/LoaderCallbackInterface.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ void onManagerConnected()
1313
.. method:: void onManagerConnected(int status)
1414

1515
Callback method that is called after OpenCV Library initialization.
16-
16+
1717
:param status: status of initialization (see Initialization Status Constants).
1818

1919
void onPackageInstall()

doc/packaging.txt

Lines changed: 7 additions & 7 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:
8-
- Mark BUILD_PACKAGE
9-
- Mark BUILD_EXAMPLES (If examples are desired to be shipped as binaries...)
10-
- Unmark ENABLE_OPENMP, since this feature seems to have some issues yet...
11-
- Mark INSTALL_*_EXAMPLES
7+
- In cmake-gui:
8+
- Mark BUILD_PACKAGE
9+
- Mark BUILD_EXAMPLES (If examples are desired to be shipped as binaries...)
10+
- Unmark ENABLE_OPENMP, since this feature seems to have some issues yet...
11+
- 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: 55 additions & 55 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_geometric_drawing/basic_geometric_drawing.rst

Lines changed: 78 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ Explanation
9999
100100
/// 2.b. Creating rectangles
101101
rectangle( rook_image,
102-
Point( 0, 7*w/8.0 ),
103-
Point( w, w),
104-
Scalar( 0, 255, 255 ),
105-
-1,
106-
8 );
102+
Point( 0, 7*w/8.0 ),
103+
Point( w, w),
104+
Scalar( 0, 255, 255 ),
105+
-1,
106+
8 );
107107
108108
/// 2.c. Create a few lines
109109
MyLine( rook_image, Point( 0, 15*w/16 ), Point( w, 15*w/16 ) );
@@ -118,16 +118,16 @@ Explanation
118118
.. code-block:: cpp
119119
120120
void MyLine( Mat img, Point start, Point end )
121-
{
122-
int thickness = 2;
123-
int lineType = 8;
124-
line( img,
125-
start,
126-
end,
127-
Scalar( 0, 0, 0 ),
128-
thickness,
129-
lineType );
130-
}
121+
{
122+
int thickness = 2;
123+
int lineType = 8;
124+
line( img,
125+
start,
126+
end,
127+
Scalar( 0, 0, 0 ),
128+
thickness,
129+
lineType );
130+
}
131131

132132
As we can see, *MyLine* just call the function :line:`line <>`, which does the following:
133133

@@ -145,18 +145,18 @@ Explanation
145145
146146
void MyEllipse( Mat img, double angle )
147147
{
148-
int thickness = 2;
149-
int lineType = 8;
150-
151-
ellipse( img,
152-
Point( w/2.0, w/2.0 ),
153-
Size( w/4.0, w/16.0 ),
154-
angle,
155-
0,
156-
360,
157-
Scalar( 255, 0, 0 ),
158-
thickness,
159-
lineType );
148+
int thickness = 2;
149+
int lineType = 8;
150+
151+
ellipse( img,
152+
Point( w/2.0, w/2.0 ),
153+
Size( w/4.0, w/16.0 ),
154+
angle,
155+
0,
156+
360,
157+
Scalar( 255, 0, 0 ),
158+
thickness,
159+
lineType );
160160
}
161161
162162
From the code above, we can observe that the function :ellipse:`ellipse <>` draws an ellipse such that:
@@ -176,17 +176,17 @@ Explanation
176176
.. code-block:: cpp
177177
178178
void MyFilledCircle( Mat img, Point center )
179-
{
180-
int thickness = -1;
181-
int lineType = 8;
182-
183-
circle( img,
184-
center,
185-
w/32.0,
186-
Scalar( 0, 0, 255 ),
187-
thickness,
188-
lineType );
189-
}
179+
{
180+
int thickness = -1;
181+
int lineType = 8;
182+
183+
circle( img,
184+
center,
185+
w/32.0,
186+
Scalar( 0, 0, 255 ),
187+
thickness,
188+
lineType );
189+
}
190190

191191
Similar to the ellipse function, we can observe that *circle* receives as arguments:
192192

@@ -203,41 +203,41 @@ Explanation
203203
.. code-block:: cpp
204204
205205
void MyPolygon( Mat img )
206-
{
207-
int lineType = 8;
208-
209-
/** Create some points */
210-
Point rook_points[1][20];
211-
rook_points[0][0] = Point( w/4.0, 7*w/8.0 );
212-
rook_points[0][1] = Point( 3*w/4.0, 7*w/8.0 );
213-
rook_points[0][2] = Point( 3*w/4.0, 13*w/16.0 );
214-
rook_points[0][3] = Point( 11*w/16.0, 13*w/16.0 );
215-
rook_points[0][4] = Point( 19*w/32.0, 3*w/8.0 );
216-
rook_points[0][5] = Point( 3*w/4.0, 3*w/8.0 );
217-
rook_points[0][6] = Point( 3*w/4.0, w/8.0 );
218-
rook_points[0][7] = Point( 26*w/40.0, w/8.0 );
219-
rook_points[0][8] = Point( 26*w/40.0, w/4.0 );
220-
rook_points[0][9] = Point( 22*w/40.0, w/4.0 );
221-
rook_points[0][10] = Point( 22*w/40.0, w/8.0 );
222-
rook_points[0][11] = Point( 18*w/40.0, w/8.0 );
223-
rook_points[0][12] = Point( 18*w/40.0, w/4.0 );
224-
rook_points[0][13] = Point( 14*w/40.0, w/4.0 );
225-
rook_points[0][14] = Point( 14*w/40.0, w/8.0 );
226-
rook_points[0][15] = Point( w/4.0, w/8.0 );
227-
rook_points[0][16] = Point( w/4.0, 3*w/8.0 );
228-
rook_points[0][17] = Point( 13*w/32.0, 3*w/8.0 );
229-
rook_points[0][18] = Point( 5*w/16.0, 13*w/16.0 );
230-
rook_points[0][19] = Point( w/4.0, 13*w/16.0) ;
231-
232-
const Point* ppt[1] = { rook_points[0] };
233-
int npt[] = { 20 };
234-
235-
fillPoly( img,
236-
ppt,
237-
npt,
238-
1,
239-
Scalar( 255, 255, 255 ),
240-
lineType );
206+
{
207+
int lineType = 8;
208+
209+
/** Create some points */
210+
Point rook_points[1][20];
211+
rook_points[0][0] = Point( w/4.0, 7*w/8.0 );
212+
rook_points[0][1] = Point( 3*w/4.0, 7*w/8.0 );
213+
rook_points[0][2] = Point( 3*w/4.0, 13*w/16.0 );
214+
rook_points[0][3] = Point( 11*w/16.0, 13*w/16.0 );
215+
rook_points[0][4] = Point( 19*w/32.0, 3*w/8.0 );
216+
rook_points[0][5] = Point( 3*w/4.0, 3*w/8.0 );
217+
rook_points[0][6] = Point( 3*w/4.0, w/8.0 );
218+
rook_points[0][7] = Point( 26*w/40.0, w/8.0 );
219+
rook_points[0][8] = Point( 26*w/40.0, w/4.0 );
220+
rook_points[0][9] = Point( 22*w/40.0, w/4.0 );
221+
rook_points[0][10] = Point( 22*w/40.0, w/8.0 );
222+
rook_points[0][11] = Point( 18*w/40.0, w/8.0 );
223+
rook_points[0][12] = Point( 18*w/40.0, w/4.0 );
224+
rook_points[0][13] = Point( 14*w/40.0, w/4.0 );
225+
rook_points[0][14] = Point( 14*w/40.0, w/8.0 );
226+
rook_points[0][15] = Point( w/4.0, w/8.0 );
227+
rook_points[0][16] = Point( w/4.0, 3*w/8.0 );
228+
rook_points[0][17] = Point( 13*w/32.0, 3*w/8.0 );
229+
rook_points[0][18] = Point( 5*w/16.0, 13*w/16.0 );
230+
rook_points[0][19] = Point( w/4.0, 13*w/16.0) ;
231+
232+
const Point* ppt[1] = { rook_points[0] };
233+
int npt[] = { 20 };
234+
235+
fillPoly( img,
236+
ppt,
237+
npt,
238+
1,
239+
Scalar( 255, 255, 255 ),
240+
lineType );
241241
}
242242

243243
To draw a filled polygon we use the function :fill_poly:`fillPoly <>`. We note that:
@@ -255,11 +255,11 @@ Explanation
255255
.. code-block:: cpp
256256
257257
rectangle( rook_image,
258-
Point( 0, 7*w/8.0 ),
259-
Point( w, w),
260-
Scalar( 0, 255, 255 ),
261-
-1,
262-
8 );
258+
Point( 0, 7*w/8.0 ),
259+
Point( w, w),
260+
Scalar( 0, 255, 255 ),
261+
-1,
262+
8 );
263263
264264
Finally we have the :rectangle:`rectangle <>` function (we did not create a special function for this guy). We note that:
265265

0 commit comments

Comments
 (0)