diff options
| -rw-r--r-- | experimental/Intersection/EdgeWalker_TestUtility.cpp | 2 | ||||
| -rw-r--r-- | include/gpu/SkGpuDevice.h | 4 | ||||
| -rw-r--r-- | src/gpu/SkGpuDevice.cpp | 8 | ||||
| -rw-r--r-- | src/ports/SkFontHost_mac_coretext.cpp | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/experimental/Intersection/EdgeWalker_TestUtility.cpp b/experimental/Intersection/EdgeWalker_TestUtility.cpp index 9ff03f7efe..397bfcacbc 100644 --- a/experimental/Intersection/EdgeWalker_TestUtility.cpp +++ b/experimental/Intersection/EdgeWalker_TestUtility.cpp @@ -81,7 +81,7 @@ static int pathsDrawTheSame(const SkPath& one, const SkPath& two, bits.setConfig(SkBitmap::kARGB_8888_Config, bitWidth * 2, bitHeight); bits.allocPixels(); } - + SkRect larger = one.getBounds(); larger.join(two.getBounds()); SkScalar largerWidth = larger.width(); diff --git a/include/gpu/SkGpuDevice.h b/include/gpu/SkGpuDevice.h index c9d54e58e3..790d4a9ca1 100644 --- a/include/gpu/SkGpuDevice.h +++ b/include/gpu/SkGpuDevice.h @@ -170,10 +170,10 @@ private: const SkMatrix& m, const GrTextureParams& params, GrPaint* grPaint); - void drawBitmapCommon(const SkDraw&, + void drawBitmapCommon(const SkDraw&, const SkBitmap& bitmap, const SkRect* srcRectPtr, - const SkMatrix&, + const SkMatrix&, const SkPaint&); /** diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index ee09371e91..5b210b2932 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -1353,9 +1353,9 @@ void SkGpuDevice::drawTiledBitmap(const SkDraw& draw, for (int x = 0; x <= nx; x++) { for (int y = 0; y <= ny; y++) { SkRect tileR; - tileR.set(SkIntToScalar(x * tileSize), + tileR.set(SkIntToScalar(x * tileSize), SkIntToScalar(y * tileSize), - SkIntToScalar((x + 1) * tileSize), + SkIntToScalar((x + 1) * tileSize), SkIntToScalar((y + 1) * tileSize)); if (!SkRect::Intersects(tileR, clipRect)) { @@ -1367,7 +1367,7 @@ void SkGpuDevice::drawTiledBitmap(const SkDraw& draw, } SkBitmap tmpB; - SkIRect iTileR; + SkIRect iTileR; tileR.roundOut(&iTileR); if (bitmap.extractSubset(&tmpB, iTileR)) { // now offset it to make it "local" to our tmp bitmap @@ -1472,7 +1472,7 @@ void SkGpuDevice::internalDrawBitmap(const SkDraw& draw, bool needsTextureDomain = false; if (params.isBilerp()) { // Need texture domain if drawing a sub rect. - needsTextureDomain = srcRect.width() < bitmap.width() || + needsTextureDomain = srcRect.width() < bitmap.width() || srcRect.height() < bitmap.height(); if (m.rectStaysRect() && draw.fMatrix->rectStaysRect()) { // sampling is axis-aligned diff --git a/src/ports/SkFontHost_mac_coretext.cpp b/src/ports/SkFontHost_mac_coretext.cpp index 1847562824..8e9eb80dfb 100644 --- a/src/ports/SkFontHost_mac_coretext.cpp +++ b/src/ports/SkFontHost_mac_coretext.cpp @@ -747,7 +747,7 @@ CGRGBPixel* Offscreen::getCG(const SkScalerContext_Mac& context, const SkGlyph& doLCD = true; doAA = true; } - + //FIXME: lcd smoothed un-hinted rasterization unsupported. Tracked by //http://code.google.com/p/skia/issues/detail?id=915 if (!generateA8FromLCD && SkMask::kA8_Format == glyph.fMaskFormat) { @@ -1205,7 +1205,7 @@ void SkScalerContext_Mac::generateImage(const SkGlyph& glyph, SkMaskGamma::PreBl //FIXME: lcd smoothed un-hinted rasterization unsupported. Tracked by //http://code.google.com/p/skia/issues/detail?id=915 bool generateA8FromLCD = fRec.getHinting() != SkPaint::kNo_Hinting; - + // Draw the glyph size_t cgRowBytes; CGRGBPixel* cgPixels = fOffscreen.getCG(*this, glyph, cgGlyph, &cgRowBytes, generateA8FromLCD); |