From 461bb6aea17b573983476a78c64e77eb2e30aebf Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 10 Jun 2015 23:19:42 -0700 Subject: 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. --- core/include/fpdfapi/fpdf_resource.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'core/include/fpdfapi/fpdf_resource.h') 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_CountedPattern; typedef CPDF_CountedObject CPDF_CountedImage; typedef CPDF_CountedObject CPDF_CountedICCProfile; typedef CPDF_CountedObject CPDF_CountedStreamAcc; using CPDF_CountedColorSpace = CPDF_CountedObject; +using CPDF_CountedPattern = CPDF_CountedObject; -typedef CFX_MapPtrTemplate CPDF_PatternMap; typedef CFX_MapPtrTemplate CPDF_ImageMap; typedef CFX_MapPtrTemplate CPDF_IccProfileMap; typedef CFX_MapPtrTemplate CPDF_FontFileMap; -- cgit v1.2.3