Skip to content

O
opencv_contrib
Commit a56d282f authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #2283 from tolysz:patch-1

parents a8c7a56b a9639b2b
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 9 deletions
modules/cudalegacy/include/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
View file @ a56d282f
...@@ -84,10 +84,11 @@ struct HaarFeature64 ...@@ -84,10 +84,11 @@ struct HaarFeature64
__host__ NCVStatus setRect(Ncv32u rectX, Ncv32u rectY, Ncv32u rectWidth, Ncv32u rectHeight, Ncv32u /*clsWidth*/, Ncv32u /*clsHeight*/) __host__ NCVStatus setRect(Ncv32u rectX, Ncv32u rectY, Ncv32u rectWidth, Ncv32u rectHeight, Ncv32u /*clsWidth*/, Ncv32u /*clsHeight*/)
{ {
ncvAssertReturn(rectWidth <= HaarFeature64_CreateCheck_MaxRectField && rectHeight <= HaarFeature64_CreateCheck_MaxRectField, NCV_HAAR_TOO_LARGE_FEATURES); ncvAssertReturn(rectWidth <= HaarFeature64_CreateCheck_MaxRectField && rectHeight <= HaarFeature64_CreateCheck_MaxRectField, NCV_HAAR_TOO_LARGE_FEATURES);
((NcvRect8u*)&(this->_ui2.x))->x = (Ncv8u)rectX; NcvRect8u* tmpRect = (NcvRect8u*)&this->_ui2.x;
((NcvRect8u*)&(this->_ui2.x))->y = (Ncv8u)rectY; tmpRect->x = (Ncv8u)rectX;
((NcvRect8u*)&(this->_ui2.x))->width = (Ncv8u)rectWidth; tmpRect->y = (Ncv8u)rectY;
((NcvRect8u*)&(this->_ui2.x))->height = (Ncv8u)rectHeight; tmpRect->width = (Ncv8u)rectWidth;
tmpRect->height = (Ncv8u)rectHeight;
return NCV_SUCCESS; return NCV_SUCCESS;
} }
...@@ -99,11 +100,11 @@ struct HaarFeature64 ...@@ -99,11 +100,11 @@ struct HaarFeature64
__device__ __host__ void getRect(Ncv32u *rectX, Ncv32u *rectY, Ncv32u *rectWidth, Ncv32u *rectHeight) __device__ __host__ void getRect(Ncv32u *rectX, Ncv32u *rectY, Ncv32u *rectWidth, Ncv32u *rectHeight)
{ {
NcvRect8u tmpRect = *(NcvRect8u*)(&this->_ui2.x); NcvRect8u* tmpRect = (NcvRect8u*)&this->_ui2.x;
*rectX = tmpRect.x; *rectX = tmpRect->x;
*rectY = tmpRect.y; *rectY = tmpRect->y;
*rectWidth = tmpRect.width; *rectWidth = tmpRect->width;
*rectHeight = tmpRect.height; *rectHeight = tmpRect->height;
} }
__device__ __host__ Ncv32f getWeight(void) __device__ __host__ Ncv32f getWeight(void)
......
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