ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

turbojpeg.c: Fix build if !C_PROGRESSIVE_SUPPORTED

Browse Source
This commit is contained in:
DRC
2022-11-30 10:40:48 -06:00
parent 45cd2ded88
commit c4105ba7ef
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
turbojpeg.c
View File

@@ -323,11 +323,13 @@ static void setCompDefaults(struct jpeg_compress_struct *cinfo,
else else
jpeg_set_colorspace(cinfo, JCS_YCbCr); jpeg_set_colorspace(cinfo, JCS_YCbCr);
#ifdef C_PROGRESSIVE_SUPPORTED
if (flags & TJFLAG_PROGRESSIVE) if (flags & TJFLAG_PROGRESSIVE)
jpeg_simple_progression(cinfo); jpeg_simple_progression(cinfo);
#ifndef NO_GETENV #ifndef NO_GETENV
else if (!GETENV_S(env, 7, "TJ_PROGRESSIVE") && !strcmp(env, "1")) else if (!GETENV_S(env, 7, "TJ_PROGRESSIVE") && !strcmp(env, "1"))
jpeg_simple_progression(cinfo); jpeg_simple_progression(cinfo);
#endif
#endif #endif
cinfo->comp_info[0].h_samp_factor = tjMCUWidth[subsamp] / 8; cinfo->comp_info[0].h_samp_factor = tjMCUWidth[subsamp] / 8;
@@ -2008,8 +2010,10 @@ DLLEXPORT int tjTransform(tjhandle handle, const unsigned char *jpegBuf,
jpeg_mem_dest_tj(cinfo, &dstBufs[i], &dstSizes[i], alloc); jpeg_mem_dest_tj(cinfo, &dstBufs[i], &dstSizes[i], alloc);
jpeg_copy_critical_parameters(dinfo, cinfo); jpeg_copy_critical_parameters(dinfo, cinfo);
dstcoefs = jtransform_adjust_parameters(dinfo, cinfo, srccoefs, &xinfo[i]); dstcoefs = jtransform_adjust_parameters(dinfo, cinfo, srccoefs, &xinfo[i]);
#ifdef C_PROGRESSIVE_SUPPORTED
if (flags & TJFLAG_PROGRESSIVE || t[i].options & TJXOPT_PROGRESSIVE) if (flags & TJFLAG_PROGRESSIVE || t[i].options & TJXOPT_PROGRESSIVE)
jpeg_simple_progression(cinfo); jpeg_simple_progression(cinfo);
#endif
if (!(t[i].options & TJXOPT_NOOUTPUT)) { if (!(t[i].options & TJXOPT_NOOUTPUT)) {
jpeg_write_coefficients(cinfo, dstcoefs); jpeg_write_coefficients(cinfo, dstcoefs);
jcopy_markers_execute(dinfo, cinfo, t[i].options & TJXOPT_COPYNONE ? jcopy_markers_execute(dinfo, cinfo, t[i].options & TJXOPT_COPYNONE ?