summaryrefslogtreecommitdiff
path: root/core/include/fpdfapi/fpdf_resource.h
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-06-10 23:17:04 -0700
committerLei Zhang <thestig@chromium.org>2015-06-10 23:17:04 -0700
commit4de48f764fd8369ecae258b410801b88925c0990 (patch)
tree6f64700d1b993890a7382e78cb68a27c7b6f9ed7 /core/include/fpdfapi/fpdf_resource.h
parentf6fd22f6226f69d728ecaa5a961f4bc10a4a225e (diff)
downloadpdfium-4de48f764fd8369ecae258b410801b88925c0990.tar.xz
Merge to XFA: Convert CPDF_ColorSpaceMap to std::map.
R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1154963003. (cherry picked from commit 22f429fc4875027b10ab071102c9ac8a88abf825) Review URL: https://codereview.chromium.org/1179783002.
Diffstat (limited to 'core/include/fpdfapi/fpdf_resource.h')
-rw-r--r--core/include/fpdfapi/fpdf_resource.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/include/fpdfapi/fpdf_resource.h b/core/include/fpdfapi/fpdf_resource.h
index a9b16c93f0..fa9ae31d2e 100644
--- a/core/include/fpdfapi/fpdf_resource.h
+++ b/core/include/fpdfapi/fpdf_resource.h
@@ -43,14 +43,13 @@ public:
ObjClass m_Obj;
FX_DWORD m_nCount;
};
-typedef CPDF_CountedObject<CPDF_ColorSpace*> CPDF_CountedColorSpace;
typedef CPDF_CountedObject<CPDF_Pattern*> CPDF_CountedPattern;
typedef CPDF_CountedObject<CPDF_Image*> CPDF_CountedImage;
typedef CPDF_CountedObject<CPDF_IccProfile*> CPDF_CountedICCProfile;
typedef CPDF_CountedObject<CPDF_StreamAcc*> CPDF_CountedStreamAcc;
+using CPDF_CountedColorSpace = CPDF_CountedObject<CPDF_ColorSpace*>;
-typedef CFX_MapPtrTemplate<CPDF_Object*, CPDF_CountedColorSpace*> CPDF_ColorSpaceMap;
typedef CFX_MapPtrTemplate<CPDF_Object*, CPDF_CountedPattern*> CPDF_PatternMap;
typedef CFX_MapPtrTemplate<FX_DWORD, CPDF_CountedImage*> CPDF_ImageMap;
typedef CFX_MapPtrTemplate<CPDF_Stream*, CPDF_CountedICCProfile*> CPDF_IccProfileMap;