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

TJPEG: Remove unnecessary setCompDefaults() retval

Browse Source 
setCompDefaults() hasn't thrown an error since
aa7459050d was introduced in 2.0.x.
This commit is contained in:
DRC
2020-09-13 16:58:08 -05:00
parent 6ee5d5f568
commit fe5b6a1c7c
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
turbojpeg.c
View File

@@ -234,10 +234,10 @@ static int getPixelFormat(int pixelSize, int flags)
return -1; return -1;
} }
static int setCompDefaults(struct jpeg_compress_struct *cinfo, int pixelFormat, static void setCompDefaults(struct jpeg_compress_struct *cinfo,
int subsamp, int jpegQual, int flags) int pixelFormat, int subsamp, int jpegQual,
int flags)
{ {
int retval = 0;
#ifndef NO_GETENV #ifndef NO_GETENV
char *env = NULL; char *env = NULL;
#endif #endif
@@ -300,8 +300,6 @@ static int setCompDefaults(struct jpeg_compress_struct *cinfo, int pixelFormat,
cinfo->comp_info[2].v_samp_factor = 1; cinfo->comp_info[2].v_samp_factor = 1;
if (cinfo->num_components > 3) if (cinfo->num_components > 3)
cinfo->comp_info[3].v_samp_factor = tjMCUHeight[subsamp] / 8; cinfo->comp_info[3].v_samp_factor = tjMCUHeight[subsamp] / 8;
return retval;
} }
@@ -676,8 +674,7 @@ DLLEXPORT int tjCompress2(tjhandle handle, const unsigned char *srcBuf,
alloc = 0; *jpegSize = tjBufSize(width, height, jpegSubsamp); alloc = 0; *jpegSize = tjBufSize(width, height, jpegSubsamp);
} }
jpeg_mem_dest_tj(cinfo, jpegBuf, jpegSize, alloc); jpeg_mem_dest_tj(cinfo, jpegBuf, jpegSize, alloc);
if (setCompDefaults(cinfo, pixelFormat, jpegSubsamp, jpegQual, flags) == -1) setCompDefaults(cinfo, pixelFormat, jpegSubsamp, jpegQual, flags);
return -1;
jpeg_start_compress(cinfo, TRUE); jpeg_start_compress(cinfo, TRUE);
for (i = 0; i < height; i++) { for (i = 0; i < height; i++) {
@@ -772,7 +769,7 @@ DLLEXPORT int tjEncodeYUVPlanes(tjhandle handle, const unsigned char *srcBuf,
else if (flags & TJFLAG_FORCESSE2) putenv("JSIMD_FORCESSE2=1"); else if (flags & TJFLAG_FORCESSE2) putenv("JSIMD_FORCESSE2=1");
#endif #endif
if (setCompDefaults(cinfo, pixelFormat, subsamp, -1, flags) == -1) return -1; setCompDefaults(cinfo, pixelFormat, subsamp, -1, flags);
/* Execute only the parts of jpeg_start_compress() that we need. If we /* Execute only the parts of jpeg_start_compress() that we need. If we
were to call the whole jpeg_start_compress() function, then it would try were to call the whole jpeg_start_compress() function, then it would try
@@ -986,8 +983,7 @@ DLLEXPORT int tjCompressFromYUVPlanes(tjhandle handle,
alloc = 0; *jpegSize = tjBufSize(width, height, subsamp); alloc = 0; *jpegSize = tjBufSize(width, height, subsamp);
} }
jpeg_mem_dest_tj(cinfo, jpegBuf, jpegSize, alloc); jpeg_mem_dest_tj(cinfo, jpegBuf, jpegSize, alloc);
if (setCompDefaults(cinfo, TJPF_RGB, subsamp, jpegQual, flags) == -1) setCompDefaults(cinfo, TJPF_RGB, subsamp, jpegQual, flags);
return -1;
cinfo->raw_data_in = TRUE; cinfo->raw_data_in = TRUE;
jpeg_start_compress(cinfo, TRUE); jpeg_start_compress(cinfo, TRUE);