Minor Windows compiler complaint fixes
http://codereview.appspot.com/5988072/
git-svn-id: http://skia.googlecode.com/svn/trunk@3644 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index c2e090c..cf05284 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -1431,8 +1431,8 @@
const GrTextureDesc desc = {
kRenderTarget_GrTextureFlagBit,
- rect.width(),
- rect.height(),
+ SkScalarCeilToInt(rect.width()),
+ SkScalarCeilToInt(rect.height()),
kRGBA_8888_PM_GrPixelConfig,
0 // samples
};
@@ -1490,7 +1490,7 @@
SkImageFilter* filter = paint.getImageFilter();
if (NULL != filter) {
GrTexture* filteredTexture = filter_texture(fContext, texture, filter,
- GrRect::MakeWH(w, h));
+ GrRect::MakeWH(SkIntToScalar(w), SkIntToScalar(h)));
if (filteredTexture) {
grPaint.setTexture(kBitmapTextureIdx, filteredTexture);
texture = filteredTexture;
@@ -1529,7 +1529,8 @@
SkImageFilter* filter = paint.getImageFilter();
if (NULL != filter) {
- GrRect rect = GrRect::MakeWH(devTex->width(), devTex->height());
+ GrRect rect = GrRect::MakeWH(SkIntToScalar(devTex->width()),
+ SkIntToScalar(devTex->height()));
GrTexture* filteredTexture = filter_texture(fContext, devTex, filter,
rect);
if (filteredTexture) {
@@ -1591,7 +1592,8 @@
SkAutoCachedTexture act(this, src, sampler, &texture);
result->setConfig(src.config(), src.width(), src.height());
- GrRect rect = GrRect::MakeWH(src.width(), src.height());
+ GrRect rect = GrRect::MakeWH(SkIntToScalar(src.width()),
+ SkIntToScalar(src.height()));
GrTexture* resultTexture = filter_texture(fContext, texture, filter, rect);
if (resultTexture) {
result->setPixelRef(new SkGrTexturePixelRef(resultTexture))->unref();