Merge branch 'master' into dev

This commit is contained in:
DRC
2017-12-16 09:34:28 -06:00
5 changed files with 24 additions and 9 deletions

View File

@@ -229,7 +229,7 @@ static int setCompDefaults(struct jpeg_compress_struct *cinfo,
#ifndef NO_GETENV
if((env=getenv("TJ_OPTIMIZE"))!=NULL && strlen(env)>0 && !strcmp(env, "1"))
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"))
cinfo->arith_code=TRUE;
if((env=getenv("TJ_RESTART"))!=NULL && strlen(env)>0)
{