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

Side by Side Diff: core/src/fpdfapi/fpdf_font/font_int.h

Issue 1356373003: Fix a bunch of sign mismatch warnings. (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: Created 5 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #ifndef CORE_SRC_FPDFAPI_FPDF_FONT_FONT_INT_H_ 7 #ifndef CORE_SRC_FPDFAPI_FPDF_FONT_FONT_INT_H_
8 #define CORE_SRC_FPDFAPI_FPDF_FONT_FONT_INT_H_ 8 #define CORE_SRC_FPDFAPI_FPDF_FONT_FONT_INT_H_
9 9
10 #include <map> 10 #include <map>
(...skipping 10 matching lines...) Expand all
21 21
22 short TT2PDF(int m, FXFT_Face face); 22 short TT2PDF(int m, FXFT_Face face);
23 FX_BOOL FT_UseTTCharmap(FXFT_Face face, int platform_id, int encoding_id); 23 FX_BOOL FT_UseTTCharmap(FXFT_Face face, int platform_id, int encoding_id);
24 24
25 class CPDF_CMapManager { 25 class CPDF_CMapManager {
26 public: 26 public:
27 CPDF_CMapManager(); 27 CPDF_CMapManager();
28 ~CPDF_CMapManager(); 28 ~CPDF_CMapManager();
29 void* GetPackage(FX_BOOL bPrompt); 29 void* GetPackage(FX_BOOL bPrompt);
30 CPDF_CMap* GetPredefinedCMap(const CFX_ByteString& name, FX_BOOL bPrompt); 30 CPDF_CMap* GetPredefinedCMap(const CFX_ByteString& name, FX_BOOL bPrompt);
31 CPDF_CID2UnicodeMap* GetCID2UnicodeMap(int charset, FX_BOOL bPrompt); 31 CPDF_CID2UnicodeMap* GetCID2UnicodeMap(size_t charset, FX_BOOL bPrompt);
32 void ReloadAll(); 32 void ReloadAll();
33 33
34 private: 34 private:
35 CPDF_CMap* LoadPredefinedCMap(const CFX_ByteString& name, FX_BOOL bPrompt); 35 CPDF_CMap* LoadPredefinedCMap(const CFX_ByteString& name, FX_BOOL bPrompt);
36 CPDF_CID2UnicodeMap* LoadCID2UnicodeMap(int charset, FX_BOOL bPrompt); 36 CPDF_CID2UnicodeMap* LoadCID2UnicodeMap(size_t charset, FX_BOOL bPrompt);
37 37
38 FX_BOOL m_bPrompted; 38 FX_BOOL m_bPrompted;
39 std::map<CFX_ByteString, CPDF_CMap*> m_CMaps; 39 std::map<CFX_ByteString, CPDF_CMap*> m_CMaps;
40 CPDF_CID2UnicodeMap* m_CID2UnicodeMaps[6]; 40 CPDF_CID2UnicodeMap* m_CID2UnicodeMaps[6];
41 }; 41 };
42 class CPDF_FontGlobals { 42 class CPDF_FontGlobals {
43 public: 43 public:
44 CPDF_FontGlobals(); 44 CPDF_FontGlobals();
45 ~CPDF_FontGlobals(); 45 ~CPDF_FontGlobals();
46 void ClearAll(); 46 void ClearAll();
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 FX_DWORD dwDataSize; 153 FX_DWORD dwDataSize;
154 FX_DWORD dwDataOffset; 154 FX_DWORD dwDataOffset;
155 FX_DWORD dwRecordSize; 155 FX_DWORD dwRecordSize;
156 } FXMP_FILEHEADER; 156 } FXMP_FILEHEADER;
157 class CPDF_CID2UnicodeMap { 157 class CPDF_CID2UnicodeMap {
158 public: 158 public:
159 CPDF_CID2UnicodeMap(); 159 CPDF_CID2UnicodeMap();
160 ~CPDF_CID2UnicodeMap(); 160 ~CPDF_CID2UnicodeMap();
161 FX_BOOL Initialize(); 161 FX_BOOL Initialize();
162 FX_BOOL IsLoaded(); 162 FX_BOOL IsLoaded();
163 void Load(CPDF_CMapManager* pMgr, int charset, FX_BOOL bPromptCJK); 163 void Load(CPDF_CMapManager* pMgr, size_t charset, FX_BOOL bPromptCJK);
164 FX_WCHAR UnicodeFromCID(FX_WORD CID); 164 FX_WCHAR UnicodeFromCID(FX_WORD CID);
165 165
166 protected: 166 protected:
167 int m_Charset; 167 size_t m_Charset;
Tom Sepez 2015/09/25 16:06:37 same here.
168 const FX_WORD* m_pEmbeddedMap; 168 const FX_WORD* m_pEmbeddedMap;
169 FX_DWORD m_EmbeddedCount; 169 FX_DWORD m_EmbeddedCount;
170 }; 170 };
171 class CPDF_ToUnicodeMap { 171 class CPDF_ToUnicodeMap {
172 public: 172 public:
173 void Load(CPDF_Stream* pStream); 173 void Load(CPDF_Stream* pStream);
174 CFX_WideString Lookup(FX_DWORD charcode); 174 CFX_WideString Lookup(FX_DWORD charcode);
175 FX_DWORD ReverseLookup(FX_WCHAR unicode); 175 FX_DWORD ReverseLookup(FX_WCHAR unicode);
176 176
177 protected: 177 protected:
178 std::map<FX_DWORD, FX_DWORD> m_Map; 178 std::map<FX_DWORD, FX_DWORD> m_Map;
179 CPDF_CID2UnicodeMap* m_pBaseMap; 179 CPDF_CID2UnicodeMap* m_pBaseMap;
180 CFX_WideTextBuf m_MultiCharBuf; 180 CFX_WideTextBuf m_MultiCharBuf;
181 }; 181 };
182 class CPDF_FontCharMap : public CFX_CharMap { 182 class CPDF_FontCharMap : public CFX_CharMap {
183 public: 183 public:
184 CPDF_FontCharMap(CPDF_Font* pFont); 184 CPDF_FontCharMap(CPDF_Font* pFont);
185 CPDF_Font* m_pFont; 185 CPDF_Font* m_pFont;
186 }; 186 };
187 187
188 #endif // CORE_SRC_FPDFAPI_FPDF_FONT_FONT_INT_H_ 188 #endif // CORE_SRC_FPDFAPI_FPDF_FONT_FONT_INT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698