Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1714)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: core/fxcodec/lbmp/fx_bmp.cpp

Issue 2032613003: Get rid of NULLs in core/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: Git rid of comparisons against NULL Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« core/fxcodec/codec/fx_codec_jpeg.cpp ('K') | « core/fxcodec/codec/fx_codec_tiff.cpp ('k') | core/fxcodec/lgif/fx_gif.cpp » ('j') | core/fxcodec/lgif/fx_gif.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/fxcodec/lbmp/fx_bmp.cpp
diff --git a/core/fxcodec/lbmp/fx_bmp.cpp b/core/fxcodec/lbmp/fx_bmp.cpp
index be5d93e1b8205d08c70be2dfd582ee2ade4d0368..e83af0dae2d6258e62ffcb8d21e3507e221fc968 100644
--- a/core/fxcodec/lbmp/fx_bmp.cpp
+++ b/core/fxcodec/lbmp/fx_bmp.cpp
@@ -40,18 +40,15 @@ void bmp_error(bmp_decompress_struct_p bmp_ptr, const FX_CHAR* err_msg) {
}
bmp_decompress_struct_p bmp_create_decompress() {
bmp_decompress_struct_p bmp_ptr = FX_Alloc(bmp_decompress_struct, 1);
- if (bmp_ptr == NULL) {
- return NULL;
- }
FXSYS_memset(bmp_ptr, 0, sizeof(bmp_decompress_struct));
bmp_ptr->decode_status = BMP_D_STATUS_HEADER;
bmp_ptr->bmp_header_ptr = FX_Alloc(BmpFileHeader, 1);
return bmp_ptr;
}
void bmp_destroy_decompress(bmp_decompress_struct_pp bmp_ptr_ptr) {
- if (bmp_ptr_ptr == NULL || *bmp_ptr_ptr == NULL) {
+ if (!bmp_ptr_ptr || !*bmp_ptr_ptr)
return;
- }
+
bmp_decompress_struct_p bmp_ptr = *bmp_ptr_ptr;
*bmp_ptr_ptr = NULL;
if (bmp_ptr->out_row_buffer) {
@@ -62,16 +59,16 @@ void bmp_destroy_decompress(bmp_decompress_struct_pp bmp_ptr_ptr) {
FX_Free(bmp_ptr);
}
int32_t bmp_read_header(bmp_decompress_struct_p bmp_ptr) {
- if (bmp_ptr == NULL) {
+ if (!bmp_ptr)
return 0;
- }
+
uint32_t skip_size_org = bmp_ptr->skip_size;
if (bmp_ptr->decode_status == BMP_D_STATUS_HEADER) {
ASSERT(sizeof(BmpFileHeader) == 14);
BmpFileHeader* bmp_header_ptr = NULL;
- if (bmp_read_data(bmp_ptr, (uint8_t**)&bmp_header_ptr, 14) == NULL) {
+ if (!bmp_read_data(bmp_ptr, (uint8_t**)&bmp_header_ptr, 14))
return 2;
- }
+
bmp_ptr->bmp_header_ptr->bfType =
GetWord_LSBFirst((uint8_t*)&bmp_header_ptr->bfType);
bmp_ptr->bmp_header_ptr->bfOffBits =
@@ -96,8 +93,8 @@ int32_t bmp_read_header(bmp_decompress_struct_p bmp_ptr) {
case kBmpCoreHeaderSize: {
bmp_ptr->pal_type = 1;
BmpCoreHeaderPtr bmp_core_header_ptr = NULL;
- if (bmp_read_data(bmp_ptr, (uint8_t**)&bmp_core_header_ptr,
- bmp_ptr->img_ifh_size) == NULL) {
+ if (!bmp_read_data(bmp_ptr, (uint8_t**)&bmp_core_header_ptr,
+ bmp_ptr->img_ifh_size)) {
bmp_ptr->skip_size = skip_size_org;
return 2;
}
@@ -112,8 +109,8 @@ int32_t bmp_read_header(bmp_decompress_struct_p bmp_ptr) {
} break;
case kBmpInfoHeaderSize: {
BmpInfoHeaderPtr bmp_info_header_ptr = NULL;
- if (bmp_read_data(bmp_ptr, (uint8_t**)&bmp_info_header_ptr,
- bmp_ptr->img_ifh_size) == NULL) {
+ if (!bmp_read_data(bmp_ptr, (uint8_t**)&bmp_info_header_ptr,
+ bmp_ptr->img_ifh_size)) {
bmp_ptr->skip_size = skip_size_org;
return 2;
}
@@ -140,8 +137,8 @@ int32_t bmp_read_header(bmp_decompress_struct_p bmp_ptr) {
if (bmp_ptr->img_ifh_size >
std::min(kBmpInfoHeaderSize, sizeof(BmpInfoHeader))) {
BmpInfoHeaderPtr bmp_info_header_ptr = NULL;
- if (bmp_read_data(bmp_ptr, (uint8_t**)&bmp_info_header_ptr,
- bmp_ptr->img_ifh_size) == NULL) {
+ if (!bmp_read_data(bmp_ptr, (uint8_t**)&bmp_info_header_ptr,
+ bmp_ptr->img_ifh_size)) {
bmp_ptr->skip_size = skip_size_org;
return 2;
}
@@ -323,9 +320,9 @@ int32_t bmp_decode_rgb(bmp_decompress_struct_p bmp_ptr) {
uint8_t* row_buf = bmp_ptr->out_row_buffer;
uint8_t* des_buf = NULL;
while (bmp_ptr->row_num < bmp_ptr->height) {
- if (bmp_read_data(bmp_ptr, &des_buf, bmp_ptr->src_row_bytes) == NULL) {
+ if (!bmp_read_data(bmp_ptr, &des_buf, bmp_ptr->src_row_bytes))
return 2;
- }
+
bmp_save_decoding_status(bmp_ptr, BMP_D_STATUS_DATA);
switch (bmp_ptr->bitCounts) {
case 1: {
@@ -389,12 +386,12 @@ int32_t bmp_decode_rle8(bmp_decompress_struct_p bmp_ptr) {
bmp_ptr->col_num = 0;
while (TRUE) {
uint32_t skip_size_org = bmp_ptr->skip_size;
- if (bmp_read_data(bmp_ptr, &first_byte_ptr, 1) == NULL) {
+ if (!bmp_read_data(bmp_ptr, &first_byte_ptr, 1))
return 2;
- }
+
switch (*first_byte_ptr) {
case RLE_MARKER: {
- if (bmp_read_data(bmp_ptr, &first_byte_ptr, 1) == NULL) {
+ if (!bmp_read_data(bmp_ptr, &first_byte_ptr, 1)) {
bmp_ptr->skip_size = skip_size_org;
return 2;
}
@@ -428,7 +425,7 @@ int32_t bmp_decode_rle8(bmp_decompress_struct_p bmp_ptr) {
}
case RLE_DELTA: {
uint8_t* delta_ptr;
- if (bmp_read_data(bmp_ptr, &delta_ptr, 2) == NULL) {
+ if (!bmp_read_data(bmp_ptr, &delta_ptr, 2)) {
bmp_ptr->skip_size = skip_size_org;
return 2;
}
@@ -454,9 +451,9 @@ int32_t bmp_decode_rle8(bmp_decompress_struct_p bmp_ptr) {
bmp_error(bmp_ptr, "The Bmp File Is Corrupt");
return 0;
}
- if (bmp_read_data(bmp_ptr, &second_byte_ptr,
- *first_byte_ptr & 1 ? *first_byte_ptr + 1
- : *first_byte_ptr) == NULL) {
+ if (!bmp_read_data(bmp_ptr, &second_byte_ptr,
+ *first_byte_ptr & 1 ? *first_byte_ptr + 1
+ : *first_byte_ptr)) {
bmp_ptr->skip_size = skip_size_org;
return 2;
}
@@ -467,7 +464,7 @@ int32_t bmp_decode_rle8(bmp_decompress_struct_p bmp_ptr) {
}
} break;
default: {
- if (bmp_read_data(bmp_ptr, &second_byte_ptr, 1) == NULL) {
+ if (!bmp_read_data(bmp_ptr, &second_byte_ptr, 1)) {
bmp_ptr->skip_size = skip_size_org;
return 2;
}
@@ -491,12 +488,12 @@ int32_t bmp_decode_rle4(bmp_decompress_struct_p bmp_ptr) {
bmp_ptr->col_num = 0;
while (TRUE) {
uint32_t skip_size_org = bmp_ptr->skip_size;
- if (bmp_read_data(bmp_ptr, &first_byte_ptr, 1) == NULL) {
+ if (!bmp_read_data(bmp_ptr, &first_byte_ptr, 1))
return 2;
- }
+
switch (*first_byte_ptr) {
case RLE_MARKER: {
- if (bmp_read_data(bmp_ptr, &first_byte_ptr, 1) == NULL) {
+ if (!bmp_read_data(bmp_ptr, &first_byte_ptr, 1)) {
bmp_ptr->skip_size = skip_size_org;
return 2;
}
@@ -530,7 +527,7 @@ int32_t bmp_decode_rle4(bmp_decompress_struct_p bmp_ptr) {
}
case RLE_DELTA: {
uint8_t* delta_ptr;
- if (bmp_read_data(bmp_ptr, &delta_ptr, 2) == NULL) {
+ if (!bmp_read_data(bmp_ptr, &delta_ptr, 2)) {
bmp_ptr->skip_size = skip_size_org;
return 2;
}
@@ -560,8 +557,8 @@ int32_t bmp_decode_rle4(bmp_decompress_struct_p bmp_ptr) {
}
*first_byte_ptr = bmp_ptr->out_row_bytes - bmp_ptr->col_num - 1;
}
- if (bmp_read_data(bmp_ptr, &second_byte_ptr,
- size & 1 ? size + 1 : size) == NULL) {
+ if (!bmp_read_data(bmp_ptr, &second_byte_ptr,
+ size & 1 ? size + 1 : size)) {
bmp_ptr->skip_size = skip_size_org;
return 2;
}
@@ -578,7 +575,7 @@ int32_t bmp_decode_rle4(bmp_decompress_struct_p bmp_ptr) {
}
} break;
default: {
- if (bmp_read_data(bmp_ptr, &second_byte_ptr, 1) == NULL) {
+ if (!bmp_read_data(bmp_ptr, &second_byte_ptr, 1)) {
bmp_ptr->skip_size = skip_size_org;
return 2;
}
@@ -609,9 +606,9 @@ int32_t bmp_decode_rle4(bmp_decompress_struct_p bmp_ptr) {
uint8_t* bmp_read_data(bmp_decompress_struct_p bmp_ptr,
uint8_t** des_buf_pp,
uint32_t data_size) {
- if (bmp_ptr == NULL || bmp_ptr->avail_in < bmp_ptr->skip_size + data_size) {
+ if (!bmp_ptr || bmp_ptr->avail_in < bmp_ptr->skip_size + data_size)
return NULL;
- }
+
*des_buf_pp = bmp_ptr->next_in + bmp_ptr->skip_size;
bmp_ptr->skip_size += data_size;
return *des_buf_pp;
@@ -708,9 +705,6 @@ static void bmp_encode_bitfields(bmp_compress_struct_p bmp_ptr,
dst_pos = bmp_ptr->file_header.bfOffBits;
dst_size += size;
dst_buf = FX_Realloc(uint8_t, dst_buf, dst_size);
- if (dst_buf == NULL) {
- return;
- }
FXSYS_memset(&dst_buf[dst_pos], 0, size);
uint32_t mask_red;
uint32_t mask_green;
@@ -795,9 +789,6 @@ static void bmp_encode_rgb(bmp_compress_struct_p bmp_ptr,
dst_pos = bmp_ptr->file_header.bfOffBits;
dst_size += size;
dst_buf = FX_Realloc(uint8_t, dst_buf, dst_size);
- if (dst_buf == NULL) {
- return;
- }
FXSYS_memset(&dst_buf[dst_pos], 0, size);
for (int32_t row_num = bmp_ptr->src_row - 1; row_num > -1; row_num--) {
FXSYS_memcpy(&dst_buf[dst_pos],
@@ -827,9 +818,6 @@ static void bmp_encode_rle8(bmp_compress_struct_p bmp_ptr,
dst_pos = bmp_ptr->file_header.bfOffBits;
dst_size += size;
dst_buf = FX_Realloc(uint8_t, dst_buf, dst_size);
- if (dst_buf == NULL) {
- return;
- }
FXSYS_memset(&dst_buf[dst_pos], 0, size);
for (int32_t row_num = bmp_ptr->src_row - 1, i = 0; row_num > -1;) {
index = row_num * bmp_ptr->src_pitch;
@@ -875,9 +863,6 @@ static void bmp_encode_rle4(bmp_compress_struct_p bmp_ptr,
dst_pos = bmp_ptr->file_header.bfOffBits;
dst_size += size;
dst_buf = FX_Realloc(uint8_t, dst_buf, dst_size);
- if (dst_buf == NULL) {
- return;
- }
FXSYS_memset(&dst_buf[dst_pos], 0, size);
for (int32_t row_num = bmp_ptr->src_row - 1, i = 0; row_num > -1;
rle[1] = 0) {
@@ -916,9 +901,9 @@ FX_BOOL bmp_encode_image(bmp_compress_struct_p bmp_ptr,
}
dst_size = head_size + sizeof(uint32_t) * bmp_ptr->pal_num;
dst_buf = FX_TryAlloc(uint8_t, dst_size);
- if (dst_buf == NULL) {
+ if (!dst_buf)
return FALSE;
- }
+
FXSYS_memset(dst_buf, 0, dst_size);
bmp_ptr->file_header.bfOffBits = head_size;
if (bmp_ptr->pal_ptr && pal_size) {
« core/fxcodec/codec/fx_codec_jpeg.cpp ('K') | « core/fxcodec/codec/fx_codec_tiff.cpp ('k') | core/fxcodec/lgif/fx_gif.cpp » ('j') | core/fxcodec/lgif/fx_gif.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698