commit ba3284e7bbb830749206414890f8152e421969f2
author bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jan 22 19:49:33 2013 +0000
committer bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jan 22 19:49:33 2013 +0000
tree 5b22cc6b39c37452e13a38c83a5b5ed96ed007c7
parent dd4b74548accfbf42b8e6b8d7eefbfb8c8f17e00

Fix VC++ warning and Android only code for 7317.


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

include/core/SkDeviceProperties.h

diff --git a/include/core/SkDeviceProperties.h b/include/core/SkDeviceProperties.h
index fcab9ad..098c925 100644
--- a/include/core/SkDeviceProperties.h
+++ b/include/core/SkDeviceProperties.h
@@ -53,10 +53,10 @@
         }
 
         bool isOrientationKnown() {
-            return fGeometry & kKnown_Orientation;
+            return SkToBool(fGeometry & kKnown_Orientation);
         }
         bool isLayoutKnown() {
-            return fGeometry & kKnown_Layout;
+            return SkToBool(fGeometry & kKnown_Layout);
         }
 
     private:

src/core/SkPaint.cpp

diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index 754098c..8f14ba8 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -176,7 +176,7 @@
 
 #ifdef SK_BUILD_FOR_ANDROID
 unsigned SkPaint::getBaseGlyphCount(SkUnichar text) const {
-    SkAutoGlyphCache autoCache(*this, NULL);
+    SkAutoGlyphCache autoCache(*this, NULL, NULL);
     SkGlyphCache* cache = autoCache.getCache();
     return cache->getBaseGlyphCount(text);
 }
@@ -413,7 +413,7 @@
 #ifdef SK_BUILD_FOR_ANDROID
 const SkGlyph& SkPaint::getUnicharMetrics(SkUnichar text) {
     SkGlyphCache* cache;
-    descriptorProc(NULL, DetachDescProc, &cache, true);
+    descriptorProc(NULL, NULL, DetachDescProc, &cache, true);
 
     const SkGlyph& glyph = cache->getUnicharMetrics(text);
 
@@ -423,7 +423,7 @@
 
 const SkGlyph& SkPaint::getGlyphMetrics(uint16_t glyphId) {
     SkGlyphCache* cache;
-    descriptorProc(NULL, DetachDescProc, &cache, true);
+    descriptorProc(NULL, NULL, DetachDescProc, &cache, true);
 
     const SkGlyph& glyph = cache->getGlyphIDMetrics(glyphId);
 
@@ -434,7 +434,7 @@
 const void* SkPaint::findImage(const SkGlyph& glyph) {
     // See ::detachCache()
     SkGlyphCache* cache;
-    descriptorProc(NULL, DetachDescProc, &cache, true);
+    descriptorProc(NULL, NULL, DetachDescProc, &cache, true);
 
     const void* image = cache->findImage(glyph);
 

src/device/xps/SkXPSDevice.cpp

diff --git a/src/device/xps/SkXPSDevice.cpp b/src/device/xps/SkXPSDevice.cpp
index e1d5eed..931a07c 100644
--- a/src/device/xps/SkXPSDevice.cpp
+++ b/src/device/xps/SkXPSDevice.cpp
@@ -2061,7 +2061,7 @@
     newTypefaceUse.fontData = fontData;
     newTypefaceUse.xpsFont = xpsFontResource.release();
 
-    SkAutoGlyphCache agc = SkAutoGlyphCache(paint, &SkMatrix::I());
+    SkAutoGlyphCache agc = SkAutoGlyphCache(paint, NULL, &SkMatrix::I());
     SkGlyphCache* glyphCache = agc.getCache();
     unsigned int glyphCount = glyphCache->getGlyphCount();
     newTypefaceUse.glyphsUsed = new SkBitSet(glyphCount);