From 9124a76ae7d01b2d99cf29fa14d34af967bc35d2 Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Tue, 12 Feb 2013 18:07:22 +0400 Subject: [PATCH] converted moments function to C++ --- modules/imgproc/src/moments.cpp | 633 ++++++++++++-------------- modules/imgproc/test/test_moments.cpp | 2 + 2 files changed, 300 insertions(+), 335 deletions(-) diff --git a/modules/imgproc/src/moments.cpp b/modules/imgproc/src/moments.cpp index 784a61b8d..f197e17de 100644 --- a/modules/imgproc/src/moments.cpp +++ b/modules/imgproc/src/moments.cpp @@ -40,21 +40,22 @@ //M*/ #include "precomp.hpp" +namespace cv +{ + // The function calculates center of gravity and the central second order moments -static void icvCompleteMomentState( CvMoments* moments ) +static void completeMomentState( Moments* moments ) { double cx = 0, cy = 0; double mu20, mu11, mu02; assert( moments != 0 ); - moments->inv_sqrt_m00 = 0; if( fabs(moments->m00) > DBL_EPSILON ) { double inv_m00 = 1. / moments->m00; cx = moments->m10 * inv_m00; cy = moments->m01 * inv_m00; - moments->inv_sqrt_m00 = std::sqrt( fabs(inv_m00) ); } // mu20 = m20 - m10*cx @@ -80,115 +81,111 @@ static void icvCompleteMomentState( CvMoments* moments ) } -static void icvContourMoments( CvSeq* contour, CvMoments* moments ) +static Moments contourMoments( const Mat& contour ) { - int is_float = CV_SEQ_ELTYPE(contour) == CV_32FC2; + Moments m; + int lpt = contour.checkVector(2); + int is_float = contour.depth() == CV_32F; + const Point* ptsi = (const Point*)contour.data; + const Point2f* ptsf = (const Point2f*)contour.data; - if( contour->total ) + CV_Assert( contour.depth() == CV_32S || contour.depth() == CV_32F ); + + if( lpt == 0 ) + return m; + + double a00 = 0, a10 = 0, a01 = 0, a20 = 0, a11 = 0, a02 = 0, a30 = 0, a21 = 0, a12 = 0, a03 = 0; + double xi, yi, xi2, yi2, xi_1, yi_1, xi_12, yi_12, dxy, xii_1, yii_1; + + if( !is_float ) { - CvSeqReader reader; - double a00, a10, a01, a20, a11, a02, a30, a21, a12, a03; - double xi, yi, xi2, yi2, xi_1, yi_1, xi_12, yi_12, dxy, xii_1, yii_1; - int lpt = contour->total; + xi_1 = ptsi[lpt-1].x; + yi_1 = ptsi[lpt-1].y; + } + else + { + xi_1 = ptsf[lpt-1].x; + yi_1 = ptsf[lpt-1].y; + } - a00 = a10 = a01 = a20 = a11 = a02 = a30 = a21 = a12 = a03 = 0; - - cvStartReadSeq( contour, &reader, 0 ); + xi_12 = xi_1 * xi_1; + yi_12 = yi_1 * yi_1; + for( int i = 0; i < lpt; i++ ) + { if( !is_float ) { - xi_1 = ((CvPoint*)(reader.ptr))->x; - yi_1 = ((CvPoint*)(reader.ptr))->y; + xi = ptsi[i].x; + yi = ptsi[i].y; } else { - xi_1 = ((CvPoint2D32f*)(reader.ptr))->x; - yi_1 = ((CvPoint2D32f*)(reader.ptr))->y; - } - CV_NEXT_SEQ_ELEM( contour->elem_size, reader ); - - xi_12 = xi_1 * xi_1; - yi_12 = yi_1 * yi_1; - - while( lpt-- > 0 ) - { - if( !is_float ) - { - xi = ((CvPoint*)(reader.ptr))->x; - yi = ((CvPoint*)(reader.ptr))->y; - } - else - { - xi = ((CvPoint2D32f*)(reader.ptr))->x; - yi = ((CvPoint2D32f*)(reader.ptr))->y; - } - CV_NEXT_SEQ_ELEM( contour->elem_size, reader ); - - xi2 = xi * xi; - yi2 = yi * yi; - dxy = xi_1 * yi - xi * yi_1; - xii_1 = xi_1 + xi; - yii_1 = yi_1 + yi; - - a00 += dxy; - a10 += dxy * xii_1; - a01 += dxy * yii_1; - a20 += dxy * (xi_1 * xii_1 + xi2); - a11 += dxy * (xi_1 * (yii_1 + yi_1) + xi * (yii_1 + yi)); - a02 += dxy * (yi_1 * yii_1 + yi2); - a30 += dxy * xii_1 * (xi_12 + xi2); - a03 += dxy * yii_1 * (yi_12 + yi2); - a21 += - dxy * (xi_12 * (3 * yi_1 + yi) + 2 * xi * xi_1 * yii_1 + - xi2 * (yi_1 + 3 * yi)); - a12 += - dxy * (yi_12 * (3 * xi_1 + xi) + 2 * yi * yi_1 * xii_1 + - yi2 * (xi_1 + 3 * xi)); - - xi_1 = xi; - yi_1 = yi; - xi_12 = xi2; - yi_12 = yi2; + xi = ptsf[i].x; + yi = ptsf[i].y; } - double db1_2, db1_6, db1_12, db1_24, db1_20, db1_60; + xi2 = xi * xi; + yi2 = yi * yi; + dxy = xi_1 * yi - xi * yi_1; + xii_1 = xi_1 + xi; + yii_1 = yi_1 + yi; - if( fabs(a00) > FLT_EPSILON ) - { - if( a00 > 0 ) - { - db1_2 = 0.5; - db1_6 = 0.16666666666666666666666666666667; - db1_12 = 0.083333333333333333333333333333333; - db1_24 = 0.041666666666666666666666666666667; - db1_20 = 0.05; - db1_60 = 0.016666666666666666666666666666667; - } - else - { - db1_2 = -0.5; - db1_6 = -0.16666666666666666666666666666667; - db1_12 = -0.083333333333333333333333333333333; - db1_24 = -0.041666666666666666666666666666667; - db1_20 = -0.05; - db1_60 = -0.016666666666666666666666666666667; - } - - // spatial moments - moments->m00 = a00 * db1_2; - moments->m10 = a10 * db1_6; - moments->m01 = a01 * db1_6; - moments->m20 = a20 * db1_12; - moments->m11 = a11 * db1_24; - moments->m02 = a02 * db1_12; - moments->m30 = a30 * db1_20; - moments->m21 = a21 * db1_60; - moments->m12 = a12 * db1_60; - moments->m03 = a03 * db1_20; - - icvCompleteMomentState( moments ); - } + a00 += dxy; + a10 += dxy * xii_1; + a01 += dxy * yii_1; + a20 += dxy * (xi_1 * xii_1 + xi2); + a11 += dxy * (xi_1 * (yii_1 + yi_1) + xi * (yii_1 + yi)); + a02 += dxy * (yi_1 * yii_1 + yi2); + a30 += dxy * xii_1 * (xi_12 + xi2); + a03 += dxy * yii_1 * (yi_12 + yi2); + a21 += dxy * (xi_12 * (3 * yi_1 + yi) + 2 * xi * xi_1 * yii_1 + + xi2 * (yi_1 + 3 * yi)); + a12 += dxy * (yi_12 * (3 * xi_1 + xi) + 2 * yi * yi_1 * xii_1 + + yi2 * (xi_1 + 3 * xi)); + xi_1 = xi; + yi_1 = yi; + xi_12 = xi2; + yi_12 = yi2; } + + if( fabs(a00) > FLT_EPSILON ) + { + double db1_2, db1_6, db1_12, db1_24, db1_20, db1_60; + + if( a00 > 0 ) + { + db1_2 = 0.5; + db1_6 = 0.16666666666666666666666666666667; + db1_12 = 0.083333333333333333333333333333333; + db1_24 = 0.041666666666666666666666666666667; + db1_20 = 0.05; + db1_60 = 0.016666666666666666666666666666667; + } + else + { + db1_2 = -0.5; + db1_6 = -0.16666666666666666666666666666667; + db1_12 = -0.083333333333333333333333333333333; + db1_24 = -0.041666666666666666666666666666667; + db1_20 = -0.05; + db1_60 = -0.016666666666666666666666666666667; + } + + // spatial moments + m.m00 = a00 * db1_2; + m.m10 = a10 * db1_6; + m.m01 = a01 * db1_6; + m.m20 = a20 * db1_12; + m.m11 = a11 * db1_24; + m.m02 = a02 * db1_12; + m.m30 = a30 * db1_20; + m.m21 = a21 * db1_60; + m.m12 = a12 * db1_60; + m.m03 = a03 * db1_20; + + completeMomentState( &m ); + } + return m; } @@ -197,9 +194,9 @@ static void icvContourMoments( CvSeq* contour, CvMoments* moments ) \****************************************************************************************/ template -static void momentsInTile( const cv::Mat& img, double* moments ) +static void momentsInTile( const Mat& img, double* moments ) { - cv::Size size = img.size(); + Size size = img.size(); int x, y; MT mom[10] = {0,0,0,0,0,0,0,0,0,0}; @@ -247,10 +244,10 @@ template<> void momentsInTile( const cv::Mat& img, double* mome typedef uchar T; typedef int WT; typedef int MT; - cv::Size size = img.size(); + Size size = img.size(); int y; MT mom[10] = {0,0,0,0,0,0,0,0,0,0}; - bool useSIMD = cv::checkHardwareSupport(CV_CPU_SSE2); + bool useSIMD = checkHardwareSupport(CV_CPU_SSE2); for( y = 0; y < size.height; y++ ) { @@ -318,233 +315,7 @@ template<> void momentsInTile( const cv::Mat& img, double* mome #endif -typedef void (*CvMomentsInTileFunc)(const cv::Mat& img, double* moments); - -CV_IMPL void cvMoments( const void* array, CvMoments* moments, int binary ) -{ - const int TILE_SIZE = 32; - int type, depth, cn, coi = 0; - CvMat stub, *mat = (CvMat*)array; - CvMomentsInTileFunc func = 0; - CvContour contourHeader; - CvSeq* contour = 0; - CvSeqBlock block; - double buf[TILE_SIZE*TILE_SIZE]; - uchar nzbuf[TILE_SIZE*TILE_SIZE]; - - if( CV_IS_SEQ( array )) - { - contour = (CvSeq*)array; - if( !CV_IS_SEQ_POINT_SET( contour )) - CV_Error( CV_StsBadArg, "The passed sequence is not a valid contour" ); - } - - if( !moments ) - CV_Error( CV_StsNullPtr, "" ); - - memset( moments, 0, sizeof(*moments)); - - if( !contour ) - { - mat = cvGetMat( mat, &stub, &coi ); - type = CV_MAT_TYPE( mat->type ); - - if( type == CV_32SC2 || type == CV_32FC2 ) - { - contour = cvPointSeqFromMat( - CV_SEQ_KIND_CURVE | CV_SEQ_FLAG_CLOSED, - mat, &contourHeader, &block ); - } - } - - if( contour ) - { - icvContourMoments( contour, moments ); - return; - } - - type = CV_MAT_TYPE( mat->type ); - depth = CV_MAT_DEPTH( type ); - cn = CV_MAT_CN( type ); - - cv::Size size = cvGetMatSize( mat ); - - if( cn > 1 && coi == 0 ) - CV_Error( CV_StsBadArg, "Invalid image type" ); - - if( size.width <= 0 || size.height <= 0 ) - return; - - if( binary || depth == CV_8U ) - func = momentsInTile; - else if( depth == CV_16U ) - func = momentsInTile; - else if( depth == CV_16S ) - func = momentsInTile; - else if( depth == CV_32F ) - func = momentsInTile; - else if( depth == CV_64F ) - func = momentsInTile; - else - CV_Error( CV_StsUnsupportedFormat, "" ); - - cv::Mat src0(mat); - - for( int y = 0; y < size.height; y += TILE_SIZE ) - { - cv::Size tileSize; - tileSize.height = std::min(TILE_SIZE, size.height - y); - - for( int x = 0; x < size.width; x += TILE_SIZE ) - { - tileSize.width = std::min(TILE_SIZE, size.width - x); - cv::Mat src(src0, cv::Rect(x, y, tileSize.width, tileSize.height)); - - if( coi > 0 ) - { - cv::Mat tmp(tileSize, depth, buf); - int pairs[] = {coi-1, 0}; - cv::mixChannels(&src, 1, &tmp, 1, pairs, 1); - src = tmp; - } - if( binary ) - { - cv::Mat tmp(tileSize, CV_8U, nzbuf); - cv::compare( src, 0, tmp, CV_CMP_NE ); - src = tmp; - } - - double mom[10]; - func( src, mom ); - - if(binary) - { - double s = 1./255; - for( int k = 0; k < 10; k++ ) - mom[k] *= s; - } - - double xm = x * mom[0], ym = y * mom[0]; - - // accumulate moments computed in each tile - - // + m00 ( = m00' ) - moments->m00 += mom[0]; - - // + m10 ( = m10' + x*m00' ) - moments->m10 += mom[1] + xm; - - // + m01 ( = m01' + y*m00' ) - moments->m01 += mom[2] + ym; - - // + m20 ( = m20' + 2*x*m10' + x*x*m00' ) - moments->m20 += mom[3] + x * (mom[1] * 2 + xm); - - // + m11 ( = m11' + x*m01' + y*m10' + x*y*m00' ) - moments->m11 += mom[4] + x * (mom[2] + ym) + y * mom[1]; - - // + m02 ( = m02' + 2*y*m01' + y*y*m00' ) - moments->m02 += mom[5] + y * (mom[2] * 2 + ym); - - // + m30 ( = m30' + 3*x*m20' + 3*x*x*m10' + x*x*x*m00' ) - moments->m30 += mom[6] + x * (3. * mom[3] + x * (3. * mom[1] + xm)); - - // + m21 ( = m21' + x*(2*m11' + 2*y*m10' + x*m01' + x*y*m00') + y*m20') - moments->m21 += mom[7] + x * (2 * (mom[4] + y * mom[1]) + x * (mom[2] + ym)) + y * mom[3]; - - // + m12 ( = m12' + y*(2*m11' + 2*x*m01' + y*m10' + x*y*m00') + x*m02') - moments->m12 += mom[8] + y * (2 * (mom[4] + x * mom[2]) + y * (mom[1] + xm)) + x * mom[5]; - - // + m03 ( = m03' + 3*y*m02' + 3*y*y*m01' + y*y*y*m00' ) - moments->m03 += mom[9] + y * (3. * mom[5] + y * (3. * mom[2] + ym)); - } - } - - icvCompleteMomentState( moments ); -} - - -CV_IMPL void cvGetHuMoments( CvMoments * mState, CvHuMoments * HuState ) -{ - if( !mState || !HuState ) - CV_Error( CV_StsNullPtr, "" ); - - double m00s = mState->inv_sqrt_m00, m00 = m00s * m00s, s2 = m00 * m00, s3 = s2 * m00s; - - double nu20 = mState->mu20 * s2, - nu11 = mState->mu11 * s2, - nu02 = mState->mu02 * s2, - nu30 = mState->mu30 * s3, - nu21 = mState->mu21 * s3, nu12 = mState->mu12 * s3, nu03 = mState->mu03 * s3; - - double t0 = nu30 + nu12; - double t1 = nu21 + nu03; - - double q0 = t0 * t0, q1 = t1 * t1; - - double n4 = 4 * nu11; - double s = nu20 + nu02; - double d = nu20 - nu02; - - HuState->hu1 = s; - HuState->hu2 = d * d + n4 * nu11; - HuState->hu4 = q0 + q1; - HuState->hu6 = d * (q0 - q1) + n4 * t0 * t1; - - t0 *= q0 - 3 * q1; - t1 *= 3 * q0 - q1; - - q0 = nu30 - 3 * nu12; - q1 = 3 * nu21 - nu03; - - HuState->hu3 = q0 * q0 + q1 * q1; - HuState->hu5 = q0 * t0 + q1 * t1; - HuState->hu7 = q1 * t0 - q0 * t1; -} - - -CV_IMPL double cvGetSpatialMoment( CvMoments * moments, int x_order, int y_order ) -{ - int order = x_order + y_order; - - if( !moments ) - CV_Error( CV_StsNullPtr, "" ); - if( (x_order | y_order) < 0 || order > 3 ) - CV_Error( CV_StsOutOfRange, "" ); - - return (&(moments->m00))[order + (order >> 1) + (order > 2) * 2 + y_order]; -} - - -CV_IMPL double cvGetCentralMoment( CvMoments * moments, int x_order, int y_order ) -{ - int order = x_order + y_order; - - if( !moments ) - CV_Error( CV_StsNullPtr, "" ); - if( (x_order | y_order) < 0 || order > 3 ) - CV_Error( CV_StsOutOfRange, "" ); - - return order >= 2 ? (&(moments->m00))[4 + order * 3 + y_order] : - order == 0 ? moments->m00 : 0; -} - - -CV_IMPL double cvGetNormalizedCentralMoment( CvMoments * moments, int x_order, int y_order ) -{ - int order = x_order + y_order; - - double mu = cvGetCentralMoment( moments, x_order, y_order ); - double m00s = moments->inv_sqrt_m00; - - while( --order >= 0 ) - mu *= m00s; - return mu * m00s * m00s; -} - - -namespace cv -{ +typedef void (*MomentsInTileFunc)(const Mat& img, double* moments); Moments::Moments() { @@ -604,15 +375,113 @@ Moments::operator CvMoments() const } -cv::Moments cv::moments( InputArray _array, bool binaryImage ) + +cv::Moments cv::moments( InputArray _src, bool binary ) { - CvMoments om; - Mat arr = _array.getMat(); - CvMat c_array = arr; - cvMoments(&c_array, &om, binaryImage); - return om; + const int TILE_SIZE = 32; + Mat mat = _src.getMat(); + MomentsInTileFunc func = 0; + double buf[TILE_SIZE*TILE_SIZE]; + uchar nzbuf[TILE_SIZE*TILE_SIZE]; + Moments m; + int type = mat.type(); + int depth = CV_MAT_DEPTH( type ); + int cn = CV_MAT_CN( type ); + + if( mat.checkVector(2) >= 0 && (depth == CV_32F || depth == CV_32S)) + return contourMoments(mat); + + Size size = mat.size(); + + if( cn > 1 ) + CV_Error( CV_StsBadArg, "Invalid image type" ); + + if( size.width <= 0 || size.height <= 0 ) + return m; + + if( binary || depth == CV_8U ) + func = momentsInTile; + else if( depth == CV_16U ) + func = momentsInTile; + else if( depth == CV_16S ) + func = momentsInTile; + else if( depth == CV_32F ) + func = momentsInTile; + else if( depth == CV_64F ) + func = momentsInTile; + else + CV_Error( CV_StsUnsupportedFormat, "" ); + + Mat src0(mat); + + for( int y = 0; y < size.height; y += TILE_SIZE ) + { + Size tileSize; + tileSize.height = std::min(TILE_SIZE, size.height - y); + + for( int x = 0; x < size.width; x += TILE_SIZE ) + { + tileSize.width = std::min(TILE_SIZE, size.width - x); + Mat src(src0, cv::Rect(x, y, tileSize.width, tileSize.height)); + + if( binary ) + { + cv::Mat tmp(tileSize, CV_8U, nzbuf); + cv::compare( src, 0, tmp, CV_CMP_NE ); + src = tmp; + } + + double mom[10]; + func( src, mom ); + + if(binary) + { + double s = 1./255; + for( int k = 0; k < 10; k++ ) + mom[k] *= s; + } + + double xm = x * mom[0], ym = y * mom[0]; + + // accumulate moments computed in each tile + + // + m00 ( = m00' ) + m.m00 += mom[0]; + + // + m10 ( = m10' + x*m00' ) + m.m10 += mom[1] + xm; + + // + m01 ( = m01' + y*m00' ) + m.m01 += mom[2] + ym; + + // + m20 ( = m20' + 2*x*m10' + x*x*m00' ) + m.m20 += mom[3] + x * (mom[1] * 2 + xm); + + // + m11 ( = m11' + x*m01' + y*m10' + x*y*m00' ) + m.m11 += mom[4] + x * (mom[2] + ym) + y * mom[1]; + + // + m02 ( = m02' + 2*y*m01' + y*y*m00' ) + m.m02 += mom[5] + y * (mom[2] * 2 + ym); + + // + m30 ( = m30' + 3*x*m20' + 3*x*x*m10' + x*x*x*m00' ) + m.m30 += mom[6] + x * (3. * mom[3] + x * (3. * mom[1] + xm)); + + // + m21 ( = m21' + x*(2*m11' + 2*y*m10' + x*m01' + x*y*m00') + y*m20') + m.m21 += mom[7] + x * (2 * (mom[4] + y * mom[1]) + x * (mom[2] + ym)) + y * mom[3]; + + // + m12 ( = m12' + y*(2*m11' + 2*x*m01' + y*m10' + x*y*m00') + x*m02') + m.m12 += mom[8] + y * (2 * (mom[4] + x * mom[2]) + y * (mom[1] + xm)) + x * mom[5]; + + // + m03 ( = m03' + 3*y*m02' + 3*y*y*m01' + y*y*y*m00' ) + m.m03 += mom[9] + y * (3. * mom[5] + y * (3. * mom[2] + ym)); + } + } + + completeMomentState( &m ); + return m; } + void cv::HuMoments( const Moments& m, double hu[7] ) { double t0 = m.nu30 + m.nu12; @@ -648,4 +517,98 @@ void cv::HuMoments( const Moments& m, OutputArray _hu ) HuMoments(m, (double*)hu.data); } + +CV_IMPL void cvMoments( const CvArr* arr, CvMoments* moments, int binary ) +{ + const IplImage* img = (const IplImage*)arr; + cv::Mat src; + if( CV_IS_IMAGE(arr) && img->roi && img->roi->coi > 0 ) + cv::extractImageCOI(arr, src, img->roi->coi-1); + else + src = cv::cvarrToMat(arr); + cv::Moments m = cv::moments(src, binary != 0); + CV_Assert( moments != 0 ); + *moments = m; +} + + +CV_IMPL double cvGetSpatialMoment( CvMoments * moments, int x_order, int y_order ) +{ + int order = x_order + y_order; + + if( !moments ) + CV_Error( CV_StsNullPtr, "" ); + if( (x_order | y_order) < 0 || order > 3 ) + CV_Error( CV_StsOutOfRange, "" ); + + return (&(moments->m00))[order + (order >> 1) + (order > 2) * 2 + y_order]; +} + + +CV_IMPL double cvGetCentralMoment( CvMoments * moments, int x_order, int y_order ) +{ + int order = x_order + y_order; + + if( !moments ) + CV_Error( CV_StsNullPtr, "" ); + if( (x_order | y_order) < 0 || order > 3 ) + CV_Error( CV_StsOutOfRange, "" ); + + return order >= 2 ? (&(moments->m00))[4 + order * 3 + y_order] : + order == 0 ? moments->m00 : 0; +} + + +CV_IMPL double cvGetNormalizedCentralMoment( CvMoments * moments, int x_order, int y_order ) +{ + int order = x_order + y_order; + + double mu = cvGetCentralMoment( moments, x_order, y_order ); + double m00s = moments->inv_sqrt_m00; + + while( --order >= 0 ) + mu *= m00s; + return mu * m00s * m00s; +} + + +CV_IMPL void cvGetHuMoments( CvMoments * mState, CvHuMoments * HuState ) +{ + if( !mState || !HuState ) + CV_Error( CV_StsNullPtr, "" ); + + double m00s = mState->inv_sqrt_m00, m00 = m00s * m00s, s2 = m00 * m00, s3 = s2 * m00s; + + double nu20 = mState->mu20 * s2, + nu11 = mState->mu11 * s2, + nu02 = mState->mu02 * s2, + nu30 = mState->mu30 * s3, + nu21 = mState->mu21 * s3, nu12 = mState->mu12 * s3, nu03 = mState->mu03 * s3; + + double t0 = nu30 + nu12; + double t1 = nu21 + nu03; + + double q0 = t0 * t0, q1 = t1 * t1; + + double n4 = 4 * nu11; + double s = nu20 + nu02; + double d = nu20 - nu02; + + HuState->hu1 = s; + HuState->hu2 = d * d + n4 * nu11; + HuState->hu4 = q0 + q1; + HuState->hu6 = d * (q0 - q1) + n4 * t0 * t1; + + t0 *= q0 - 3 * q1; + t1 *= 3 * q0 - q1; + + q0 = nu30 - 3 * nu12; + q1 = 3 * nu21 - nu03; + + HuState->hu3 = q0 * q0 + q1 * q1; + HuState->hu5 = q0 * t0 + q1 * t1; + HuState->hu7 = q1 * t0 - q0 * t1; +} + + /* End of file. */ diff --git a/modules/imgproc/test/test_moments.cpp b/modules/imgproc/test/test_moments.cpp index 17a46cf72..c58d1f53b 100644 --- a/modules/imgproc/test/test_moments.cpp +++ b/modules/imgproc/test/test_moments.cpp @@ -111,6 +111,8 @@ void CV_MomentsTest::get_test_array_types_and_sizes( int test_case_idx, types[INPUT][0] = CV_MAKETYPE(depth, cn); types[OUTPUT][0] = types[REF_OUTPUT][0] = CV_64FC1; sizes[OUTPUT][0] = sizes[REF_OUTPUT][0] = cvSize(MOMENT_COUNT,1); + if(CV_MAT_DEPTH(types[INPUT][0])>=CV_32S) + sizes[INPUT][0].width = MAX(sizes[INPUT][0].width, 3); is_binary = cvtest::randInt(rng) % 2 != 0; coi = 0;