Merge pull request #3656 from SeninAndrew:master

This commit is contained in:
Vadim Pisarevsky
2015-02-06 11:49:27 +00:00

View File

@@ -301,8 +301,10 @@ void HOGDescriptor::computeGradient(const Mat& img, Mat& grad, Mat& qangle,
for( y = 0; y < gradsize.height; y++ ) for( y = 0; y < gradsize.height; y++ )
{ {
const uchar* imgPtr = img.ptr(ymap[y]); const uchar* imgPtr = img.ptr(ymap[y]);
const uchar* prevPtr = img.ptr(ymap[y-1]); //In case subimage is used ptr() generates an assert for next and prev rows
const uchar* nextPtr = img.ptr(ymap[y+1]); //(see http://code.opencv.org/issues/4149)
const uchar* prevPtr = img.data + img.step*ymap[y-1];
const uchar* nextPtr = img.data + img.step*ymap[y+1];
float* gradPtr = grad.ptr<float>(y); float* gradPtr = grad.ptr<float>(y);
uchar* qanglePtr = qangle.ptr(y); uchar* qanglePtr = qangle.ptr(y);