summaryrefslogtreecommitdiff
path: root/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-12-22 14:18:55 -0800
committerLei Zhang <thestig@chromium.org>2015-12-22 14:18:55 -0800
commit2d63eaaa39bb3d402c658b2a6e0eae50a30f1d89 (patch)
tree02310313949cac5660a5bbc20ba72367afa5e864 /core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp
parent1fc92867ca53f0fba4272fbee3814d844f487495 (diff)
downloadpdfium-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/fpdf_parser_decode.cpp')
-rw-r--r--core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp35
1 files changed, 16 insertions, 19 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,