projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c9bcbda
)
Fixed output log in GPU perf tests
author
Anatoly Baksheev
<no@email>
Mon, 8 Oct 2012 20:44:48 +0000
(
00:44
+0400)
committer
Anatoly Baksheev
<no@email>
Mon, 8 Oct 2012 20:44:48 +0000
(
00:44
+0400)
modules/gpu/perf/utility.hpp
patch
|
blob
|
history
diff --git
a/modules/gpu/perf/utility.hpp
b/modules/gpu/perf/utility.hpp
index
3517909
..
f1ca244
100644
(file)
--- a/
modules/gpu/perf/utility.hpp
+++ b/
modules/gpu/perf/utility.hpp
@@
-22,7
+22,7
@@
CV_ENUM(Interpolation, cv::INTER_NEAREST, cv::INTER_LINEAR, cv::INTER_CUBIC, cv:
CV_ENUM(NormType, cv::NORM_INF, cv::NORM_L1, cv::NORM_L2, cv::NORM_HAMMING)
\r
\r
const int Gray = 1, TwoChannel = 2, BGR = 3, BGRA = 4;
\r
-CV_
FLAGS
(MatCn, Gray, TwoChannel, BGR, BGRA)
\r
+CV_
ENUM
(MatCn, Gray, TwoChannel, BGR, BGRA)
\r
#define GPU_CHANNELS_1_3_4 testing::Values(Gray, BGR, BGRA)
\r
#define GPU_CHANNELS_1_3 testing::Values(Gray, BGR)
\r
\r