diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2017-04-17 21:35:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-26 08:50:54 +0200 |
| commit | c70d49c7c888da8cfd73db8585e7be1f37fc398a (patch) | |
| tree | c0e540401850018464ca76300536faf9aa7e27d2 /vcl/source/fontsubset | |
| parent | cd4344d3bdef631b3e64ac12a9e64bc9670c1b7c (diff) | |
use strong_int for LanguageType
Change-Id: If99a944f7032180355da291ad283b4cfcea4f448
Reviewed-on: https://gerrit.libreoffice.org/36629
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/fontsubset')
| -rw-r--r-- | vcl/source/fontsubset/sft.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/fontsubset/ttcr.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index f18622cbcc7b..713494c640b3 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -2613,7 +2613,7 @@ int GetTTNameRecords(TrueTypeFont *ttf, NameRecord **nr) rec[i].platformID = GetUInt16(table, 6 + 0 + 12 * i); rec[i].encodingID = GetUInt16(table, 6 + 2 + 12 * i); - rec[i].languageID = GetUInt16(table, 6 + 4 + 12 * i); + rec[i].languageID = LanguageType(GetUInt16(table, 6 + 4 + 12 * i)); rec[i].nameID = GetUInt16(table, 6 + 6 + 12 * i); rec[i].slen = GetUInt16(table, 6 + 8 + 12 * i); int nStrOffset = GetUInt16(table, nLargestFixedOffsetPos); diff --git a/vcl/source/fontsubset/ttcr.cxx b/vcl/source/fontsubset/ttcr.cxx index ac335512a6bc..a29dd9f61944 100644 --- a/vcl/source/fontsubset/ttcr.cxx +++ b/vcl/source/fontsubset/ttcr.cxx @@ -779,7 +779,7 @@ static int GetRawData_name(TrueTypeTable *_this, sal_uInt8 **ptr, sal_uInt32 *le for (i = 0; i < n; i++) { PutUInt16(nr[i].platformID, p1, 0, 1); PutUInt16(nr[i].encodingID, p1, 2, 1); - PutUInt16(nr[i].languageID, p1, 4, 1); + PutUInt16((sal_uInt16)nr[i].languageID, p1, 4, 1); PutUInt16(nr[i].nameID, p1, 6, 1); PutUInt16(nr[i].slen, p1, 8, 1); PutUInt16((sal_uInt16)(p2 - (name + 6 + 12 * n)), p1, 10, 1); |