fix warning about uninitialized typeface_encoding by folding glyph case into switch

git-svn-id: http://skia.googlecode.com/svn/trunk@14094 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 3 insertions, 6 deletions

diff --git a/src/core/SkFont.cpp b/src/core/SkFont.cpp
index 847ca2f9f8..1516211fa6 100644
--- a/src/core/SkFont.cpp
+++ b/src/core/SkFont.cpp
@@ -85,11 +85,6 @@ int SkFont::textToGlyphs(const void* text, size_t byteLength, SkTextEncoding enc
         return count;
     }
 
-    if (kGlyphID_SkTextEncoding == encoding) {
-        memcpy(glyphs, text, count << 1);
-        return count;
-    }
-
     // TODO: unify/eliminate SkTypeface::Encoding with SkTextEncoding
     SkTypeface::Encoding typeface_encoding;
     switch (encoding) {
@@ -103,7 +98,9 @@ int SkFont::textToGlyphs(const void* text, size_t byteLength, SkTextEncoding enc
             typeface_encoding = SkTypeface::kUTF32_Encoding;
             break;
         case kGlyphID_SkTextEncoding:
-            SkASSERT(0);    // can't get here
+            // we can early exit, since we already have glyphIDs
+            memcpy(glyphs, text, count << 1);
+            return count;
     }
 
     (void)fTypeface->charsToGlyphs(text, typeface_encoding, glyphs, count);