commit f8aa18c08d97cdc98a85a0422d3415822a73949c
author bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Mar 19 21:04:52 2012 +0000
committer bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Mar 19 21:04:52 2012 +0000
tree 85787d97063b4f8faebfa9b2d8d190e0e3ce5c24
parent d8b599cb264b2228e0fb1bee6d3604be6d3c2855

Compile with c++0x.
http://codereview.appspot.com/5841074/


git-svn-id: http://skia.googlecode.com/svn/trunk@3434 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/GrContext.cpp

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index ed5b1a3..97ef8c8 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -2129,8 +2129,8 @@
 
     const GrTextureDesc desc = {
         kRenderTarget_GrTextureFlagBit | kNoStencil_GrTextureFlagBit,
-        srcRect.width(),
-        srcRect.height(),
+        SkScalarFloorToInt(srcRect.width()),
+        SkScalarFloorToInt(srcRect.height()),
         kRGBA_8888_GrPixelConfig,
         {0} // samples 
     };

src/gpu/SkGpuDevice.cpp

diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index c8e5f48..4917dcb 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -774,8 +774,8 @@
     srcRect.offset(offset);
     const GrTextureDesc desc = {
         kRenderTarget_GrTextureFlagBit,
-        srcRect.width(),
-        srcRect.height(),
+        SkScalarCeilToInt(srcRect.width()),
+        SkScalarCeilToInt(srcRect.height()),
         // We actually only need A8, but it often isn't supported as a
         // render target
         kRGBA_8888_PM_GrPixelConfig,