Skip to content

O
opencv
Commit b82c55de authored by Andrey Pavlenko's avatar Andrey Pavlenko Committed by OpenCV Buildbot
Browse files
Options

Merge pull request #1861 from ilya-lavrenov:ocl_args_fix

parents c1f59c4c 1af95ea1
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
modules/core/src/ocl.cpp
View file @ b82c55de
...@@ -1226,13 +1226,13 @@ struct UMat2D ...@@ -1226,13 +1226,13 @@ struct UMat2D
{ {
UMat2D(const UMat& m) UMat2D(const UMat& m)
{ {
offset = m.offset; offset = (int)m.offset;
step = m.step; step = (int)m.step;
rows = m.rows; rows = m.rows;
cols = m.cols; cols = m.cols;
} }
size_t offset; int offset;
size_t step; int step;
int rows; int rows;
int cols; int cols;
}; };
...@@ -1241,16 +1241,16 @@ struct UMat3D ...@@ -1241,16 +1241,16 @@ struct UMat3D
{ {
UMat3D(const UMat& m) UMat3D(const UMat& m)
{ {
offset = m.offset; offset = (int)m.offset;
step = m.step.p[1]; step = (int)m.step.p[1];
slicestep = m.step.p[0]; slicestep = (int)m.step.p[0];
slices = m.size.p[0]; slices = (int)m.size.p[0];
rows = m.size.p[1]; rows = m.size.p[1];
cols = m.size.p[2]; cols = m.size.p[2];
} }
size_t offset; int offset;
size_t slicestep; int slicestep;
size_t step; int step;
int slices; int slices;
int rows; int rows;
int cols; int cols;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment