diff options
author | Lei Zhang <thestig@chromium.org> | 2015-05-06 15:09:06 -0700 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-05-06 15:09:06 -0700 |
commit | 2c4104443f5a7aea225bd853770cdc11ab431932 (patch) | |
tree | 1a2b640d07a4501c7409f9ad5a6323971f813365 /core/src/fxcodec/codec/fx_codec_flate.cpp | |
parent | 5734d862cb22eca6e9644ea7d1c096d70123434f (diff) | |
download | pdfium-2c4104443f5a7aea225bd853770cdc11ab431932.tar.xz |
Merge to XFA: Replace FX_NEW with new, remote tests from fxcodec
Review URL: https://codereview.chromium.org/1084303002
(cherry picked from commit cfc1a654ef3e8b65bc447815d35932c185bf1422)
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1125363002
Diffstat (limited to 'core/src/fxcodec/codec/fx_codec_flate.cpp')
-rw-r--r-- | core/src/fxcodec/codec/fx_codec_flate.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/core/src/fxcodec/codec/fx_codec_flate.cpp b/core/src/fxcodec/codec/fx_codec_flate.cpp index afdb8354e6..3e1aa367c8 100644 --- a/core/src/fxcodec/codec/fx_codec_flate.cpp +++ b/core/src/fxcodec/codec/fx_codec_flate.cpp @@ -851,10 +851,7 @@ static void FlateUncompress(FX_LPCBYTE src_buf, FX_DWORD src_size, FX_DWORD orig ICodec_ScanlineDecoder* CCodec_FlateModule::CreateDecoder(FX_LPCBYTE src_buf, FX_DWORD src_size, int width, int height, int nComps, int bpc, int predictor, int Colors, int BitsPerComponent, int Columns) { - CCodec_FlateScanlineDecoder* pDecoder = FX_NEW CCodec_FlateScanlineDecoder; - if (pDecoder == NULL) { - return NULL; - } + CCodec_FlateScanlineDecoder* pDecoder = new CCodec_FlateScanlineDecoder; pDecoder->Create(src_buf, src_size, width, height, nComps, bpc, predictor, Colors, BitsPerComponent, Columns); return pDecoder; } @@ -874,10 +871,7 @@ FX_DWORD CCodec_FlateModule::FlateOrLZWDecode(FX_BOOL bLZW, const FX_BYTE* src_b } } if (bLZW) { - pDecoder = FX_NEW CLZWDecoder; - if (pDecoder == NULL) { - return -1; - } + pDecoder = new CLZWDecoder; dest_size = (FX_DWORD) - 1; offset = src_size; int err = pDecoder->Decode(NULL, dest_size, src_buf, offset, bEarlyChange); @@ -885,10 +879,7 @@ FX_DWORD CCodec_FlateModule::FlateOrLZWDecode(FX_BOOL bLZW, const FX_BYTE* src_b if (err || dest_size == 0 || dest_size + 1 < dest_size) { return (FX_DWORD) - 1; } - pDecoder = FX_NEW CLZWDecoder; - if (pDecoder == NULL) { - return -1; - } + pDecoder = new CLZWDecoder; dest_buf = FX_Alloc( FX_BYTE, dest_size + 1); if (dest_buf == NULL) { return -1; |