diff options
| author | tsepez <tsepez@chromium.org> | 2016-08-26 15:17:12 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-08-26 15:17:13 -0700 |
| commit | 987f3ee94c3cb8e4a6113ad05453a2948469386c (patch) | |
| tree | fbd1fdc800c2510c89ae043331a799a42c3251af /fpdfsdk | |
| parent | 83d2351fd64128156c9abfb70266133d58a5e525 (diff) | |
| download | pdfium-987f3ee94c3cb8e4a6113ad05453a2948469386c.tar.xz | |
Make CFX_CountRef<>::m_pObject private, add accessors, fix const-ness.
Hide the CountedObj class from the rest of the code.
Rename GetModify() to GetPrivateCopy(), since it turns out
there are places where we modify a potentially-shared copy.
Add non-const version of GetObject() to permit these.
Review-Url: https://codereview.chromium.org/2287633002
Diffstat (limited to 'fpdfsdk')
| -rw-r--r-- | fpdfsdk/fpdf_transformpage.cpp | 4 | ||||
| -rw-r--r-- | fpdfsdk/fpdfeditimg.cpp | 4 | ||||
| -rw-r--r-- | fpdfsdk/fxedit/fxet_edit.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/fpdfsdk/fpdf_transformpage.cpp b/fpdfsdk/fpdf_transformpage.cpp index c782150df2..712080a9de 100644 --- a/fpdfsdk/fpdf_transformpage.cpp +++ b/fpdfsdk/fpdf_transformpage.cpp @@ -220,9 +220,9 @@ DLLEXPORT FPDF_CLIPPATH STDCALL FPDF_CreateClipPath(float left, float right, float top) { CPDF_ClipPath* pNewClipPath = new CPDF_ClipPath(); - pNewClipPath->GetModify(); + pNewClipPath->GetPrivateCopy(); CPDF_Path Path; - Path.GetModify(); + Path.GetPrivateCopy(); Path.AppendRect(left, bottom, right, top); pNewClipPath->AppendPath(Path, FXFILL_ALTERNATE, FALSE); return pNewClipPath; diff --git a/fpdfsdk/fpdfeditimg.cpp b/fpdfsdk/fpdfeditimg.cpp index da3d33eb05..1fe832b877 100644 --- a/fpdfsdk/fpdfeditimg.cpp +++ b/fpdfsdk/fpdfeditimg.cpp @@ -33,7 +33,7 @@ FPDFImageObj_LoadJpegFile(FPDF_PAGE* pages, IFX_FileRead* pFile = new CPDF_CustomAccess(fileAccess); CPDF_ImageObject* pImgObj = reinterpret_cast<CPDF_ImageObject*>(image_object); - pImgObj->m_GeneralState.GetModify(); + pImgObj->m_GeneralState.GetPrivateCopy(); for (int index = 0; index < nCount; index++) { CPDF_Page* pPage = CPDFPageFromFPDFPage(pages[index]); if (pPage) @@ -73,7 +73,7 @@ DLLEXPORT FPDF_BOOL STDCALL FPDFImageObj_SetBitmap(FPDF_PAGE* pages, return FALSE; CPDF_ImageObject* pImgObj = reinterpret_cast<CPDF_ImageObject*>(image_object); - pImgObj->m_GeneralState.GetModify(); + pImgObj->m_GeneralState.GetPrivateCopy(); for (int index = 0; index < nCount; index++) { CPDF_Page* pPage = CPDFPageFromFPDFPage(pages[index]); if (pPage) diff --git a/fpdfsdk/fxedit/fxet_edit.cpp b/fpdfsdk/fxedit/fxet_edit.cpp index d21411f8a9..479fa970a1 100644 --- a/fpdfsdk/fxedit/fxet_edit.cpp +++ b/fpdfsdk/fxedit/fxet_edit.cpp @@ -137,7 +137,7 @@ void AddRectToPageObjects(CPDF_PageObjectHolder* pObjectHolder, FX_COLORREF crFill, const CFX_FloatRect& rcFill) { std::unique_ptr<CPDF_PathObject> pPathObj(new CPDF_PathObject); - CFX_PathData* pPathData = pPathObj->m_Path.GetModify(); + CFX_PathData* pPathData = pPathObj->m_Path.GetPrivateCopy(); pPathData->AppendRect(rcFill.left, rcFill.bottom, rcFill.right, rcFill.top); FX_FLOAT rgb[3]; @@ -161,7 +161,7 @@ CPDF_TextObject* AddTextObjToPageObjects(CPDF_PageObjectHolder* pObjectHolder, const CFX_FloatPoint& point, const CFX_ByteString& text) { std::unique_ptr<CPDF_TextObject> pTxtObj(new CPDF_TextObject); - CPDF_TextStateData* pTextStateData = pTxtObj->m_TextState.GetModify(); + CPDF_TextStateData* pTextStateData = pTxtObj->m_TextState.GetPrivateCopy(); pTextStateData->m_pFont = pFont; pTextStateData->m_FontSize = fFontSize; pTextStateData->m_CharSpace = fCharSpace; |