diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2016-02-29 12:58:26 -0500 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2016-02-29 12:58:26 -0500 |
| commit | 60c865d88474bab2696d1f8f62d825df001df601 (patch) | |
| tree | cb3bea1d40dabb49ae497bdbdde243a2fb70f3a5 | |
| parent | 45a23fd1c24cb3c22cfd8406ed7247e9d84887be (diff) | |
| download | pdfium-60c865d88474bab2696d1f8f62d825df001df601.tar.xz | |
Add missing field initializers to g_PredefinedCMaps.
This CL adds some missing initializers for m_LeadingSegCount and
m_LeadingSegs. This silences a series of warnings on OSX.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1744903002 .
| -rw-r--r-- | core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp index 63e4a501c4..de6ed1b9b5 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp @@ -69,8 +69,8 @@ const CPDF_PredefinedCMap g_PredefinedCMaps[] = { CPDF_CMap::MixedTwoBytes, 1, {0x81, 0xfe}}, - {"UniGB-UCS2", CIDSET_GB1, CIDCODING_UCS2, CPDF_CMap::TwoBytes}, - {"UniGB-UTF16", CIDSET_GB1, CIDCODING_UTF16, CPDF_CMap::TwoBytes}, + {"UniGB-UCS2", CIDSET_GB1, CIDCODING_UCS2, CPDF_CMap::TwoBytes, 0, {}}, + {"UniGB-UTF16", CIDSET_GB1, CIDCODING_UTF16, CPDF_CMap::TwoBytes, 0, {}}, {"B5pc", CIDSET_CNS1, CIDCODING_BIG5, @@ -95,8 +95,8 @@ const CPDF_PredefinedCMap g_PredefinedCMaps[] = { CPDF_CMap::MixedTwoBytes, 1, {0xa1, 0xfe}}, - {"UniCNS-UCS2", CIDSET_CNS1, CIDCODING_UCS2, CPDF_CMap::TwoBytes}, - {"UniCNS-UTF16", CIDSET_CNS1, CIDCODING_UTF16, CPDF_CMap::TwoBytes}, + {"UniCNS-UCS2", CIDSET_CNS1, CIDCODING_UCS2, CPDF_CMap::TwoBytes, 0, {}}, + {"UniCNS-UTF16", CIDSET_CNS1, CIDCODING_UTF16, CPDF_CMap::TwoBytes, 0, {}}, {"83pv-RKSJ", CIDSET_JAPAN1, CIDCODING_JIS, @@ -141,9 +141,19 @@ const CPDF_PredefinedCMap g_PredefinedCMaps[] = { CPDF_CMap::MixedTwoBytes, 2, {0x81, 0x9f, 0xe0, 0xfc}}, - {"UniJIS-UCS2", CIDSET_JAPAN1, CIDCODING_UCS2, CPDF_CMap::TwoBytes}, - {"UniJIS-UCS2-HW", CIDSET_JAPAN1, CIDCODING_UCS2, CPDF_CMap::TwoBytes}, - {"UniJIS-UTF16", CIDSET_JAPAN1, CIDCODING_UTF16, CPDF_CMap::TwoBytes}, + {"UniJIS-UCS2", CIDSET_JAPAN1, CIDCODING_UCS2, CPDF_CMap::TwoBytes, 0, {}}, + {"UniJIS-UCS2-HW", + CIDSET_JAPAN1, + CIDCODING_UCS2, + CPDF_CMap::TwoBytes, + 0, + {}}, + {"UniJIS-UTF16", + CIDSET_JAPAN1, + CIDCODING_UTF16, + CPDF_CMap::TwoBytes, + 0, + {}}, {"KSC-EUC", CIDSET_KOREA1, CIDCODING_KOREA, @@ -168,8 +178,8 @@ const CPDF_PredefinedCMap g_PredefinedCMaps[] = { CPDF_CMap::MixedTwoBytes, 1, {0xa1, 0xfd}}, - {"UniKS-UCS2", CIDSET_KOREA1, CIDCODING_UCS2, CPDF_CMap::TwoBytes}, - {"UniKS-UTF16", CIDSET_KOREA1, CIDCODING_UTF16, CPDF_CMap::TwoBytes}, + {"UniKS-UCS2", CIDSET_KOREA1, CIDCODING_UCS2, CPDF_CMap::TwoBytes, 0, {}}, + {"UniKS-UTF16", CIDSET_KOREA1, CIDCODING_UTF16, CPDF_CMap::TwoBytes, 0, {}}, }; CIDSet CIDSetFromSizeT(size_t index) { |