cosmetics: jpegdec

- squash some whitespace
- remove unnecessary pointer check

Change-Id: I06208566a5621786479956ea658434f5c4d62fcc
This commit is contained in:
James Zern 2012-12-10 23:26:11 -08:00
parent 1c1c5646a5
commit d3dace2ff0

View File

@ -29,8 +29,8 @@ struct my_error_mgr {
}; };
static void my_error_exit(j_common_ptr dinfo) { static void my_error_exit(j_common_ptr dinfo) {
struct my_error_mgr* myerr = (struct my_error_mgr*) dinfo->err; struct my_error_mgr* myerr = (struct my_error_mgr*)dinfo->err;
(*dinfo->err->output_message) (dinfo); (*dinfo->err->output_message)(dinfo);
longjmp(myerr->setjmp_buffer, 1); longjmp(myerr->setjmp_buffer, 1);
} }
@ -76,8 +76,8 @@ int ReadJPEG(FILE* in_file, WebPPicture* const pic) {
} }
row_ptr = rgb; row_ptr = rgb;
buffer = (*dinfo.mem->alloc_sarray) ((j_common_ptr) &dinfo, buffer = (*dinfo.mem->alloc_sarray)((j_common_ptr)&dinfo,
JPOOL_IMAGE, stride, 1); JPOOL_IMAGE, stride, 1);
if (buffer == NULL) { if (buffer == NULL) {
goto End; goto End;
} }
@ -99,9 +99,7 @@ int ReadJPEG(FILE* in_file, WebPPicture* const pic) {
ok = WebPPictureImportRGB(pic, rgb, stride); ok = WebPPictureImportRGB(pic, rgb, stride);
End: End:
if (rgb) { free(rgb);
free(rgb);
}
return ok; return ok;
} }
#else // !WEBP_HAVE_JPEG #else // !WEBP_HAVE_JPEG