From d50b172a9d3a05704748f0798b5aaa422485abbd Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 20 May 2015 09:50:37 -0700 Subject: Merge to XFA: Remove FX_Alloc() null checks now that it can't return NULL. Original Review URL: https://codereview.chromium.org/1142713005 R=thestig@chromium.org TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1143663008 --- core/src/fxcodec/codec/fx_codec_jpx_opj.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'core/src/fxcodec/codec/fx_codec_jpx_opj.cpp') diff --git a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp index 3546f574f9..1a1616c0a1 100644 --- a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp @@ -715,14 +715,8 @@ FX_BOOL CJPX_Decoder::Decode(FX_LPBYTE dest_buf, int pitch, FX_BOOL bTranslateCo } FXSYS_memset8(dest_buf, 0xff, image->y1 * pitch); FX_BYTE** channel_bufs = FX_Alloc(FX_BYTE*, image->numcomps); - if (channel_bufs == NULL) { - return FALSE; - } FX_BOOL result = FALSE; int* adjust_comps = FX_Alloc(int, image->numcomps); - if (adjust_comps == NULL) { - goto done; - } for (i = 0; i < (int)image->numcomps; i ++) { channel_bufs[i] = dest_buf + offsets[i]; adjust_comps[i] = image->comps[i].prec - 8; -- cgit v1.2.3