diff options
| -rw-r--r-- | include/core/SkDeviceProperties.h | 4 | ||||
| -rw-r--r-- | src/core/SkPaint.cpp | 8 | ||||
| -rw-r--r-- | src/device/xps/SkXPSDevice.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/core/SkDeviceProperties.h b/include/core/SkDeviceProperties.h index fcab9ad5c8..098c925124 100644 --- a/include/core/SkDeviceProperties.h +++ b/include/core/SkDeviceProperties.h @@ -53,10 +53,10 @@ struct SkDeviceProperties { } bool isOrientationKnown() { - return fGeometry & kKnown_Orientation; + return SkToBool(fGeometry & kKnown_Orientation); } bool isLayoutKnown() { - return fGeometry & kKnown_Layout; + return SkToBool(fGeometry & kKnown_Layout); } private: diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index 754098cca5..8f14ba8b3b 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -176,7 +176,7 @@ uint32_t SkPaint::getGenerationID() const { #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 @@ static void DetachDescProc(const SkDescriptor* desc, void* context) { #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::getUnicharMetrics(SkUnichar text) { 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 SkGlyph& SkPaint::getGlyphMetrics(uint16_t glyphId) { 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); diff --git a/src/device/xps/SkXPSDevice.cpp b/src/device/xps/SkXPSDevice.cpp index e1d5eedeaa..931a07c496 100644 --- a/src/device/xps/SkXPSDevice.cpp +++ b/src/device/xps/SkXPSDevice.cpp @@ -2061,7 +2061,7 @@ HRESULT SkXPSDevice::CreateTypefaceUse(const SkPaint& paint, 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); |