summaryrefslogtreecommitdiff
path: root/core/include/fpdfapi
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-06-10 23:21:52 -0700
committerLei Zhang <thestig@chromium.org>2015-06-10 23:21:52 -0700
commit5cc0a40c39aed4624a89c19fac43e92c68922bc1 (patch)
tree82af4b9191e2366d016d40977a6114ae8794bbfa /core/include/fpdfapi
parent461bb6aea17b573983476a78c64e77eb2e30aebf (diff)
downloadpdfium-5cc0a40c39aed4624a89c19fac43e92c68922bc1.tar.xz
Merge to XFA: Convert CPDF_ImageMap to std::map.
Also simplify CPDF_DocPageData::ReleaseIccProfile() since its first argument is always null. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1149273004. (cherry picked from commit a8a718c974210a919f2af0b099d540143cf330c6) Review URL: https://codereview.chromium.org/1180613004.
Diffstat (limited to 'core/include/fpdfapi')
-rw-r--r--core/include/fpdfapi/fpdf_resource.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/include/fpdfapi/fpdf_resource.h b/core/include/fpdfapi/fpdf_resource.h
index 1730fbded0..d49ed4ec5c 100644
--- a/core/include/fpdfapi/fpdf_resource.h
+++ b/core/include/fpdfapi/fpdf_resource.h
@@ -43,14 +43,12 @@ public:
ObjClass m_Obj;
FX_DWORD m_nCount;
};
-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<FX_DWORD, CPDF_CountedImage*> CPDF_ImageMap;
typedef CFX_MapPtrTemplate<CPDF_Stream*, CPDF_CountedICCProfile*> CPDF_IccProfileMap;
typedef CFX_MapPtrTemplate<CPDF_Stream*, CPDF_CountedStreamAcc*> CPDF_FontFileMap;