diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-06-04 16:17:28 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-04 16:38:44 +0100 |
| commit | 57ef375bed4480bbedc799aca274a6bd26745008 (patch) | |
| tree | 36ffb48e6e34d9da82e4e199fa1d882218a09dc3 /vcl | |
| parent | 37be7a3f5d7871d87e7116ada3efaa94ae5ffd68 (diff) | |
ptr is just added to offset, so move addition into 2nd arg
Change-Id: Ia3e8145c69324f19aeec8b0dd97284ec382d20d7
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/fontsubset/sft.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index 8f07bb3355ec..21d6c5519a47 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -2556,12 +2556,12 @@ int GetTTNameRecords(TrueTypeFont *ttf, NameRecord **nr) NameRecord* rec = (NameRecord*)calloc(n, sizeof(NameRecord)); for (i = 0; i < n; i++) { - int nStrOffset = GetUInt16(table + 6, 10 + 12 * i, 1); - rec[i].platformID = GetUInt16(table + 6, 12 * i, 1); - rec[i].encodingID = GetUInt16(table + 6, 2 + 12 * i, 1); - rec[i].languageID = GetUInt16(table + 6, 4 + 12 * i, 1); - rec[i].nameID = GetUInt16(table + 6, 6 + 12 * i, 1); - rec[i].slen = GetUInt16(table + 6, 8 + 12 * i, 1); + int nStrOffset = GetUInt16(table, 6 + 10 + 12 * i, 1); + rec[i].platformID = GetUInt16(table, 6 + 12 * i, 1); + rec[i].encodingID = GetUInt16(table, 6 + 2 + 12 * i, 1); + rec[i].languageID = GetUInt16(table, 6 + 4 + 12 * i, 1); + rec[i].nameID = GetUInt16(table, 6 + 6 + 12 * i, 1); + rec[i].slen = GetUInt16(table, 6 + 8 + 12 * i, 1); if (rec[i].slen) { if( nStrBase+nStrOffset+rec[i].slen >= nTableSize ) { rec[i].sptr = 0; |