projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
680efe1
)
Fix issue #5234 (UMat::convertTo when noScale)
author
Philippe FOUBERT
<philippe.foubert@free.fr>
Sat, 22 Aug 2015 11:16:59 +0000
(13:16 +0200)
committer
Philippe FOUBERT
<philippe.foubert@free.fr>
Sat, 22 Aug 2015 11:16:59 +0000
(13:16 +0200)
modules/core/src/umatrix.cpp
patch
|
blob
|
history
diff --git
a/modules/core/src/umatrix.cpp
b/modules/core/src/umatrix.cpp
index
742e3a2
..
2b77ddf
100644
(file)
--- a/
modules/core/src/umatrix.cpp
+++ b/
modules/core/src/umatrix.cpp
@@
-744,7
+744,7
@@
void UMat::convertTo(OutputArray _dst, int _type, double alpha, double beta) con
char cvt[2][40];
ocl::Kernel k("convertTo", ocl::core::convert_oclsrc,
- format("-D srcT=%s -D WT=%s -D dstT=%s -D convertToWT=%s -D convertToDT=%s%s",
+ format("-D srcT=%s -D WT=%s -D dstT=%s -D convertToWT=%s -D convertToDT=%s%s
%s
",
ocl::typeToStr(sdepth), ocl::typeToStr(wdepth), ocl::typeToStr(ddepth),
ocl::convertTypeStr(sdepth, wdepth, 1, cvt[0]),
ocl::convertTypeStr(wdepth, ddepth, 1, cvt[1]),