diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-08-19 09:55:12 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-08-19 09:55:12 -0700 |
| commit | 90b5442f15cecbcf11ac5f6cea3ce612ad863363 (patch) | |
| tree | 51b6240a8401866380df855818e955348be0bd0f /core/src/fpdfapi/fpdf_font/ttgsubtable.h | |
| parent | 09d33bcd82a82cb55039d41651df13e17d6c3e59 (diff) | |
| download | pdfium-90b5442f15cecbcf11ac5f6cea3ce612ad863363.tar.xz | |
Merge to XFA: FX_CMapDwordToDword considered harmful.
(cherry picked from commit 85d5c4af4a9546970b34dd413c473d10fef8534b)
Original Review URL: https://codereview.chromium.org/1289703003 .
TBR=thestig@chromium.org
Conflicts:
core/include/fxcrt/fx_basic.h
BUG=
Review URL: https://codereview.chromium.org/1302783003 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_font/ttgsubtable.h')
| -rw-r--r-- | core/src/fpdfapi/fpdf_font/ttgsubtable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/fpdfapi/fpdf_font/ttgsubtable.h b/core/src/fpdfapi/fpdf_font/ttgsubtable.h index 67cda371c1..5cf0e2413f 100644 --- a/core/src/fpdfapi/fpdf_font/ttgsubtable.h +++ b/core/src/fpdfapi/fpdf_font/ttgsubtable.h @@ -341,7 +341,7 @@ class CFX_CTTGSUBTable { p += 4; return ret; } - CFX_CMapDWordToDWord m_featureMap; + std::map<FX_DWORD, FX_DWORD> m_featureMap; FX_BOOL m_bFeautureMapLoad; bool loaded; struct tt_gsub_header header; |