Backed out changeset 6c59f7c8ec17 - it didn't actually do anything us…

…eful
libsdl-org · Nov 15, 2013 · ef97aab9cf7f75f540d40c4568524f1a71ea9653 · ef97aab
1 parent 346ebbb
commit ef97aab9cf7f75f540d40c4568524f1a71ea9653
Unified Split

Showing with 29 additions and 37 deletions.

+16 −20 src/render/direct3d/SDL_render_d3d.c

+13 −17 src/render/opengl/SDL_render_gl.c
diff --git a/src/render/direct3d/SDL_render_d3d.c b/src/render/direct3d/SDL_render_d3d.c
@@ -1635,26 +1635,22 @@ D3D_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture,
     centerx = center->x;
     centery = center->y;
 
-    if ((flip & SDL_FLIP_VERTICAL) && (flip & SDL_FLIP_HORIZONTAL)) {
-        miny = dstrect->h - centery;
-        maxy = -centery;
-        minx = dstrect->w - centerx;
-        maxx = -centerx;
-    } else if (flip & SDL_FLIP_HORIZONTAL) {
-        miny = -centery;
-        maxy = dstrect->h - centery;
-        minx = dstrect->w - centerx;
-        maxx = -centerx;
-    } else if (flip & SDL_FLIP_VERTICAL) {
-        miny = dstrect->h - centery;
-        maxy = -centery;
-        minx = -centerx;
-        maxx = dstrect->w - centerx;
-    } else {
-        miny = -centery;
-        maxy = dstrect->h - centery;
-        minx = -centerx;
-        maxx = dstrect->w - centerx;
+    if (flip & SDL_FLIP_HORIZONTAL) {
+        minx = dstrect->w - centerx - 0.5f;
+        maxx = -centerx - 0.5f;
+    }
+    else {
+        minx = -centerx - 0.5f;
+        maxx = dstrect->w - centerx - 0.5f;
+    }
+
+    if (flip & SDL_FLIP_VERTICAL) {
+        miny = dstrect->h - centery - 0.5f;
+        maxy = -centery - 0.5f;
+    }
+    else {
+        miny = -centery - 0.5f;
+        maxy = dstrect->h - centery - 0.5f;
     }
 
     minu = (float) srcrect->x / texture->w;

diff --git a/src/render/opengl/SDL_render_gl.c b/src/render/opengl/SDL_render_gl.c
@@ -1250,26 +1250,22 @@ GL_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture,
     centerx = center->x;
     centery = center->y;
 
-    if ((flip & SDL_FLIP_VERTICAL) && (flip & SDL_FLIP_HORIZONTAL)) {
-        miny = dstrect->h - centery;
-        maxy = -centery;
-        minx = dstrect->w - centerx;
-        maxx = -centerx;
-    } else if (flip & SDL_FLIP_HORIZONTAL) {
-        miny = -centery;
-        maxy = dstrect->h - centery;
-        minx = dstrect->w - centerx;
+    if (flip & SDL_FLIP_HORIZONTAL) {
+        minx =  dstrect->w - centerx;
         maxx = -centerx;
-    } else if (flip & SDL_FLIP_VERTICAL) {
-        miny = dstrect->h - centery;
-        maxy = -centery;
+    }
+    else {
         minx = -centerx;
-        maxx = dstrect->w - centerx;
-    } else {
+        maxx =  dstrect->w - centerx;
+    }
+
+    if (flip & SDL_FLIP_VERTICAL) {
+        miny =  dstrect->h - centery;
+        maxy = -centery;
+    }
+    else {
         miny = -centery;
-        maxy = dstrect->h - centery;
-        minx = -centerx;
-        maxx = dstrect->w - centerx;
+        maxy =  dstrect->h - centery;
     }
 
     minu = (GLfloat) srcrect->x / texture->w;