potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Smorkalov
2026-05-25 16:29:45 +03:00
parent c2594b41bf e0d604378f
commit d8263a9899
54 changed files with 523 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgcodecs/src/grfmt_jpeg.cpp
+7 -3
View File
@@ -825,10 +825,12 @@ bool JpegEncoder::write( const Mat& img, const std::vector<int>& params )
if( (channels > 1) && ( sampling_factor != 0 ) )
{
cinfo.comp_info[0].v_samp_factor = (sampling_factor >> 16 ) & 0xF;
cinfo.comp_info[0].h_samp_factor = (sampling_factor >> 20 ) & 0xF;
cinfo.comp_info[1].v_samp_factor = 1;
cinfo.comp_info[1].h_samp_factor = 1;
cinfo.comp_info[0].v_samp_factor = (sampling_factor >> 16 ) & 0xF;
cinfo.comp_info[1].h_samp_factor = (sampling_factor >> 12 ) & 0xF;
cinfo.comp_info[1].v_samp_factor = (sampling_factor >> 8 ) & 0xF;
cinfo.comp_info[2].h_samp_factor = (sampling_factor >> 4 ) & 0xF;
cinfo.comp_info[2].v_samp_factor = (sampling_factor >> 0 ) & 0xF;
}
if (luma_quality >= 0 && chroma_quality >= 0)
@@ -843,6 +845,8 @@ bool JpegEncoder::write( const Mat& img, const std::vector<int>& params )
cinfo.comp_info[0].h_samp_factor = 1;
cinfo.comp_info[1].v_samp_factor = 1;
cinfo.comp_info[1].h_samp_factor = 1;
cinfo.comp_info[2].v_samp_factor = 1;
cinfo.comp_info[2].h_samp_factor = 1;
}
jpeg_default_qtables( &cinfo, TRUE );
#else