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

Cleaned up warnings in Windows build.

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@7057 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
jvanverth@google.com 2013-01-07 18:41:28 +00:00
parent 57313f6472
commit 9c4e5ac5b7
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/effects/SkBlurMask.cpp
View File

@ -1060,13 +1060,13 @@ static float gaussian_integral( float x ) {
float x2 = x*x; float x2 = x*x;
float x3 = x2*x; float x3 = x2*x;
if ( x > 0.5 ) { if ( x > 0.5f ) {
return .5625 - ( x3 / 6 - 3 * x2 / 4 + 1.125 * x); return 0.5625f - ( x3 / 6.0f - 3.0f * x2 * 0.25f + 1.125f * x);
} }
if ( x > -0.5 ) { if ( x > -0.5f ) {
return 0.5 - (0.75 * x - x3 / 3); return 0.5f - (0.75f * x - x3 / 3.0f);
} }
return 0.4375 + (-x3 / 6 - 3 * x2 / 4 - 1.125 * x); return 0.4375f + (-x3 / 6.0f - 3.0f * x2 * 0.25f - 1.125f * x);
} }
/* /*
@ -1083,7 +1083,7 @@ static float gaussian_integral( float x ) {
*/ */
static int compute_profile( SkScalar radius, unsigned int **profile_out ) { static int compute_profile( SkScalar radius, unsigned int **profile_out ) {
int size = radius * 3 + 1; int size = SkScalarFloorToInt(radius * 3 + 1);
int center = size >> 1; int center = size >> 1;
unsigned int *profile = new unsigned int [size]; unsigned int *profile = new unsigned int [size];
@ -1123,7 +1123,7 @@ bool SkBlurMask::BlurRect(SkMask *dst, const SkRect &src,
if (margin) { if (margin) {
margin->set( pad, pad ); margin->set( pad, pad );
} }
dst->fBounds = SkIRect::MakeWH(src.width(), src.height()); dst->fBounds = SkIRect::MakeWH(SkScalarFloorToInt(src.width()), SkScalarFloorToInt(src.height()));
dst->fBounds.outset(pad, pad); dst->fBounds.outset(pad, pad);
dst->fRowBytes = dst->fBounds.width(); dst->fRowBytes = dst->fBounds.width();
@ -1135,8 +1135,8 @@ bool SkBlurMask::BlurRect(SkMask *dst, const SkRect &src,
return false; // too big to allocate, abort return false; // too big to allocate, abort
} }
int sw = src.width(); int sw = SkScalarFloorToInt(src.width());
int sh = src.height(); int sh = SkScalarFloorToInt(src.height());
uint8_t* dp = SkMask::AllocImage(dstSize); uint8_t* dp = SkMask::AllocImage(dstSize);

10
tools/PictureRenderer.cpp
View File

@ -522,8 +522,8 @@ bool TiledPictureRenderer::render(const SkString* path, SkBitmap** out) {
} }
if (NULL != out) { if (NULL != out) {
if (fCanvas->readPixels(&bitmap, 0, 0)) { if (fCanvas->readPixels(&bitmap, 0, 0)) {
bitmapCopySubset(bitmap, *out, fTileRects[i].left(), bitmapCopySubset(bitmap, *out, SkScalarFloorToInt(fTileRects[i].left()),
fTileRects[i].top()); SkScalarFloorToInt(fTileRects[i].top()));
} else { } else {
success = false; success = false;
} }
@ -594,7 +594,7 @@ public:
SkBitmap bitmap; SkBitmap bitmap;
if (fBitmap != NULL) { if (fBitmap != NULL) {
// All tiles are the same size. // All tiles are the same size.
setup_bitmap(&bitmap, fRects[0].width(), fRects[0].height()); setup_bitmap(&bitmap, SkScalarFloorToInt(fRects[0].width()), SkScalarFloorToInt(fRects[0].height()));
} }
for (int i = fStart; i < fEnd; i++) { for (int i = fStart; i < fEnd; i++) {
@ -608,8 +608,8 @@ public:
if (fBitmap != NULL) { if (fBitmap != NULL) {
if (fCanvas->readPixels(&bitmap, 0, 0)) { if (fCanvas->readPixels(&bitmap, 0, 0)) {
SkAutoLockPixels alp(*fBitmap); SkAutoLockPixels alp(*fBitmap);
bitmapCopySubset(bitmap, fBitmap, fRects[i].left(), bitmapCopySubset(bitmap, fBitmap, SkScalarFloorToInt(fRects[i].left()),
fRects[i].top()); SkScalarFloorToInt(fRects[i].top()));
} else { } else {
*fSuccess = false; *fSuccess = false;
// If one tile fails to read pixels, do not continue drawing the rest. // If one tile fails to read pixels, do not continue drawing the rest.