diff options
| author |  thakis@chromium.org <thakis@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-05-24 05:42:55 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-05-24 05:42:55 +0000 |
| commit | 598b859211d0772324da04a644c7a71ef585e38d (patch) | |
| tree | d90fef1d9f4f4aafd125424bbc140be484b1cec8 /src | |
| parent | eb5a8151a5c7bdd426ac10b965ab844891890367 (diff) | |
Fix a new clang warning:
third_party/skia/src/ports/SkFontHost_FreeType.cpp:957:7:error: switch case is
in protected scope
default:
^
third_party/skia/src/ports/SkFontHost_FreeType.cpp:918:17: note: jump bypasses
variable initialization
FT_BBox bbox;
^
third_party/skia/src/ports/SkFontHost_FreeType.cpp:946:7:error: switch case is
in protected scope
case FT_GLYPH_FORMAT_BITMAP:
^
third_party/skia/src/ports/SkFontHost_FreeType.cpp:918:17: note: jump bypasses
variable initialization
FT_BBox bbox;
^
2 errors generated.
This is arguably a false positive, but since |bbox| can only safely be used in
the first case branch, it's a good idea to scope it to there anyway. This is
the only instance this warning occurs in all of chrome.
Review URL: http://codereview.appspot.com/4532081/
git-svn-id: http://skia.googlecode.com/svn/trunk@1402 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
| -rw-r--r-- | src/ports/SkFontHost_FreeType.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index ae437a60d9..de1ce737d4 100644 --- a/src/ports/SkFontHost_FreeType.cpp +++ b/src/ports/SkFontHost_FreeType.cpp @@ -914,7 +914,7 @@ void SkScalerContext_FreeType::generateMetrics(SkGlyph* glyph) { } switch ( fFace->glyph->format ) { - case FT_GLYPH_FORMAT_OUTLINE: + case FT_GLYPH_FORMAT_OUTLINE: { FT_BBox bbox; if (fRec.fFlags & kEmbolden_Flag) { @@ -942,6 +942,7 @@ void SkScalerContext_FreeType::generateMetrics(SkGlyph* glyph) { glyph->fTop = -SkToS16(bbox.yMax >> 6); glyph->fLeft = SkToS16(bbox.xMin >> 6); break; + } case FT_GLYPH_FORMAT_BITMAP: if (fRec.fFlags & kEmbolden_Flag) { |