summaryrefslogtreecommitdiff
path: root/core/fpdfapi
diff options
context:
space:
mode:
authorthestig <thestig@chromium.org>2016-11-21 06:22:20 -0800
committerCommit bot <commit-bot@chromium.org>2016-11-21 06:22:20 -0800
commit3702566e4286d2e2e316563080217c0aecfae866 (patch)
tree4d4ec51b9e59f88ac7486415824a7021087b48c2 /core/fpdfapi
parent80b7608c66028ef34df865e5313fae1f028d4262 (diff)
downloadpdfium-3702566e4286d2e2e316563080217c0aecfae866.tar.xz
Clean up CPDF_PageContentGenerator.
Review-Url: https://codereview.chromium.org/2513313002
Diffstat (limited to 'core/fpdfapi')
-rw-r--r--core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp100
-rw-r--r--core/fpdfapi/edit/cpdf_pagecontentgenerator.h18
2 files changed, 17 insertions, 101 deletions
diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
index 837697273f..01624cbc61 100644
--- a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
+++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
@@ -6,47 +6,42 @@
#include "core/fpdfapi/edit/cpdf_pagecontentgenerator.h"
-#include "core/fpdfapi/edit/cpdf_creator.h"
#include "core/fpdfapi/page/cpdf_docpagedata.h"
#include "core/fpdfapi/page/cpdf_image.h"
#include "core/fpdfapi/page/cpdf_imageobject.h"
#include "core/fpdfapi/page/cpdf_page.h"
-#include "core/fpdfapi/page/cpdf_pageobject.h"
-#include "core/fpdfapi/page/pageint.h"
-#include "core/fpdfapi/parser/cpdf_array.h"
#include "core/fpdfapi/parser/cpdf_dictionary.h"
#include "core/fpdfapi/parser/cpdf_document.h"
-#include "core/fpdfapi/parser/cpdf_name.h"
#include "core/fpdfapi/parser/cpdf_reference.h"
#include "core/fpdfapi/parser/cpdf_stream.h"
-#include "core/fpdfapi/parser/cpdf_stream_acc.h"
#include "core/fpdfapi/parser/fpdf_parser_decode.h"
+namespace {
+
CFX_ByteTextBuf& operator<<(CFX_ByteTextBuf& ar, CFX_Matrix& matrix) {
ar << matrix.a << " " << matrix.b << " " << matrix.c << " " << matrix.d << " "
<< matrix.e << " " << matrix.f;
return ar;
}
+} // namespace
+
CPDF_PageContentGenerator::CPDF_PageContentGenerator(CPDF_Page* pPage)
: m_pPage(pPage), m_pDocument(m_pPage->m_pDocument) {
- for (const auto& pObj : *pPage->GetPageObjectList())
- InsertPageObject(pObj.get());
+ for (const auto& pObj : *pPage->GetPageObjectList()) {
+ if (pObj)
+ m_pageObjects.push_back(pObj.get());
+ }
}
CPDF_PageContentGenerator::~CPDF_PageContentGenerator() {}
-void CPDF_PageContentGenerator::InsertPageObject(CPDF_PageObject* pPageObject) {
- if (pPageObject)
- m_pageObjects.push_back(pPageObject);
-}
-
void CPDF_PageContentGenerator::GenerateContent() {
CFX_ByteTextBuf buf;
for (CPDF_PageObject* pPageObj : m_pageObjects) {
CPDF_ImageObject* pImageObject = pPageObj->AsImage();
if (pImageObject)
- ProcessImage(buf, pImageObject);
+ ProcessImage(&buf, pImageObject);
}
CPDF_Dictionary* pPageDict = m_pPage->m_pFormDict;
CPDF_Object* pContent =
@@ -86,13 +81,13 @@ CFX_ByteString CPDF_PageContentGenerator::RealizeResource(
return name;
}
-void CPDF_PageContentGenerator::ProcessImage(CFX_ByteTextBuf& buf,
+void CPDF_PageContentGenerator::ProcessImage(CFX_ByteTextBuf* buf,
CPDF_ImageObject* pImageObj) {
if ((pImageObj->m_Matrix.a == 0 && pImageObj->m_Matrix.b == 0) ||
(pImageObj->m_Matrix.c == 0 && pImageObj->m_Matrix.d == 0)) {
return;
}
- buf << "q " << pImageObj->m_Matrix << " cm ";
+ *buf << "q " << pImageObj->m_Matrix << " cm ";
CPDF_Image* pImage = pImageObj->GetImage();
if (pImage->IsInline())
@@ -111,76 +106,5 @@ void CPDF_PageContentGenerator::ProcessImage(CFX_ByteTextBuf& buf,
if (bWasInline)
pImageObj->SetUnownedImage(m_pDocument->GetPageData()->GetImage(dwObjNum));
- buf << "/" << PDF_NameEncode(name) << " Do Q\n";
-}
-
-void CPDF_PageContentGenerator::ProcessForm(CFX_ByteTextBuf& buf,
- const uint8_t* data,
- uint32_t size,
- CFX_Matrix& matrix) {
- if (!data || !size)
- return;
-
- buf << "q " << matrix << " cm ";
-
- CFX_FloatRect bbox = m_pPage->GetPageBBox();
- matrix.TransformRect(bbox);
-
- CPDF_Dictionary* pFormDict =
- new CPDF_Dictionary(m_pDocument->GetByteStringPool());
- pFormDict->SetNewFor<CPDF_Name>("Type", "XObject");
- pFormDict->SetNewFor<CPDF_Name>("Subtype", "Form");
- pFormDict->SetRectFor("BBox", bbox);
-
- CPDF_Stream* pStream = m_pDocument->NewIndirect<CPDF_Stream>();
- pStream->InitStream(data, size, pFormDict);
-
- CFX_ByteString name = RealizeResource(pStream->GetObjNum(), "XObject");
- buf << "/" << PDF_NameEncode(name) << " Do Q\n";
-}
-
-void CPDF_PageContentGenerator::TransformContent(CFX_Matrix& matrix) {
- CPDF_Dictionary* pDict = m_pPage->m_pFormDict;
- CPDF_Object* pContent =
- pDict ? pDict->GetDirectObjectFor("Contents") : nullptr;
- if (!pContent)
- return;
-
- CFX_ByteTextBuf buf;
- if (CPDF_Array* pArray = pContent->AsArray()) {
- size_t iCount = pArray->GetCount();
- CPDF_StreamAcc** pContentArray = FX_Alloc(CPDF_StreamAcc*, iCount);
- size_t size = 0;
- for (size_t i = 0; i < iCount; ++i) {
- pContent = pArray->GetObjectAt(i);
- CPDF_Stream* pStream = ToStream(pContent);
- if (!pStream)
- continue;
-
- CPDF_StreamAcc* pStreamAcc = new CPDF_StreamAcc();
- pStreamAcc->LoadAllData(pStream);
- pContentArray[i] = pStreamAcc;
- size += pContentArray[i]->GetSize() + 1;
- }
- int pos = 0;
- uint8_t* pBuf = FX_Alloc(uint8_t, size);
- for (size_t i = 0; i < iCount; ++i) {
- FXSYS_memcpy(pBuf + pos, pContentArray[i]->GetData(),
- pContentArray[i]->GetSize());
- pos += pContentArray[i]->GetSize() + 1;
- pBuf[pos - 1] = ' ';
- delete pContentArray[i];
- }
- ProcessForm(buf, pBuf, size, matrix);
- FX_Free(pBuf);
- FX_Free(pContentArray);
- } else if (CPDF_Stream* pStream = pContent->AsStream()) {
- CPDF_StreamAcc contentStream;
- contentStream.LoadAllData(pStream);
- ProcessForm(buf, contentStream.GetData(), contentStream.GetSize(), matrix);
- }
- CPDF_Stream* pStream = m_pDocument->NewIndirect<CPDF_Stream>();
- pStream->SetData(buf.GetBuffer(), buf.GetLength());
- m_pPage->m_pFormDict->SetNewFor<CPDF_Reference>("Contents", m_pDocument,
- pStream->GetObjNum());
+ *buf << "/" << PDF_NameEncode(name) << " Do Q\n";
}
diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator.h b/core/fpdfapi/edit/cpdf_pagecontentgenerator.h
index df8d3b0f8e..ac06dcb554 100644
--- a/core/fpdfapi/edit/cpdf_pagecontentgenerator.h
+++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator.h
@@ -9,36 +9,28 @@
#include <vector>
-#include "core/fpdfapi/parser/cpdf_document.h"
#include "core/fxcrt/fx_basic.h"
-#include "core/fxcrt/fx_coordinates.h"
#include "core/fxcrt/fx_system.h"
-class CPDF_Object;
+class CPDF_Document;
+class CPDF_ImageObject;
class CPDF_Page;
class CPDF_PageObject;
-class CPDF_ImageObject;
class CPDF_PageContentGenerator {
public:
explicit CPDF_PageContentGenerator(CPDF_Page* pPage);
~CPDF_PageContentGenerator();
- void InsertPageObject(CPDF_PageObject* pPageObject);
void GenerateContent();
- void TransformContent(CFX_Matrix& matrix);
private:
- void ProcessImage(CFX_ByteTextBuf& buf, CPDF_ImageObject* pImageObj);
- void ProcessForm(CFX_ByteTextBuf& buf,
- const uint8_t* data,
- uint32_t size,
- CFX_Matrix& matrix);
+ void ProcessImage(CFX_ByteTextBuf* buf, CPDF_ImageObject* pImageObj);
CFX_ByteString RealizeResource(uint32_t dwResourceObjNum,
const CFX_ByteString& bsType);
- CPDF_Page* m_pPage;
- CPDF_Document* m_pDocument;
+ CPDF_Page* const m_pPage;
+ CPDF_Document* const m_pDocument;
std::vector<CPDF_PageObject*> m_pageObjects;
};