AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sanitizing source files in Skia_Periodic_House_Keeping

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@5735 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2012-09-29 02:01:02 +00:00
parent 2e6020634a
commit 22b460cef6
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
experimental/Intersection/EdgeWalker_TestUtility.cpp
View File

@ -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();

4
include/gpu/SkGpuDevice.h
View File

@ -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&);
/**

8
src/gpu/SkGpuDevice.cpp
View File

@ -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

4
src/ports/SkFontHost_mac_coretext.cpp
View File

@ -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);