From 468552b44bddd6856936c3293b8d19d0b225a4c9 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 26 Aug 2013 21:43:44 +0300
Subject: fix clipping in software mode in SDL2.

---
 src/sdl2graphics.cpp | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/sdl2graphics.cpp b/src/sdl2graphics.cpp
index a0ca2e04d..91b70cdf3 100644
--- a/src/sdl2graphics.cpp
+++ b/src/sdl2graphics.cpp
@@ -124,6 +124,9 @@ bool SDLGraphics::drawImage2(const Image *const image, int srcX, int srcY,
         return false;
 
     const gcn::ClipRectangle &top = mClipStack.top();
+    if (!top.height)
+        return false;
+
     const SDL_Rect &bounds = image->mBounds;
     const SDL_Rect srcRect
     {
@@ -132,6 +135,7 @@ bool SDLGraphics::drawImage2(const Image *const image, int srcX, int srcY,
         static_cast<int32_t>(width),
         static_cast<int32_t>(height)
     };
+
     const SDL_Rect dstRect
     {
         static_cast<int32_t>(dstX + top.xOffset),
@@ -154,13 +158,16 @@ void SDLGraphics::drawImagePattern(const Image *const image,
     if (!image->mTexture)
         return;
 
+    const gcn::ClipRectangle &top = mClipStack.top();
+    if (!top.height)
+        return;
+
     const SDL_Rect &bounds = image->mBounds;
     const int iw = bounds.w;
     const int ih = bounds.h;
     if (iw == 0 || ih == 0)
         return;
 
-    const gcn::ClipRectangle &top = mClipStack.top();
     const int xOffset = top.xOffset + x;
     const int yOffset = top.yOffset + y;
 
@@ -202,6 +209,10 @@ void SDLGraphics::drawRescaledImagePattern(const Image *const image,
     if (scaledHeight == 0 || scaledWidth == 0)
         return;
 
+    const gcn::ClipRectangle &top = mClipStack.top();
+    if (!top.height)
+        return;
+
     Image *const tmpImage = image->SDLgetScaledImage(
         scaledWidth, scaledHeight);
     if (!tmpImage)
@@ -213,7 +224,6 @@ void SDLGraphics::drawRescaledImagePattern(const Image *const image,
     if (iw == 0 || ih == 0)
         return;
 
-    const gcn::ClipRectangle &top = mClipStack.top();
     const int xOffset = top.xOffset + x;
     const int yOffset = top.yOffset + y;
 
@@ -251,13 +261,16 @@ void SDLGraphics::calcImagePattern(ImageVertexes* const vert,
     if (!vert || !mWindow || !image || !image->mTexture)
         return;
 
+    const gcn::ClipRectangle &top = mClipStack.top();
+    if (!top.height)
+        return;
+
     const SDL_Rect &bounds = image->mBounds;
     const int iw = bounds.w;
     const int ih = bounds.h;
     if (iw == 0 || ih == 0)
         return;
 
-    const gcn::ClipRectangle &top = mClipStack.top();
     const int xOffset = top.xOffset + x;
     const int yOffset = top.yOffset + y;
     const int srcX = bounds.x;
@@ -325,9 +338,12 @@ void SDLGraphics::calcTileSDL(ImageVertexes *const vert, int x, int y) const
     if (!vert || !vert->image || !vert->image->mTexture)
         return;
 
+    const gcn::ClipRectangle &top = mClipStack.top();
+    if (!top.height)
+        return;
+
     const Image *const image = vert->image;
     const SDL_Rect &bounds = image->mBounds;
-    const gcn::ClipRectangle &top = mClipStack.top();
 
     x += top.xOffset;
     y += top.yOffset;
-- 
cgit v1.2.3-70-g09d2