diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-12-14 18:27:25 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-12-14 18:27:25 -0800 |
| commit | 96660d6f382204339d6b1aadc3913303d436e252 (patch) | |
| tree | b5f84756e1a89251831cebc05b9d4e1f6cb2027b /core/src/fxcodec/codec | |
| parent | d983b09c3ae29a97cba8e9ec9c6351545f6087ee (diff) | |
| download | pdfium-96660d6f382204339d6b1aadc3913303d436e252.tar.xz | |
Merge to XFA: Get rid of most instance of 'foo != NULL'
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1512763013 .
(cherry picked from commit e3c7c2b54348da4a6939f6672f6c6bff126815a7)
Review URL: https://codereview.chromium.org/1529553003 .
Diffstat (limited to 'core/src/fxcodec/codec')
| -rw-r--r-- | core/src/fxcodec/codec/fx_codec_jpeg.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/src/fxcodec/codec/fx_codec_jpeg.cpp b/core/src/fxcodec/codec/fx_codec_jpeg.cpp index 1276219123..0bb9e8aa26 100644 --- a/core/src/fxcodec/codec/fx_codec_jpeg.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpeg.cpp @@ -297,10 +297,10 @@ static FX_BOOL _JpegLoadInfo(const uint8_t* src_buf, color_transform = cinfo.jpeg_color_space == JCS_YCbCr || cinfo.jpeg_color_space == JCS_YCCK; bits_per_components = cinfo.data_precision; - if (icc_buf_ptr != NULL) { + if (icc_buf_ptr) { *icc_buf_ptr = NULL; } - if (icc_length != NULL) { + if (icc_length) { *icc_length = 0; } jpeg_destroy_decompress(&cinfo); @@ -546,7 +546,7 @@ 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() != NULL) { + if (pSource->GetBPP() < 8 || pSource->GetPalette()) { ASSERT(pSource->GetBPP() >= 8 && pSource->GetPalette() == NULL); return FALSE; } @@ -682,7 +682,7 @@ FX_BOOL CCodec_JpegModule::ReadScanline(void* pContext, } FX_DWORD CCodec_JpegModule::GetAvailInput(void* pContext, uint8_t** avail_buf_ptr) { - if (avail_buf_ptr != NULL) { + if (avail_buf_ptr) { *avail_buf_ptr = NULL; if (((FXJPEG_Context*)pContext)->m_SrcMgr.bytes_in_buffer > 0) { *avail_buf_ptr = |