diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-21 17:15:27 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-21 17:15:27 +0000 |
| commit | ab6eeb9d8405ade57d251f93b0788f75ec83ed54 (patch) | |
| tree | a286736bdfa3897ce5b454c319f80837b1fd5c5f | |
| parent | bfae9d373ccc9cf47fd70757092962c7850fadf4 (diff) | |
Fix release build warnings for unused variables
R=rmistry@google.com
Review URL: https://codereview.chromium.org/15565008
git-svn-id: http://skia.googlecode.com/svn/trunk@9220 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | src/ports/SkFontConfigInterface_android.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/ports/SkFontConfigInterface_android.cpp b/src/ports/SkFontConfigInterface_android.cpp index 850d902ba4..fee896ae0b 100644 --- a/src/ports/SkFontConfigInterface_android.cpp +++ b/src/ports/SkFontConfigInterface_android.cpp @@ -412,8 +412,8 @@ bool SkFontConfigInterfaceAndroid::matchFamilyName(const char familyName[], } else { // find familyName from list of names const char* familyName = NULL; - bool found = fFamilyNameDict.findKey(familyRecID, &familyName); - SkASSERT(found && familyName); + SkAssertResult(fFamilyNameDict.findKey(familyRecID, &familyName)); + SkASSERT(familyName); outFamilyName->set(familyName); } } @@ -542,13 +542,11 @@ SkTypeface* SkFontConfigInterfaceAndroid::nextLogicalTypeface(SkFontID currFontI return NULL; } - const SkTypeface* origTypeface = SkTypefaceCache::FindByID(origFontID); const SkTypeface* currTypeface = SkTypefaceCache::FindByID(currFontID); FallbackFontList* currentFallbackList = findFallbackFontList(opts.getLanguage()); SkASSERT(currentFallbackList); - SkASSERT(origTypeface != 0); SkASSERT(currTypeface != 0); // we must convert currTypeface into a FontRecID |