Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
40030d2c
Commit
40030d2c
authored
Oct 22, 2012
by
Andrey Kamaev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix windows build warnings
parent
15076f92
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
9 deletions
+18
-9
operations.hpp
modules/core/include/opencv2/core/operations.hpp
+9
-0
parallel.cpp
modules/core/src/parallel.cpp
+2
-2
miniflann.cpp
modules/flann/src/miniflann.cpp
+1
-1
color.cpp
modules/imgproc/src/color.cpp
+6
-6
No files found.
modules/core/include/opencv2/core/operations.hpp
View file @
40030d2c
...
...
@@ -86,6 +86,11 @@
#include <limits>
#ifdef _MSC_VER
# pragma warning(push)
# pragma warning(disable:4127) //conditional expression is constant
#endif
namespace
cv
{
...
...
@@ -3950,5 +3955,9 @@ template<typename _Tp> inline void AlgorithmInfo::addParam(Algorithm& algo, cons
}
#ifdef _MSC_VER
# pragma warning(pop)
#endif
#endif // __cplusplus
#endif
modules/core/src/parallel.cpp
View file @
40030d2c
...
...
@@ -362,8 +362,8 @@ void cv::setNumThreads( int threads )
else
if
(
pplScheduler
==
0
||
1
+
pplScheduler
->
GetNumberOfVirtualProcessors
()
!=
(
unsigned
int
)
threads
)
{
pplScheduler
=
Concurrency
::
Scheduler
::
Create
(
Concurrency
::
SchedulerPolicy
(
2
,
Concurrency
::
PolicyElementKey
::
MinConcurrency
,
threads
-
1
,
Concurrency
::
PolicyElementKey
::
MaxConcurrency
,
threads
-
1
));
Concurrency
::
MinConcurrency
,
threads
-
1
,
Concurrency
::
MaxConcurrency
,
threads
-
1
));
}
#endif
...
...
modules/flann/src/miniflann.cpp
View file @
40030d2c
...
...
@@ -500,7 +500,7 @@ int runRadiusSearch_(void* index, const Mat& query, Mat& indices, Mat& dists,
::
cvflann
::
Matrix
<
DistanceType
>
_dists
((
DistanceType
*
)
dists
.
data
,
dists
.
rows
,
dists
.
cols
);
return
((
IndexType
*
)
index
)
->
radiusSearch
(
_query
,
_indices
,
_dists
,
saturate_cast
<
DistanceType
>
(
radius
),
saturate_cast
<
float
>
(
radius
),
(
const
::
cvflann
::
SearchParams
&
)
get_params
(
params
));
}
...
...
modules/imgproc/src/color.cpp
View file @
40030d2c
...
...
@@ -1387,8 +1387,8 @@ struct RGB2Lab_f
C6
=
coeffs
[
6
],
C7
=
coeffs
[
7
],
C8
=
coeffs
[
8
];
n
*=
3
;
static
const
float
_1_3
=
1.0
/
3.0
;
static
const
double
_a
=
16.0
/
116
;
static
const
float
_1_3
=
1.0
f
/
3.0
f
;
static
const
float
_a
=
16.0
f
/
116.0
f
;
for
(
i
=
0
;
i
<
n
;
i
+=
3
,
src
+=
scn
)
{
float
R
=
clip
(
src
[
0
]);
...
...
@@ -1409,11 +1409,11 @@ struct RGB2Lab_f
float
Y
=
R
*
C3
+
G
*
C4
+
B
*
C5
;
float
Z
=
R
*
C6
+
G
*
C7
+
B
*
C8
;
float
FX
=
X
>
0.008856
?
pow
(
X
,
_1_3
)
:
(
7.787
f
*
X
+
_a
);
float
FY
=
Y
>
0.008856
?
pow
(
Y
,
_1_3
)
:
(
7.787
f
*
Y
+
_a
);
float
FZ
=
Z
>
0.008856
?
pow
(
Z
,
_1_3
)
:
(
7.787
f
*
Z
+
_a
);
float
FX
=
X
>
0.008856
f
?
pow
(
X
,
_1_3
)
:
(
7.787
f
*
X
+
_a
);
float
FY
=
Y
>
0.008856
f
?
pow
(
Y
,
_1_3
)
:
(
7.787
f
*
Y
+
_a
);
float
FZ
=
Z
>
0.008856
f
?
pow
(
Z
,
_1_3
)
:
(
7.787
f
*
Z
+
_a
);
float
L
=
Y
>
0.008856
?
(
116.
f
*
FY
-
16.
f
)
:
(
903.3
*
Y
);
float
L
=
Y
>
0.008856
f
?
(
116.
f
*
FY
-
16.
f
)
:
(
903.3
f
*
Y
);
float
a
=
500.
f
*
(
FX
-
FY
);
float
b
=
200.
f
*
(
FY
-
FZ
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment