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

Surround the usage of getenv() in the TurboJPEG API with #ifndef NO_GETENV so that developers can add -DNO_GETENV to the C flags when building for platforms that don't have getenv(). Currently this is known to be necessary when building for Windows Phone.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.4.x@1537 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2015-02-23 19:19:40 +00:00
parent c69a1cd7a0
commit feccdcf8c8
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

@@ -206,6 +206,7 @@ static int setCompDefaults(struct jpeg_compress_struct *cinfo,
cinfo->input_components=tjPixelSize[pixelFormat]; cinfo->input_components=tjPixelSize[pixelFormat];
jpeg_set_defaults(cinfo); jpeg_set_defaults(cinfo);
#ifndef NO_GETENV
if((env=getenv("TJ_OPTIMIZE"))!=NULL && strlen(env)>0 && !strcmp(env, "1")) if((env=getenv("TJ_OPTIMIZE"))!=NULL && strlen(env)>0 && !strcmp(env, "1"))
cinfo->optimize_coding=TRUE; cinfo->optimize_coding=TRUE;
if((env=getenv("TJ_ARITHMETIC"))!=NULL && strlen(env)>0 && !strcmp(env, "1")) if((env=getenv("TJ_ARITHMETIC"))!=NULL && strlen(env)>0 && !strcmp(env, "1"))
@@ -224,6 +225,7 @@ static int setCompDefaults(struct jpeg_compress_struct *cinfo,
cinfo->restart_in_rows=temp; cinfo->restart_in_rows=temp;
} }
} }
#endif
if(jpegQual>=0) if(jpegQual>=0)
{ {
@@ -237,9 +239,11 @@ static int setCompDefaults(struct jpeg_compress_struct *cinfo,
jpeg_set_colorspace(cinfo, JCS_YCCK); jpeg_set_colorspace(cinfo, JCS_YCCK);
else jpeg_set_colorspace(cinfo, JCS_YCbCr); else jpeg_set_colorspace(cinfo, JCS_YCbCr);
#ifndef NO_GETENV
if((env=getenv("TJ_PROGRESSIVE"))!=NULL && strlen(env)>0 if((env=getenv("TJ_PROGRESSIVE"))!=NULL && strlen(env)>0
&& !strcmp(env, "1")) && !strcmp(env, "1"))
jpeg_simple_progression(cinfo); jpeg_simple_progression(cinfo);
#endif
cinfo->comp_info[0].h_samp_factor=tjMCUWidth[subsamp]/8; cinfo->comp_info[0].h_samp_factor=tjMCUWidth[subsamp]/8;
cinfo->comp_info[1].h_samp_factor=1; cinfo->comp_info[1].h_samp_factor=1;