Skip to content

Commit c8783f3

Browse files
TonyLianLongalalek
TonyLianLong
authored and
alalek
committed
Merge pull request opencv#9075 from TonyLianLong:master
Remove unnecessary Non-ASCII characters from source code (opencv#9075) * Remove unnecessary Non-ASCII characters from source code Remove unnecessary Non-ASCII characters and replace them with ASCII characters * Remove dashes in the @param statement Remove dashes and place single space in the @param statement to keep coding style * misc: more fixes for non-ASCII symbols * misc: fix non-ASCII symbol in CMake file
1 parent 9aaf6a6 commit c8783f3

File tree

25 files changed

+75
-75
lines changed

25 files changed

+75
-75
lines changed

‎3rdparty/carotene/src/colorconvert.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2466,9 +2466,9 @@ void yuv420sp2rgb(const Size2D &size,
24662466
// B = [((149*y)/2 + (-17705+129*u) )/2]/32
24672467

24682468
// error estimation:
2469-
//Rerr = 0.0000625 * y − 0.00225 * v − 0.287
2469+
//Rerr = 0.0000625 * y - 0.00225 * v - 0.287
24702470
//Gerr = 0.0000625 * y + 0.0005 * v + 0.000375 * u + 0.128625
2471-
//Berr = 0.0000625 * y − 0.002375 * u - 0.287375
2471+
//Berr = 0.0000625 * y - 0.002375 * u - 0.287375
24722472

24732473
//real error test:
24742474
//=================

‎cmake/OpenCVDetectCStripes.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
if(WIN32)
22
find_path( CSTRIPES_LIB_DIR
3-
NAMES "С=.lib"
3+
NAMES "C=.lib"
44
DOC "The path to C= lib and dll")
55
if(CSTRIPES_LIB_DIR)
66
ocv_include_directories("${CSTRIPES_LIB_DIR}/..")

‎modules/calib3d/src/fisheye.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,9 +379,9 @@ void cv::fisheye::undistortPoints( InputArray distorted, OutputArray undistorted
379379

380380
double theta_d = sqrt(pw[0]*pw[0] + pw[1]*pw[1]);
381381

382-
// the current camera model is only valid up to 180° FOV
382+
// the current camera model is only valid up to 180 FOV
383383
// for larger FOV the loop below does not converge
384-
// clip values so we still get plausible results for super fisheye images > 180°
384+
// clip values so we still get plausible results for super fisheye images > 180 grad
385385
theta_d = min(max(-CV_PI/2., theta_d), CV_PI/2.);
386386

387387
if (theta_d > 1e-8)

‎modules/calib3d/src/homography_decomp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// License Agreement
1717
// For Open Source Computer Vision Library
1818
//
19-
// Copyright (C) 2014, Samson Yilma¸ (samson_yilma@yahoo.com), all rights reserved.
19+
// Copyright (C) 2014, Samson Yilma (samson_yilma@yahoo.com), all rights reserved.
2020
//
2121
// Third party copyrights are property of their respective owners.
2222
//

‎modules/calib3d/src/rho.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,11 +1248,11 @@ inline void RHO_HEST_REFC::rndSmpl(unsigned sampleSize,
12481248
/**
12491249
* Selection Sampling:
12501250
*
1251-
* Algorithm S (Selection sampling technique). To select n records at random from a set of N, where 0 < n ≤ N.
1252-
* S1. [Initialize.] Set t ← 0, m ← 0. (During this algorithm, m represents the number of records selected so far,
1251+
* Algorithm S (Selection sampling technique). To select n records at random from a set of N, where 0 < n <= N.
1252+
* S1. [Initialize.] Set t = 0, m = 0. (During this algorithm, m represents the number of records selected so far,
12531253
* and t is the total number of input records that we have dealt with.)
12541254
* S2. [Generate U.] Generate a random number U, uniformly distributed between zero and one.
1255-
* S3. [Test.] If (N – t)U ≥ n – m, go to step S5.
1255+
* S3. [Test.] If (N - t)U >= n - m, go to step S5.
12561256
* S4. [Select.] Select the next record for the sample, and increase m and t by 1. If m < n, go to step S2;
12571257
* otherwise the sample is complete and the algorithm terminates.
12581258
* S5. [Skip.] Skip the next record (do not include it in the sample), increase t by 1, and go back to step S2.

‎modules/calib3d/src/triangulate.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ cvCorrectMatches(CvMat *F_, CvMat *points1_, CvMat *points2_, CvMat *new_points1
281281
c = cvGetReal2D(RTFTR,2,1);
282282
d = cvGetReal2D(RTFTR,2,2);
283283

284-
// Form the polynomial g(t) = k6*t⁶ + k5*t⁵ + k4*t⁴ + k3*t³ + k2*t² + k1*t + k0
284+
// Form the polynomial g(t) = k6*t^6 + k5*t^5 + k4*t^4 + k3*t^3 + k2*t^2 + k1*t + k0
285285
// from f1, f2, a, b, c and d
286286
cvSetReal2D(polynomial,0,6,( +b*c*c*f1*f1*f1*f1*a-a*a*d*f1*f1*f1*f1*c ));
287287
cvSetReal2D(polynomial,0,5,( +f2*f2*f2*f2*c*c*c*c+2*a*a*f2*f2*c*c-a*a*d*d*f1*f1*f1*f1+b*b*c*c*f1*f1*f1*f1+a*a*a*a ));

‎modules/calib3d/test/test_homography_decomp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// License Agreement
1414
// For Open Source Computer Vision Library
1515
//
16-
// Copyright (C) 2014, Samson Yilma¸ (samson_yilma@yahoo.com), all rights reserved.
16+
// Copyright (C) 2014, Samson Yilma (samson_yilma@yahoo.com), all rights reserved.
1717
//
1818
// Third party copyrights are property of their respective owners.
1919
//

‎modules/core/include/opencv2/core/persistence.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ template<> CV_EXPORTS void DefaultDeleter<CvFileStorage>::operator ()(CvFileStor
474474
475475
The node is used to store each and every element of the file storage opened for reading. When
476476
XML/YAML file is read, it is first parsed and stored in the memory as a hierarchical collection of
477-
nodes. Each node can be a “leaf” that is contain a single number or a string, or be a collection of
477+
nodes. Each node can be a "leaf" that is contain a single number or a string, or be a collection of
478478
other nodes. There can be named collections (mappings) where each element has a name and it is
479479
accessed by a name, and ordered collections (sequences) where elements do not have names but rather
480480
accessed by index. Type of the file node can be determined using FileNode::type method.

‎modules/core/include/opencv2/core/utility.hpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -200,13 +200,13 @@ be called outside of parallel region.
200200
201201
OpenCV will try to run it's functions with specified threads number, but some behaviour differs from
202202
framework:
203-
- `TBB` – User-defined parallel constructions will run with the same threads number, if
203+
- `TBB` - User-defined parallel constructions will run with the same threads number, if
204204
another does not specified. If later on user creates own scheduler, OpenCV will use it.
205-
- `OpenMP` – No special defined behaviour.
206-
- `Concurrency` – If threads == 1, OpenCV will disable threading optimizations and run it's
205+
- `OpenMP` - No special defined behaviour.
206+
- `Concurrency` - If threads == 1, OpenCV will disable threading optimizations and run it's
207207
functions sequentially.
208-
- `GCD` – Supports only values \<= 0.
209-
- `C=` – No special defined behaviour.
208+
- `GCD` - Supports only values \<= 0.
209+
- `C=` - No special defined behaviour.
210210
@param nthreads Number of threads used by OpenCV.
211211
@sa getNumThreads, getThreadNum
212212
*/
@@ -217,13 +217,13 @@ CV_EXPORTS_W void setNumThreads(int nthreads);
217217
Always returns 1 if OpenCV is built without threading support.
218218
219219
The exact meaning of return value depends on the threading framework used by OpenCV library:
220-
- `TBB` – The number of threads, that OpenCV will try to use for parallel regions. If there is
220+
- `TBB` - The number of threads, that OpenCV will try to use for parallel regions. If there is
221221
any tbb::thread_scheduler_init in user code conflicting with OpenCV, then function returns
222222
default number of threads used by TBB library.
223-
- `OpenMP` – An upper bound on the number of threads that could be used to form a new team.
224-
- `Concurrency` – The number of threads, that OpenCV will try to use for parallel regions.
225-
- `GCD` – Unsupported; returns the GCD thread pool limit (512) for compatibility.
226-
- `C=` – The number of threads, that OpenCV will try to use for parallel regions, if before
223+
- `OpenMP` - An upper bound on the number of threads that could be used to form a new team.
224+
- `Concurrency` - The number of threads, that OpenCV will try to use for parallel regions.
225+
- `GCD` - Unsupported; returns the GCD thread pool limit (512) for compatibility.
226+
- `C=` - The number of threads, that OpenCV will try to use for parallel regions, if before
227227
called setNumThreads with threads \> 0, otherwise returns the number of logical CPUs,
228228
available for the process.
229229
@sa setNumThreads, getThreadNum
@@ -234,12 +234,12 @@ CV_EXPORTS_W int getNumThreads();
234234
returns 0 if called outside of parallel region.
235235
236236
The exact meaning of return value depends on the threading framework used by OpenCV library:
237-
- `TBB` – Unsupported with current 4.1 TBB release. Maybe will be supported in future.
238-
- `OpenMP` – The thread number, within the current team, of the calling thread.
239-
- `Concurrency` – An ID for the virtual processor that the current context is executing on (0
237+
- `TBB` - Unsupported with current 4.1 TBB release. Maybe will be supported in future.
238+
- `OpenMP` - The thread number, within the current team, of the calling thread.
239+
- `Concurrency` - An ID for the virtual processor that the current context is executing on (0
240240
for master thread and unique number for others, but not necessary 1,2,3,...).
241-
- `GCD` – System calling thread's ID. Never returns 0 inside parallel region.
242-
- `C=` – The index of the current parallel task.
241+
- `GCD` - System calling thread's ID. Never returns 0 inside parallel region.
242+
- `C=` - The index of the current parallel task.
243243
@sa setNumThreads, getNumThreads
244244
*/
245245
CV_EXPORTS_W int getThreadNum();

‎modules/cudaobjdetect/src/hog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ namespace
251251

252252
// Navneet Dalal and Bill Triggs. Histograms of oriented gradients for
253253
// human detection. In International Conference on Computer Vision and
254-
// Pattern Recognition, volume 2, pages 886–893, June 2005
254+
// Pattern Recognition, volume 2, pages 886-893, June 2005
255255
// http://lear.inrialpes.fr/people/triggs/pubs/Dalal-cvpr05.pdf (28.07.2015) [Figure 5]
256256
CV_Assert(block_stride == (block_size / 2));
257257

0 commit comments

Comments
 (0)