diff options
author | Lei Zhang <thestig@chromium.org> | 2015-12-22 14:18:55 -0800 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-12-22 14:18:55 -0800 |
commit | 2d63eaaa39bb3d402c658b2a6e0eae50a30f1d89 (patch) | |
tree | 02310313949cac5660a5bbc20ba72367afa5e864 /core/src/fpdfapi/fpdf_parser | |
parent | 1fc92867ca53f0fba4272fbee3814d844f487495 (diff) | |
download | pdfium-2d63eaaa39bb3d402c658b2a6e0eae50a30f1d89.tar.xz |
Cleanup: Remove unused CFX_PSRenderer and various encoders it used.
- Simplify remaining encoders.
- Hook up more of the encoding paths so failures get returned.
- Clean up code to not pass by non-const ref, use bools, etc.
R=ochang@chromium.org
Review URL: https://codereview.chromium.org/1545563003 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_parser')
-rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp | 35 | ||||
-rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp | 12 |
2 files changed, 22 insertions, 25 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..8832940f80 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp @@ -540,30 +540,27 @@ CFX_ByteString PDF_EncodeString(const CFX_ByteString& src, FX_BOOL bHex) { result.AppendChar(')'); return result.GetByteString(); } -void FlateEncode(const uint8_t* src_buf, + +bool FlateEncode(const uint8_t* src_buf, FX_DWORD src_size, - uint8_t*& dest_buf, - FX_DWORD& dest_size) { + uint8_t** dest_buf, + FX_DWORD* dest_size) { CCodec_ModuleMgr* pEncoders = CPDF_ModuleMgr::Get()->GetCodecModule(); - if (pEncoders) { - pEncoders->GetFlateModule()->Encode(src_buf, src_size, dest_buf, dest_size); - } + return pEncoders && + pEncoders->GetFlateModule()->Encode(src_buf, src_size, dest_buf, + dest_size); } -void FlateEncode(const uint8_t* src_buf, - FX_DWORD src_size, - int predictor, - int Colors, - int BitsPerComponent, - int Columns, - uint8_t*& dest_buf, - FX_DWORD& dest_size) { + +bool PngEncode(const uint8_t* src_buf, + FX_DWORD src_size, + uint8_t** dest_buf, + FX_DWORD* dest_size) { CCodec_ModuleMgr* pEncoders = CPDF_ModuleMgr::Get()->GetCodecModule(); - if (pEncoders) { - pEncoders->GetFlateModule()->Encode(src_buf, src_size, predictor, Colors, - BitsPerComponent, Columns, dest_buf, - dest_size); - } + return pEncoders && + pEncoders->GetFlateModule()->Encode(src_buf, src_size, dest_buf, + dest_size); } + FX_DWORD FlateDecode(const uint8_t* src_buf, FX_DWORD src_size, uint8_t*& dest_buf, diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp index c80770366b..810a633c83 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp @@ -47,14 +47,14 @@ TEST_F(FPDFParserDecodeEmbeddertest, FlateEncode) { for (size_t i = 0; i < FX_ArraySize(flate_encode_cases); ++i) { FlateEncodeCase* ptr = &flate_encode_cases[i]; - unsigned char* result; - unsigned int result_size; - FlateEncode(ptr->input, ptr->input_size, result, result_size); - ASSERT_TRUE(result); + unsigned char* buf; + unsigned int buf_size; + EXPECT_TRUE(FlateEncode(ptr->input, ptr->input_size, &buf, &buf_size)); + ASSERT_TRUE(buf); EXPECT_EQ(std::string((const char*)ptr->expected, ptr->expected_size), - std::string((const char*)result, result_size)) + std::string((const char*)buf, buf_size)) << " for case " << i; - FX_Free(result); + FX_Free(buf); } } |