generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed drawing test

Browse Source
This commit is contained in:
Vadim Pisarevsky
2011-06-02 12:45:00 +00:00
parent c8544f393b
commit ddd8f897fe
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/core/src/stat.cpp
View File

@@ -1113,6 +1113,9 @@ double cv::norm( const InputArray& _src, int normType, const InputArray& _mask )
double cv::norm( const InputArray& _src1, const InputArray& _src2, int normType, const InputArray& _mask )
{
if( normType & CV_RELATIVE )
return norm(_src1, _src2, normType & ~CV_RELATIVE, _mask)/(norm(_src2, normType, _mask) + DBL_EPSILON);
Mat src1 = _src1.getMat(), src2 = _src2.getMat(), mask = _mask.getMat();
int depth = src1.depth(), cn = src1.channels();

19
modules/highgui/test/test_drawing.cpp
View File

@@ -49,7 +49,7 @@ using namespace cv;
class CV_DrawingTest : public cvtest::BaseTest
{
public:
CV_DrawingTest( const char* testName ){}
CV_DrawingTest(){}
protected:
void run( int );
virtual void draw( Mat& img ) = 0;
@@ -65,14 +65,12 @@ void CV_DrawingTest::run( int )
draw( testImg );
#ifdef DRAW_TEST_IMAGE
imwrite( filename, testImg );
#else
valImg = imread( filename );
if( valImg.empty() )
{
ts->printf( ts->LOG, "test image can not be read");
ts->set_failed_test_info(cvtest::TS::FAIL_INVALID_TEST_DATA);
imwrite( filename, testImg );
//ts->printf( ts->LOG, "test image can not be read");
//ts->set_failed_test_info(cvtest::TS::FAIL_INVALID_TEST_DATA);
}
else
{
@@ -88,11 +86,10 @@ void CV_DrawingTest::run( int )
ts->set_failed_test_info(checkLineIterator( testImg ));
}
}
#endif
ts->set_failed_test_info(cvtest::TS::OK);
}
class CV_DrawingTest_CPP : public cvtest::BaseTest
class CV_DrawingTest_CPP : public CV_DrawingTest
{
public:
CV_DrawingTest_CPP() {}
@@ -241,7 +238,7 @@ int CV_DrawingTest_CPP::checkLineIterator( Mat& img )
return 0;
}
class CV_DrawingTest_C : public cvtest::BaseTest
class CV_DrawingTest_C : public CV_DrawingTest
{
public:
CV_DrawingTest_C() {}
@@ -408,6 +405,6 @@ int CV_DrawingTest_C::checkLineIterator( Mat& _img )
return 0;
}
//TEST(Highgui_Drawing_CPP, regression) { CV_DrawingTest_CPP test; test.safe_run(); }
//TEST(Highgui_Drawing_C, regression) { CV_DrawingTest_C test; test.safe_run(); }
TEST(Highgui_Drawing_CPP, regression) { CV_DrawingTest_CPP test; test.safe_run(); }
TEST(Highgui_Drawing_C, regression) { CV_DrawingTest_C test; test.safe_run(); }