diff options
| author |  humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-07 19:54:40 +0000 |
|---|---|---|
| committer | humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-07 19:54:40 +0000 |
| commit | 0e51577a14f903ffeafa117a75954baeb173ffb9 (patch) | |
| tree | 3f3d849f3b6ec7778660f0da19f5d4175ba9f800 /src/sfnt | |
| parent | af2bd7bdf593b3fc91bb1acffcc4a51bdb2f29ec (diff) | |
fix warning from scalar --> int32 conversion
BUG=
Review URL: https://codereview.appspot.com/7065050
git-svn-id: http://skia.googlecode.com/svn/trunk@7061 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/sfnt')
| -rw-r--r-- | src/sfnt/SkOTTable_glyf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sfnt/SkOTTable_glyf.h b/src/sfnt/SkOTTable_glyf.h index 30c99f62fa..ac34d7b816 100644 --- a/src/sfnt/SkOTTable_glyf.h +++ b/src/sfnt/SkOTTable_glyf.h @@ -40,7 +40,7 @@ struct SkOTTableGlyph { void advance(uint16_t num) { fLocaPtr.shortOffset += num << fLocaFormat; fCurrentGlyphOffset = fLocaFormat ? SkEndian_SwapBE32(*fLocaPtr.longOffset) - : SkEndian_SwapBE16(*fLocaPtr.shortOffset) << 1; + : uint32_t(SkEndian_SwapBE16(*fLocaPtr.shortOffset) << 1); } const SkOTTableGlyphData* next() { uint32_t previousGlyphOffset = fCurrentGlyphOffset; |