From a51a4952e498e29a4ef2bab104c739b9666411d8 Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Thu, 15 Nov 2012 19:11:24 +0000
Subject: [PATCH] Cleaned up a few VC warnings.

---
 modules/juce_graphics/native/juce_RenderingHelpers.h      | 4 ++--
 modules/juce_opengl/opengl/juce_OpenGLContext.cpp         | 6 +++---
 modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/juce_graphics/native/juce_RenderingHelpers.h b/modules/juce_graphics/native/juce_RenderingHelpers.h
index 0f8f796f52..24ed47d3e1 100644
--- a/modules/juce_graphics/native/juce_RenderingHelpers.h
+++ b/modules/juce_graphics/native/juce_RenderingHelpers.h
@@ -122,9 +122,9 @@ public:
     }
 
     template <typename Type>
-    Rectangle<Type> transformed (const Rectangle<Type>& r) const noexcept
+    Rectangle<float> transformed (const Rectangle<Type>& r) const noexcept
     {
-        return r.transformed (complexTransform);
+        return r.toFloat().transformed (complexTransform);
     }
 
     Rectangle<int> deviceSpaceToUserSpace (const Rectangle<int>& r) const noexcept
diff --git a/modules/juce_opengl/opengl/juce_OpenGLContext.cpp b/modules/juce_opengl/opengl/juce_OpenGLContext.cpp
index 291c56df18..5aa4619c9a 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLContext.cpp
+++ b/modules/juce_opengl/opengl/juce_OpenGLContext.cpp
@@ -118,7 +118,7 @@ public:
         return true;
     }
 
-    void clearRegionInFrameBuffer (const RectangleList& list, const double scale)
+    void clearRegionInFrameBuffer (const RectangleList& list, const float scale)
     {
         glClearColor (0, 0, 0, 0);
         glEnable (GL_SCISSOR_TEST);
@@ -129,7 +129,7 @@ public:
 
         for (const Rectangle<int>* i = list.begin(), * const e = list.end(); i != e; ++i)
         {
-            const Rectangle<int> r (*i * scale);
+            const Rectangle<int> r ((i->toFloat() * scale).getSmallestIntegerContainer());
             glScissor (r.getX(), imageH - r.getBottom(), r.getWidth(), r.getHeight());
             glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
         }
@@ -214,7 +214,7 @@ public:
 
         if (! invalid.isEmpty())
         {
-            clearRegionInFrameBuffer (invalid, scale);
+            clearRegionInFrameBuffer (invalid, (float) scale);
 
             {
                 ScopedPointer<LowLevelGraphicsContext> g (createOpenGLGraphicsContext (context, cachedImageFrameBuffer));
diff --git a/modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp b/modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp
index 02bbc90210..217c0fb39e 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp
+++ b/modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp
@@ -1835,7 +1835,7 @@ public:
             else if (transform.isIntegerScaling)
             {
                 cloneClipIfMultiplyReferenced();
-                clip = clip->clipToRectangle (transform.transformed (r));
+                clip = clip->clipToRectangle (transform.transformed (r).getSmallestIntegerContainer());
             }
             else
             {
@@ -1865,7 +1865,7 @@ public:
                 RectangleList scaledList;
 
                 for (const Rectangle<int>* i = r.begin(), * const e = r.end(); i != e; ++i)
-                    scaledList.add (transform.transformed (*i));
+                    scaledList.add (transform.transformed (*i).getSmallestIntegerContainer());
 
                 clip = clip->clipToRectangleList (scaledList);
             }