diff options
author | Bo Xu <bo_xu@foxitsoftware.com> | 2014-06-30 09:49:21 -0700 |
---|---|---|
committer | Bo Xu <bo_xu@foxitsoftware.com> | 2014-06-30 09:49:21 -0700 |
commit | 287e11a213d3197ac3e321acf294d903b271c269 (patch) | |
tree | 28f6f9dd00331c2748d73f96d818ce04a9775e8d /core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp | |
parent | ad30f609702d232f1708a0792d682c3cfaa0e235 (diff) | |
download | pdfium-287e11a213d3197ac3e321acf294d903b271c269.tar.xz |
Remove "this==NULL" and adjust corresponding callers
BUG=
R=thakis@chromium.org
Review URL: https://codereview.chromium.org/361553002
Diffstat (limited to 'core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp')
-rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp index 6b2483eda7..5854d71344 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp @@ -45,7 +45,7 @@ FX_DWORD _A85Decode(const FX_BYTE* src_buf, FX_DWORD src_size, FX_LPBYTE& dest_b return (FX_DWORD) - 1; } int state = 0; - FX_UINT32 res = 0; + FX_UINT32 res = 0; pos = dest_size = 0; while (pos < src_size) { FX_BYTE ch = src_buf[pos++]; @@ -281,11 +281,11 @@ FX_BOOL PDF_DataDecode(FX_LPCBYTE src_buf, FX_DWORD src_size, const CPDF_Diction CPDF_Dictionary*& pImageParms, FX_DWORD last_estimated_size, FX_BOOL bImageAcc) { - CPDF_Object* pDecoder = pDict->GetElementValue(FX_BSTRC("Filter")); + CPDF_Object* pDecoder = pDict ? pDict->GetElementValue(FX_BSTRC("Filter")) : NULL; if (pDecoder == NULL || (pDecoder->GetType() != PDFOBJ_ARRAY && pDecoder->GetType() != PDFOBJ_NAME)) { return FALSE; } - CPDF_Object* pParams = pDict->GetElementValue(FX_BSTRC("DecodeParms")); + CPDF_Object* pParams = pDict ? pDict->GetElementValue(FX_BSTRC("DecodeParms")) : NULL; CFX_ByteStringArray DecoderList; CFX_PtrArray ParamList; if (pDecoder->GetType() == PDFOBJ_ARRAY) { @@ -304,7 +304,7 @@ FX_BOOL PDF_DataDecode(FX_LPCBYTE src_buf, FX_DWORD src_size, const CPDF_Diction } } else { DecoderList.Add(pDecoder->GetConstString()); - ParamList.Add(pParams->GetDict()); + ParamList.Add(pParams ? pParams->GetDict() : NULL); } FX_LPBYTE last_buf = (FX_LPBYTE)src_buf; FX_DWORD last_size = src_size; |