Attachment #392336 for bug #533470

View | Details | Raw Unified | Return to bug 533470
Collapse All | Expand All

Lines 181-188 Link Here

(-)a/extra/kipi-plugins/common/libkipiplugins/tools/imageio/kpwriteimage.cpp (-2 / +2 lines)
181	cinfo.comp_info[2].v_samp_factor = 1;	181	cinfo.comp_info[2].v_samp_factor = 1;
182		182
183	// bug #154273: use 99 compression level instead 100 to reduce output JPEG file size.	183	// bug #154273: use 99 compression level instead 100 to reduce output JPEG file size.
184	jpeg_set_quality(&cinfo, 99, true);	184	jpeg_set_quality(&cinfo, 99, boolean (true));
185	jpeg_start_compress(&cinfo, true);	185	jpeg_start_compress(&cinfo, boolean(true));
186		186
187	// Write ICC color profile.	187	// Write ICC color profile.
188	if (!d->iccProfile.isEmpty())	188	if (!d->iccProfile.isEmpty())




    JCOPY_OPTION copyoption = JCOPYOPT_ALL;
    jpeg_transform_info transformoption;

    transformoption.perfect         = boolean(false);
    transformoption.force_grayscale = boolean(false);
    transformoption.trim            = boolean(false);
    transformoption.crop            = boolean(false);

    struct jpeg_decompress_struct srcinfo;
    struct jpeg_compress_struct dstinfo;

    kp_jpeg_qiodevice_src(&srcinfo, &input_file);
    jcopy_markers_setup(&srcinfo, copyoption);

    (void) jpeg_read_header(&srcinfo, boolean(true));

    // First rotate - execute even if rotate is JXFORM_NONE to apply new EXIF settings
    transformoption.transform = rotate;

    kp_jpeg_qiodevice_dest(&dstinfo, &output_file);

    // Do not write a JFIF header if previously the image did not contain it
    dstinfo.write_JFIF_header = boolean(false);

    // Start compressor (note no image data is actually written here)
    dstinfo.optimize_coding   = boolean(true);
    jpeg_write_coefficients(&dstinfo, dst_coef_arrays);

    // Copy to the output file any extra markers that we want to preserve

        kp_jpeg_qiodevice_src(&srcinfo, &input_file);
        jcopy_markers_setup(&srcinfo, copyoption);

        (void) jpeg_read_header(&srcinfo, boolean(true));

        transformoption.transform=flip;
        jtransform_request_workspace(&srcinfo, &transformoption);

        kp_jpeg_qiodevice_dest(&dstinfo, &output_file);

        // Do not write a JFIF header if previously the image did not contain it
        dstinfo.write_JFIF_header = boolean(false);

        // Start compressor (note no image data is actually written here)
        dstinfo.optimize_coding   = boolean(true);
        jpeg_write_coefficients(&dstinfo, dst_coef_arrays);

        // Copy to the output file any extra markers that we want to preserve

Return to bug 533470

Lines 197-206 Link Here

(-)a/extra/kipi-plugins/jpeglossless/transform/jpegtransform.cpp (-10 / +10 lines)
197	JCOPY_OPTION copyoption = JCOPYOPT_ALL;	197	JCOPY_OPTION copyoption = JCOPYOPT_ALL;
198	jpeg_transform_info transformoption;	198	jpeg_transform_info transformoption;
199		199
200	transformoption.perfect = false;	200	transformoption.perfect = boolean(false);
201	transformoption.force_grayscale = false;	201	transformoption.force_grayscale = boolean(false);
202	transformoption.trim = false;	202	transformoption.trim = boolean(false);
203	transformoption.crop = false;	203	transformoption.crop = boolean(false);
204		204
205	struct jpeg_decompress_struct srcinfo;	205	struct jpeg_decompress_struct srcinfo;
206	struct jpeg_compress_struct dstinfo;	206	struct jpeg_compress_struct dstinfo;
Lines 277-283 Link Here
277	kp_jpeg_qiodevice_src(&srcinfo, &input_file);	277	kp_jpeg_qiodevice_src(&srcinfo, &input_file);
278	jcopy_markers_setup(&srcinfo, copyoption);	278	jcopy_markers_setup(&srcinfo, copyoption);
279		279
280	(void) jpeg_read_header(&srcinfo, true);	280	(void) jpeg_read_header(&srcinfo, boolean(true));
281		281
282	// First rotate - execute even if rotate is JXFORM_NONE to apply new EXIF settings	282	// First rotate - execute even if rotate is JXFORM_NONE to apply new EXIF settings
283	transformoption.transform = rotate;	283	transformoption.transform = rotate;
Lines 296-305 Link Here
296	kp_jpeg_qiodevice_dest(&dstinfo, &output_file);	296	kp_jpeg_qiodevice_dest(&dstinfo, &output_file);
297		297
298	// Do not write a JFIF header if previously the image did not contain it	298	// Do not write a JFIF header if previously the image did not contain it
299	dstinfo.write_JFIF_header = false;	299	dstinfo.write_JFIF_header = boolean(false);
300		300
301	// Start compressor (note no image data is actually written here)	301	// Start compressor (note no image data is actually written here)
302	dstinfo.optimize_coding = true;	302	dstinfo.optimize_coding = boolean(true);
303	jpeg_write_coefficients(&dstinfo, dst_coef_arrays);	303	jpeg_write_coefficients(&dstinfo, dst_coef_arrays);
304		304
305	// Copy to the output file any extra markers that we want to preserve	305	// Copy to the output file any extra markers that we want to preserve
Lines 349-355 Link Here
349	kp_jpeg_qiodevice_src(&srcinfo, &input_file);	349	kp_jpeg_qiodevice_src(&srcinfo, &input_file);
350	jcopy_markers_setup(&srcinfo, copyoption);	350	jcopy_markers_setup(&srcinfo, copyoption);
351		351
352	(void) jpeg_read_header(&srcinfo, true);	352	(void) jpeg_read_header(&srcinfo, boolean(true));
353		353
354	transformoption.transform=flip;	354	transformoption.transform=flip;
355	jtransform_request_workspace(&srcinfo, &transformoption);	355	jtransform_request_workspace(&srcinfo, &transformoption);
Lines 366-375 Link Here
366	kp_jpeg_qiodevice_dest(&dstinfo, &output_file);	366	kp_jpeg_qiodevice_dest(&dstinfo, &output_file);
367		367
368	// Do not write a JFIF header if previously the image did not contain it	368	// Do not write a JFIF header if previously the image did not contain it
369	dstinfo.write_JFIF_header = false;	369	dstinfo.write_JFIF_header = boolean(false);
370		370
371	// Start compressor (note no image data is actually written here)	371	// Start compressor (note no image data is actually written here)
372	dstinfo.optimize_coding = true;	372	dstinfo.optimize_coding = boolean(true);
373	jpeg_write_coefficients(&dstinfo, dst_coef_arrays);	373	jpeg_write_coefficients(&dstinfo, dst_coef_arrays);
374		374
375	// Copy to the output file any extra markers that we want to preserve	375	// Copy to the output file any extra markers that we want to preserve