Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(255)

Side by Side Diff: fpdfsdk/src/fpdf_flatten.cpp

Issue 1612113003: Rename CPDF_PageObjects to CPDF_PageObjectList (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « fpdfsdk/include/pdfwindow/PWL_Edit.h ('k') | fpdfsdk/src/fxedit/fxet_pageobjs.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "public/fpdf_flatten.h" 7 #include "public/fpdf_flatten.h"
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
(...skipping 17 matching lines...) Expand all
28 if (rect.left - rcPage.left < -10.000001f || 28 if (rect.left - rcPage.left < -10.000001f ||
29 rect.right - rcPage.right > 10.000001f || 29 rect.right - rcPage.right > 10.000001f ||
30 rect.top - rcPage.top > 10.000001f || 30 rect.top - rcPage.top > 10.000001f ||
31 rect.bottom - rcPage.bottom < -10.000001f) 31 rect.bottom - rcPage.bottom < -10.000001f)
32 return FALSE; 32 return FALSE;
33 } 33 }
34 34
35 return TRUE; 35 return TRUE;
36 } 36 }
37 37
38 FX_BOOL GetContentsRect(CPDF_Document* pDoc, 38 void GetContentsRect(CPDF_Document* pDoc,
39 CPDF_Dictionary* pDict, 39 CPDF_Dictionary* pDict,
40 CPDF_RectArray* pRectArray) { 40 CPDF_RectArray* pRectArray) {
41 CPDF_Page* pPDFPage = new CPDF_Page; 41 std::unique_ptr<CPDF_Page> pPDFPage(new CPDF_Page);
42 pPDFPage->Load(pDoc, pDict, FALSE); 42 pPDFPage->Load(pDoc, pDict, FALSE);
43 pPDFPage->ParseContent(nullptr); 43 pPDFPage->ParseContent(nullptr);
44 44
45 FX_POSITION pos = pPDFPage->GetFirstObjectPosition(); 45 for (const auto& pPageObject : *pPDFPage) {
Oliver Chang 2016/01/21 23:58:46 premature change?
46 while (pos) {
47 CPDF_PageObject* pPageObject = pPDFPage->GetNextObject(pos);
48 if (!pPageObject) 46 if (!pPageObject)
49 continue; 47 continue;
50 48
51 CPDF_Rect rc; 49 CPDF_Rect rc;
52 rc.left = pPageObject->m_Left; 50 rc.left = pPageObject->m_Left;
53 rc.right = pPageObject->m_Right; 51 rc.right = pPageObject->m_Right;
54 rc.bottom = pPageObject->m_Bottom; 52 rc.bottom = pPageObject->m_Bottom;
55 rc.top = pPageObject->m_Top; 53 rc.top = pPageObject->m_Top;
56 54
57 if (IsValiableRect(rc, pDict->GetRect("MediaBox"))) { 55 if (IsValiableRect(rc, pDict->GetRect("MediaBox")))
58 pRectArray->Add(rc); 56 pRectArray->Add(rc);
59 }
60 } 57 }
61
62 delete pPDFPage;
63 return TRUE;
64 } 58 }
65 59
66 void ParserStream(CPDF_Dictionary* pPageDic, 60 void ParserStream(CPDF_Dictionary* pPageDic,
67 CPDF_Dictionary* pStream, 61 CPDF_Dictionary* pStream,
68 CPDF_RectArray* pRectArray, 62 CPDF_RectArray* pRectArray,
69 CPDF_ObjectArray* pObjectArray) { 63 CPDF_ObjectArray* pObjectArray) {
70 if (!pStream) 64 if (!pStream)
71 return; 65 return;
72 CPDF_Rect rect; 66 CPDF_Rect rect;
73 if (pStream->KeyExist("Rect")) 67 if (pStream->KeyExist("Rect"))
(...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 pNewXObject->SetData((const uint8_t*)sStream, sStream.GetLength(), FALSE, 508 pNewXObject->SetData((const uint8_t*)sStream, sStream.GetLength(), FALSE,
515 FALSE); 509 FALSE);
516 } 510 }
517 pPageDict->RemoveAt("Annots"); 511 pPageDict->RemoveAt("Annots");
518 512
519 ObjectArray.RemoveAll(); 513 ObjectArray.RemoveAll();
520 RectArray.RemoveAll(); 514 RectArray.RemoveAll();
521 515
522 return FLATTEN_SUCCESS; 516 return FLATTEN_SUCCESS;
523 } 517 }
OLDNEW
« no previous file with comments | « fpdfsdk/include/pdfwindow/PWL_Edit.h ('k') | fpdfsdk/src/fxedit/fxet_pageobjs.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698