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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Tony
2014-03-27 19:32:05 +00:00
parent 46ba9d30b9 e34a7caabc
commit 41b8ab086b
11 changed files with 274 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/highgui/src/grfmt_jpeg.cpp
View File

@@ -598,6 +598,7 @@ bool JpegEncoder::write( const Mat& img, const std::vector<int>& params )
cinfo.in_color_space = channels > 1 ? JCS_RGB : JCS_GRAYSCALE;
int quality = 95;
int progressive = 0;
for( size_t i = 0; i < params.size(); i += 2 )
{
@@ -606,11 +607,18 @@ bool JpegEncoder::write( const Mat& img, const std::vector<int>& params )
quality = params[i+1];
quality = MIN(MAX(quality, 0), 100);
}
if( params[i] == CV_IMWRITE_JPEG_PROGRESSIVE )
{
progressive = params[i+1];
}
}
jpeg_set_defaults( &cinfo );
jpeg_set_quality( &cinfo, quality,
TRUE /* limit to baseline-JPEG values */ );
if( progressive )
jpeg_simple_progression( &cinfo );
jpeg_start_compress( &cinfo, TRUE );
if( channels > 1 )