diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2015-10-20 14:57:56 -0400 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2015-10-20 14:57:56 -0400 |
| commit | 39869b641511c882d78e17548293cdb458c36f38 (patch) | |
| tree | 6e7fee229f9c8a5d628c2dfe81b3e9848a9670d2 /core/src/fpdftext/fpdf_text_int.cpp | |
| parent | 19169dae5bf92813b7419793f61dfca8b4fb9124 (diff) | |
| download | pdfium-39869b641511c882d78e17548293cdb458c36f38.tar.xz | |
Revert "Revert "Add type cast definitions for CPDF_Dictionary.""
This reverts commit 937840e1722d1f2b77d80575d6e710d760662c9c.
Add type cast definitions for CPDF_Dictionary.
This CL adds ToCPDFDictionary type definitions and updates one file to use
instead of straight casts. I had to fix two places where we'd casted off the
constness of the original pointer.
BUG=pdfium:201
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1420583003 .
Diffstat (limited to 'core/src/fpdftext/fpdf_text_int.cpp')
| -rw-r--r-- | core/src/fpdftext/fpdf_text_int.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fpdftext/fpdf_text_int.cpp b/core/src/fpdftext/fpdf_text_int.cpp index 906554dde2..99f36a0858 100644 --- a/core/src/fpdftext/fpdf_text_int.cpp +++ b/core/src/fpdftext/fpdf_text_int.cpp @@ -1286,7 +1286,7 @@ int32_t CPDF_TextPage::PreMarkedContent(PDFTEXT_Obj Obj) { for (n = 0; n < nContentMark; n++) { CPDF_ContentMarkItem& item = pMarkData->GetItem(n); CFX_ByteString tagStr = (CFX_ByteString)item.GetName(); - pDict = (CPDF_Dictionary*)item.GetParam(); + pDict = ToDictionary(static_cast<CPDF_Object*>(item.GetParam())); CPDF_String* temp = (CPDF_String*)(pDict ? pDict->GetElement(FX_BSTRC("ActualText")) : NULL); @@ -1357,7 +1357,7 @@ void CPDF_TextPage::ProcessMarkedContent(PDFTEXT_Obj Obj) { for (n = 0; n < nContentMark; n++) { CPDF_ContentMarkItem& item = pMarkData->GetItem(n); CFX_ByteString tagStr = (CFX_ByteString)item.GetName(); - pDict = (CPDF_Dictionary*)item.GetParam(); + pDict = ToDictionary(static_cast<CPDF_Object*>(item.GetParam())); CPDF_String* temp = (CPDF_String*)(pDict ? pDict->GetElement(FX_BSTRC("ActualText")) : NULL); |