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

Unified Diff: core/fpdfapi/fpdf_page/cpdf_image.cpp

Issue 2345063002: Use string pools in some dictionaries (Closed)
Patch Set: Remove default ctor Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: core/fpdfapi/fpdf_page/cpdf_image.cpp
diff --git a/core/fpdfapi/fpdf_page/cpdf_image.cpp b/core/fpdfapi/fpdf_page/cpdf_image.cpp
index 02e492b27d18898547a0ec5736e145af1ea10916..751482a44bcebd2a1efcc9e8ce2301593ab614ca 100644
--- a/core/fpdfapi/fpdf_page/cpdf_image.cpp
+++ b/core/fpdfapi/fpdf_page/cpdf_image.cpp
@@ -85,7 +85,7 @@ CPDF_Dictionary* CPDF_Image::InitJPEG(uint8_t* pData, uint32_t size) {
return nullptr;
}
- CPDF_Dictionary* pDict = new CPDF_Dictionary;
+ CPDF_Dictionary* pDict = new CPDF_Dictionary(m_pDocument);
pDict->SetNameFor("Type", "XObject");
pDict->SetNameFor("Subtype", "Image");
pDict->SetIntegerFor("Width", width);
@@ -108,7 +108,7 @@ CPDF_Dictionary* CPDF_Image::InitJPEG(uint8_t* pData, uint32_t size) {
pDict->SetIntegerFor("BitsPerComponent", bits);
pDict->SetNameFor("Filter", "DCTDecode");
if (!color_trans) {
- CPDF_Dictionary* pParms = new CPDF_Dictionary;
+ CPDF_Dictionary* pParms = new CPDF_Dictionary(m_pDocument);
pDict->SetFor("DecodeParms", pParms);
pParms->SetIntegerFor("ColorTransform", 0);
}
@@ -150,7 +150,7 @@ void CPDF_Image::SetImage(const CFX_DIBitmap* pBitmap, int32_t iCompress) {
int32_t src_pitch = pBitmap->GetPitch();
int32_t bpp = pBitmap->GetBPP();
- CPDF_Dictionary* pDict = new CPDF_Dictionary;
+ CPDF_Dictionary* pDict = new CPDF_Dictionary(m_pDocument);
pDict->SetNameFor("Type", "XObject");
pDict->SetNameFor("Subtype", "Image");
pDict->SetIntegerFor("Width", BitmapWidth);
@@ -214,8 +214,8 @@ void CPDF_Image::SetImage(const CFX_DIBitmap* pBitmap, int32_t iCompress) {
ptr[2] = (uint8_t)argb;
ptr += 3;
}
- CPDF_Stream* pCTS =
- new CPDF_Stream(pColorTable, iPalette * 3, new CPDF_Dictionary);
+ CPDF_Stream* pCTS = new CPDF_Stream(pColorTable, iPalette * 3,
+ new CPDF_Dictionary(m_pDocument));
m_pDocument->AddIndirectObject(pCTS);
pCS->AddReference(m_pDocument, pCTS);
pDict->SetReferenceFor("ColorSpace", m_pDocument, pCS);
@@ -250,7 +250,7 @@ void CPDF_Image::SetImage(const CFX_DIBitmap* pBitmap, int32_t iCompress) {
int32_t maskHeight = pMaskBitmap->GetHeight();
uint8_t* mask_buf = nullptr;
FX_STRSIZE mask_size = 0;
- CPDF_Dictionary* pMaskDict = new CPDF_Dictionary;
+ CPDF_Dictionary* pMaskDict = new CPDF_Dictionary(m_pDocument);
pMaskDict->SetNameFor("Type", "XObject");
pMaskDict->SetNameFor("Subtype", "Image");
pMaskDict->SetIntegerFor("Width", maskWidth);

Powered by Google App Engine
This is Rietveld 408576698