potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Fixed cmake and build issues when using Visual Studio 2015

Browse Source
This commit is contained in:
Maksim Shabunin
2015-10-26 16:55:42 +03:00
parent 4552ca98c4
commit f49936a849
59 changed files with 520 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/superres/src/btv_l1_ocl.cpp
+4 -4
View File
@@ -96,7 +96,7 @@ void btv_l1_device_ocl::buildMotionMaps(const oclMat& forwardMotionX, const oclM
Context* clCxt = Context::getContext();
size_t local_thread[] = {32, 8, 1};
size_t global_thread[] = {forwardMapX.cols, forwardMapX.rows, 1};
size_t global_thread[] = {(size_t)forwardMapX.cols, (size_t)forwardMapX.rows, 1};
int forwardMotionX_step = (int)(forwardMotionX.step/forwardMotionX.elemSize());
int forwardMotionY_step = (int)(forwardMotionY.step/forwardMotionY.elemSize());
@@ -139,7 +139,7 @@ void btv_l1_device_ocl::upscale(const oclMat& src, oclMat& dst, int scale)
Context* clCxt = Context::getContext();
size_t local_thread[] = {32, 8, 1};
size_t global_thread[] = {src.cols, src.rows, 1};
size_t global_thread[] = {(size_t)src.cols, (size_t)src.rows, 1};
int src_step = (int)(src.step/src.elemSize());
int dst_step = (int)(dst.step/dst.elemSize());
@@ -175,7 +175,7 @@ void btv_l1_device_ocl::diffSign(const oclMat& src1, const oclMat& src2, oclMat&
int dst_step = (int)(dst_.step/dst_.elemSize());
size_t local_thread[] = {32, 8, 1};
size_t global_thread[] = {src1_.cols, src1_.rows, 1};
size_t global_thread[] = {(size_t)src1_.cols, (size_t)src1_.rows, 1};
String kernel_name = "diffSignKernel";
vector< pair<size_t, const void*> > args;
@@ -201,7 +201,7 @@ void btv_l1_device_ocl::calcBtvRegularization(const oclMat& src, oclMat& dst, in
oclMat dst_ = dst.reshape(1);
size_t local_thread[] = {32, 8, 1};
size_t global_thread[] = {src.cols, src.rows, 1};
size_t global_thread[] = {(size_t)src.cols, (size_t)src.rows, 1};
int src_step = (int)(src_.step/src_.elemSize());
int dst_step = (int)(dst_.step/dst_.elemSize());
modules/superres/src/input_array_utility.cpp
+10 -10
View File
@@ -226,11 +226,11 @@ namespace
static const double maxVals[] =
{
numeric_limits<uchar>::max(),
numeric_limits<schar>::max(),
numeric_limits<ushort>::max(),
numeric_limits<short>::max(),
numeric_limits<int>::max(),
(double)numeric_limits<uchar>::max(),
(double)numeric_limits<schar>::max(),
(double)numeric_limits<ushort>::max(),
(double)numeric_limits<short>::max(),
(double)numeric_limits<int>::max(),
1.0,
1.0,
};
@@ -329,11 +329,11 @@ namespace
static const double maxVals[] =
{
std::numeric_limits<uchar>::max(),
std::numeric_limits<schar>::max(),
std::numeric_limits<ushort>::max(),
std::numeric_limits<short>::max(),
std::numeric_limits<int>::max(),
(double)std::numeric_limits<uchar>::max(),
(double)std::numeric_limits<schar>::max(),
(double)std::numeric_limits<ushort>::max(),
(double)std::numeric_limits<short>::max(),
(double)std::numeric_limits<int>::max(),
1.0,
1.0,
};