Browse Source

Cleaned up a few VC warnings.

tags/2021-05-28
jules 13 years ago
parent
commit
a51a4952e4
3 changed files with 7 additions and 7 deletions
  1. +2
    -2
      modules/juce_graphics/native/juce_RenderingHelpers.h
  2. +3
    -3
      modules/juce_opengl/opengl/juce_OpenGLContext.cpp
  3. +2
    -2
      modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp

+ 2
- 2
modules/juce_graphics/native/juce_RenderingHelpers.h View File

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


+ 3
- 3
modules/juce_opengl/opengl/juce_OpenGLContext.cpp View File

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


+ 2
- 2
modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp View File

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


Loading…
Cancel
Save