summaryrefslogtreecommitdiff
path: root/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp
diff options
context:
space:
mode:
authorWei Li <weili@chromium.org>2016-01-22 18:45:53 -0800
committerWei Li <weili@chromium.org>2016-01-22 18:45:53 -0800
commit33ea6308c45f1ea8ee7dd1f77852a255ef176301 (patch)
tree05dbe9c0bcf515432544a419b5f0a465a23c2c80 /core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp
parent1d05b407189f5b7f9a0412c273d38cfbca4d3ea6 (diff)
downloadpdfium-33ea6308c45f1ea8ee7dd1f77852a255ef176301.tar.xz
Merge to XFA: Fixed object references in CPDF_Object
This is a regression from commit 90853cb. BUG=pdfium:365 TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1617043004 . (cherry picked from commit 7671d304ca4d3aec658c0ac8d5eea4c64e23b144) Review URL: https://codereview.chromium.org/1628643002 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp')
-rw-r--r--core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp
index 56f5a2c4b4..681b6bae91 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp
@@ -93,7 +93,7 @@ CFX_ByteStringC CPDF_Object::GetConstString() const {
FX_FLOAT CPDF_Object::GetNumber() const {
const CPDF_Object* obj = GetBasicObject();
if (obj && obj->GetType() == PDFOBJ_NUMBER)
- return AsNumber()->GetNumber();
+ return obj->AsNumber()->GetNumber();
return 0;
}
@@ -120,10 +120,10 @@ CPDF_Dictionary* CPDF_Object::GetDict() const {
if (type == PDFOBJ_DICTIONARY) {
// The method should be made non-const if we want to not be const.
// See bug #234.
- return const_cast<CPDF_Dictionary*>(AsDictionary());
+ return const_cast<CPDF_Dictionary*>(obj->AsDictionary());
}
if (type == PDFOBJ_STREAM)
- return AsStream()->GetDict();
+ return obj->AsStream()->GetDict();
}
return nullptr;
}