diff options
| author | Lei Zhang <thestig@chromium.org> | 2016-01-08 14:24:37 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2016-01-08 14:24:37 -0800 |
| commit | 1b97664bc5b84c7a2b87cc656f8c6a0476f9b71f (patch) | |
| tree | 11c6727d7fa3d2dac36b879c3bbd106326c7ca43 /core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp | |
| parent | 6a1c51b9eb666f2e120ec098d900663627ebcb3e (diff) | |
| download | pdfium-1b97664bc5b84c7a2b87cc656f8c6a0476f9b71f.tar.xz | |
Merge to XFA: Clean up misc nits found while fixing bugs.
Some bits regressed in commit 338805f.
Also merge: IWYU fix after commit c5a8933.
R=tsepez@chromium.org
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1544963002 .
Review URL: https://codereview.chromium.org/1570973002 .
(cherry picked from commit c5a8933f260ca1034fde902058442984e55c0f7a)
(cherry picked from commit e6bd31873c3dba3f79c5ebbbefed636948629cc9)
Review URL: https://codereview.chromium.org/1577453002 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp')
| -rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp index c855a7c5c2..d7783e438b 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp @@ -324,9 +324,7 @@ FX_BOOL PDF_DataDecode(const uint8_t* src_buf, CFX_ByteString& ImageEncoding, CPDF_Dictionary*& pImageParms, FX_DWORD last_estimated_size, - FX_BOOL bImageAcc) - -{ + FX_BOOL bImageAcc) { CPDF_Object* pDecoder = pDict ? pDict->GetElementValue("Filter") : nullptr; if (!pDecoder || (!pDecoder->IsArray() && !pDecoder->IsName())) return FALSE; |