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

No output image resize in case of PNG dataset

Browse Source
This commit is contained in:
Grigory Serebryakov 2014-09-01 13:02:27 +04:00
parent 74d8527f8a
commit d1229efeec
2 changed files with 6 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
apps/haartraining/cvsamplesoutput.cpp
View File

@ -113,9 +113,9 @@ bool PngDatasetOutput::init( const char* annotationsListFileName )
} }
bool PngDatasetOutput::write( const CvMat& img, bool PngDatasetOutput::write( const CvMat& img,
const CvRect& boundingBox ) const CvRect& boundingBox )
{ {
CvRect bbox = scaleBoundingBox(cvGetSize(&img), boundingBox); CvRect bbox = addBoundingboxBorder(boundingBox);
sprintf( imgFileName, sprintf( imgFileName,
"%04d_%04d_%04d_%04d_%04d", "%04d_%04d_%04d_%04d_%04d",
@ -148,44 +148,16 @@ bool PngDatasetOutput::write( const CvMat& img,
bbox.y + bbox.height ); bbox.y + bbox.height );
fclose( annotationFile ); fclose( annotationFile );
writeImage(img); cvSaveImage( imgFullPath, &img);
return true; return true;
} }
void PngDatasetOutput::writeImage(const CvMat &img) const CvRect PngDatasetOutput::addBoundingboxBorder(const CvRect& bbox) const
{ {
CvSize origsize = cvGetSize(&img);
if( origsize.height > destImgHeight || origsize.width > destImgWidth )
{
CvMat result = cvMat( destImgHeight, destImgWidth, CV_8UC1,
cvAlloc( sizeof( uchar ) * destImgHeight * destImgWidth ) );
cvResize(&img, &result);
cvSaveImage( imgFullPath, &result );
cvFree( &(result.data.ptr) );
}
else
{
cvSaveImage( imgFullPath, &img);
}
return;
}
CvRect PngDatasetOutput::scaleBoundingBox(const CvSize& imgSize, const CvRect& bbox)
{
double scale = MAX( (float) destImgWidth / imgSize.width,
(float) destImgHeight / imgSize.height );
CvRect boundingBox = bbox; CvRect boundingBox = bbox;
int border = 5; int border = 5;
if( scale < 1. )
{
boundingBox.x = bbox.x * scale;
boundingBox.y = bbox.y * scale;
boundingBox.width = bbox.width * scale;
boundingBox.height = bbox.height * scale;
}
boundingBox.x -= border; boundingBox.x -= border;
boundingBox.y -= border; boundingBox.y -= border;
boundingBox.width += 2*border; boundingBox.width += 2*border;

5
apps/haartraining/cvsamplesoutput.h
View File

@ -20,10 +20,7 @@ private:
virtual bool init(const char* annotationsListFileName ); virtual bool init(const char* annotationsListFileName );
void writeImage( const CvMat& img ) const; CvRect addBoundingboxBorder(const CvRect& bbox) const;
CvRect scaleBoundingBox(const CvSize& imgSize,
const CvRect& bbox);
private: private:
char annotationFullPath[PATH_MAX]; char annotationFullPath[PATH_MAX];