diff options
| author | Henrique Nakashima <hnakashima@chromium.org> | 2018-06-05 18:56:52 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-06-05 18:56:52 +0000 |
| commit | 354ed202ccd4d6b9d408789a30517ebb1633570b (patch) | |
| tree | 0d960f1b1c79d11d1c148aaa06c17e4c9a6bfca8 /fpdfsdk | |
| parent | a9f327580558a96f659e96157731f21c6abbb951 (diff) | |
| download | pdfium-354ed202ccd4d6b9d408789a30517ebb1633570b.tar.xz | |
Revert "Create m_ContentStream field in CPDF_PageObject."
This reverts commit d3d8287e143daf12a602a919c120b4e0c656abf8.
Reason for revert: Need to revert https://pdfium-review.googlesource.com/c/pdfium/+/33595 that this depends on.
Original change's description:
> Create m_ContentStream field in CPDF_PageObject.
>
> Content streams are now split and can set nonzero values to identify
> each parsed content stream.
>
> Bug: pdfium:1051
> Change-Id: Ia2cb1e0997db5264d468043af31f9b41e8d0d349
> Reviewed-on: https://pdfium-review.googlesource.com/33591
> Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
> Reviewed-by: Ryan Harrison <rharrison@chromium.org>
TBR=thestig@chromium.org,hnakashima@chromium.org,rharrison@chromium.org
Change-Id: I5046b6a76508fccc0ff04cb7393cae6485dd091f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: pdfium:1051
Reviewed-on: https://pdfium-review.googlesource.com/33990
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'fpdfsdk')
| -rw-r--r-- | fpdfsdk/fpdf_editimg.cpp | 2 | ||||
| -rw-r--r-- | fpdfsdk/fpdf_editpath.cpp | 4 | ||||
| -rw-r--r-- | fpdfsdk/fpdf_edittext.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/fpdfsdk/fpdf_editimg.cpp b/fpdfsdk/fpdf_editimg.cpp index 0e95add851..fed1581e2d 100644 --- a/fpdfsdk/fpdf_editimg.cpp +++ b/fpdfsdk/fpdf_editimg.cpp @@ -87,7 +87,7 @@ FPDFPageObj_NewImageObj(FPDF_DOCUMENT document) { if (!pDoc) return nullptr; - auto pImageObj = pdfium::MakeUnique<CPDF_ImageObject>(-1); + auto pImageObj = pdfium::MakeUnique<CPDF_ImageObject>(); pImageObj->SetImage(pdfium::MakeRetain<CPDF_Image>(pDoc)); // Caller takes ownership. diff --git a/fpdfsdk/fpdf_editpath.cpp b/fpdfsdk/fpdf_editpath.cpp index 102292eb3f..70a558d2f1 100644 --- a/fpdfsdk/fpdf_editpath.cpp +++ b/fpdfsdk/fpdf_editpath.cpp @@ -46,7 +46,7 @@ CPDF_PathObject* CPDFPathObjectFromFPDFPageObject(FPDF_PAGEOBJECT page_object) { FPDF_EXPORT FPDF_PAGEOBJECT FPDF_CALLCONV FPDFPageObj_CreateNewPath(float x, float y) { - auto pPathObj = pdfium::MakeUnique<CPDF_PathObject>(-1); + auto pPathObj = pdfium::MakeUnique<CPDF_PathObject>(); pPathObj->m_Path.AppendPoint(CFX_PointF(x, y), FXPT_TYPE::MoveTo, false); pPathObj->DefaultStates(); @@ -58,7 +58,7 @@ FPDF_EXPORT FPDF_PAGEOBJECT FPDF_CALLCONV FPDFPageObj_CreateNewRect(float x, float y, float w, float h) { - auto pPathObj = pdfium::MakeUnique<CPDF_PathObject>(-1); + auto pPathObj = pdfium::MakeUnique<CPDF_PathObject>(); pPathObj->m_Path.AppendRect(x, y, x + w, y + h); pPathObj->DefaultStates(); diff --git a/fpdfsdk/fpdf_edittext.cpp b/fpdfsdk/fpdf_edittext.cpp index 66086d866c..2996a505ee 100644 --- a/fpdfsdk/fpdf_edittext.cpp +++ b/fpdfsdk/fpdf_edittext.cpp @@ -412,7 +412,7 @@ FPDFPageObj_NewTextObj(FPDF_DOCUMENT document, if (!pFont) return nullptr; - auto pTextObj = pdfium::MakeUnique<CPDF_TextObject>(-1); + auto pTextObj = pdfium::MakeUnique<CPDF_TextObject>(); pTextObj->m_TextState.SetFont(pFont); pTextObj->m_TextState.SetFontSize(font_size); pTextObj->DefaultStates(); @@ -498,7 +498,7 @@ FPDFPageObj_CreateTextObj(FPDF_DOCUMENT document, if (!pDoc || !pFont) return nullptr; - auto pTextObj = pdfium::MakeUnique<CPDF_TextObject>(-1); + auto pTextObj = pdfium::MakeUnique<CPDF_TextObject>(); pTextObj->m_TextState.SetFont(pDoc->LoadFont(pFont->GetFontDict())); pTextObj->m_TextState.SetFontSize(font_size); pTextObj->DefaultStates(); |