diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-12-14 18:29:28 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-12-14 18:29:28 -0800 |
| commit | e385244f8cd6ae376f6b3cf1265a0795d5d30eff (patch) | |
| tree | 4bdd7c459f167ee56ae35f3b87222c2557f501f8 /core/src/fxcodec/codec/fx_codec_jpeg.cpp | |
| parent | e3c7c2b54348da4a6939f6672f6c6bff126815a7 (diff) | |
| download | pdfium-e385244f8cd6ae376f6b3cf1265a0795d5d30eff.tar.xz | |
Get rid of most instance of 'foo == NULL'
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1520063002 .
Diffstat (limited to 'core/src/fxcodec/codec/fx_codec_jpeg.cpp')
| -rw-r--r-- | core/src/fxcodec/codec/fx_codec_jpeg.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/core/src/fxcodec/codec/fx_codec_jpeg.cpp b/core/src/fxcodec/codec/fx_codec_jpeg.cpp index 730872363c..043964f254 100644 --- a/core/src/fxcodec/codec/fx_codec_jpeg.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpeg.cpp @@ -82,7 +82,7 @@ static void _error_do_nothing2(j_common_ptr cinfo, char*) {} static FX_BOOL _JpegEmbedIccProfile(j_compress_ptr cinfo, const uint8_t* icc_buf_ptr, FX_DWORD icc_length) { - if (icc_buf_ptr == NULL || icc_length == 0) { + if (!icc_buf_ptr || icc_length == 0) { return FALSE; } FX_DWORD icc_segment_size = (JPEG_MARKER_MAXSIZE - 2 - JPEG_OVERHEAD_LEN); @@ -501,7 +501,7 @@ ICodec_ScanlineDecoder* CCodec_JpegModule::CreateDecoder( int height, int nComps, FX_BOOL ColorTransform) { - if (src_buf == NULL || src_size == 0) { + if (!src_buf || src_size == 0) { return NULL; } CCodec_JpegDecoder* pDecoder = new CCodec_JpegDecoder; @@ -531,10 +531,9 @@ FX_BOOL CCodec_JpegModule::Encode(const CFX_DIBSource* pSource, int quality, const uint8_t* icc_buf, FX_DWORD icc_length) { - if (pSource->GetBPP() < 8 || pSource->GetPalette()) { - ASSERT(pSource->GetBPP() >= 8 && pSource->GetPalette() == NULL); + if (pSource->GetBPP() < 8 || pSource->GetPalette()) return FALSE; - } + _JpegEncode(pSource, dest_buf, dest_size, quality, icc_buf, icc_length); return TRUE; } |