Chromium Code Reviews| Index: core/src/fxcodec/codec/fx_codec_jpeg.cpp |
| diff --git a/core/src/fxcodec/codec/fx_codec_jpeg.cpp b/core/src/fxcodec/codec/fx_codec_jpeg.cpp |
| index 730872363c2df07d3b9263330f954c8552d26f9a..6e22c050bdc56b0a1cdf3aaafa370a8417cf2c25 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; |
| @@ -532,7 +532,7 @@ FX_BOOL CCodec_JpegModule::Encode(const CFX_DIBSource* pSource, |
| const uint8_t* icc_buf, |
| FX_DWORD icc_length) { |
| if (pSource->GetBPP() < 8 || pSource->GetPalette()) { |
| - ASSERT(pSource->GetBPP() >= 8 && pSource->GetPalette() == NULL); |
| + ASSERT(pSource->GetBPP() >= 8 && !pSource->GetPalette()); |
| return FALSE; |
|
Tom Sepez
2015/12/14 18:27:00
nit: This is making my head hurt. If its less tha
Lei Zhang
2015/12/15 01:58:36
Right, this is: if (foo) { ASSERT(!foo); } -> make
|
| } |
| _JpegEncode(pSource, dest_buf, dest_size, quality, icc_buf, icc_length); |