summaryrefslogtreecommitdiff
path: root/core/include
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-06-10 23:19:42 -0700
committerLei Zhang <thestig@chromium.org>2015-06-10 23:19:42 -0700
commit461bb6aea17b573983476a78c64e77eb2e30aebf (patch)
tree024d395d2918cf605b223e5a392d9f6f0d33a578 /core/include
parent4de48f764fd8369ecae258b410801b88925c0990 (diff)
downloadpdfium-461bb6aea17b573983476a78c64e77eb2e30aebf.tar.xz
Merge to XFA: Convert CPDF_PatternMap to std::map.
R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1162123004. (cherry picked from commit b3aa96cbee31e81d0a72a61027467a2713654499) Review URL: https://codereview.chromium.org/1181573005.
Diffstat (limited to 'core/include')
-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 fa9ae31d2e..1730fbded0 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_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*>;
+using CPDF_CountedPattern = CPDF_CountedObject<CPDF_Pattern*>;
-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;
typedef CFX_MapPtrTemplate<CPDF_Stream*, CPDF_CountedStreamAcc*> CPDF_FontFileMap;