From ba202b497a8cc9c0989d2b3d60a10ab61c9a24ad Mon Sep 17 00:00:00 2001 From: Stefano Musumeci Date: Sun, 13 Jul 2014 18:51:33 +0200 Subject: [PATCH] TINYGL: Removed unnecessary function arguments to tglBlitScale --- graphics/tinygl/zblit.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/graphics/tinygl/zblit.cpp b/graphics/tinygl/zblit.cpp index b5c1b334761..8cd6303a998 100644 --- a/graphics/tinygl/zblit.cpp +++ b/graphics/tinygl/zblit.cpp @@ -167,8 +167,8 @@ void tglBlitRLE(BlitImage *blitImage, int dstX, int dstY, int srcX, int srcY, in Graphics::PixelBuffer dstBuf(c->fb->cmode, c->fb->getPixelBuffer()); + const int kBytesPerPixel = 2; if (disableColoring) { - const int kBytesPerPixel = 2; int lineIndex = 0; int maxY = srcY + clampHeight; int maxX = srcX + clampWidth; @@ -189,7 +189,6 @@ void tglBlitRLE(BlitImage *blitImage, int dstX, int dstY, int srcX, int srcY, in lineIndex++; } } else { - const int kBytesPerPixel = 2; int lineIndex = 0; int maxY = srcY + clampHeight; int maxX = srcX + clampWidth; @@ -267,8 +266,8 @@ void tglBlitSimple(BlitImage *blitImage, int dstX, int dstY, int srcX, int srcY, } template -void tglBlitScale(BlitImage *blitImage, int dstX, int dstY, int width, int height, int srcX, int srcY, int srcWidth, int srcHeight, int rotation, - int originX, int originY, float aTint, float rTint, float gTint, float bTint) { +void tglBlitScale(BlitImage *blitImage, int dstX, int dstY, int width, int height, int srcX, int srcY, int srcWidth, int srcHeight, + float aTint, float rTint, float gTint, float bTint) { TinyGL::GLContext *c = TinyGL::gl_get_context(); int clampWidth, clampHeight; @@ -414,8 +413,7 @@ FORCEINLINE void tglBlitGeneric(BlitImage *blitImage, const BlitTransform &trans } else { if (transform._rotation == 0) { tglBlitScale(blitImage, transform._destinationRectangle.left, transform._destinationRectangle.top, - transform._destinationRectangle.width(), transform._destinationRectangle.height(), transform._sourceRectangle.left, transform._sourceRectangle.top, transform._sourceRectangle.width() , transform._sourceRectangle.height(), transform._rotation, - transform._originX, transform._originY, transform._aTint, transform._rTint, transform._gTint, transform._bTint); + transform._destinationRectangle.width(), transform._destinationRectangle.height(), transform._sourceRectangle.left, transform._sourceRectangle.top, transform._sourceRectangle.width() , transform._sourceRectangle.height(), transform._aTint, transform._rTint, transform._gTint, transform._bTint); } else { tglBlitRotoScale(blitImage, transform._destinationRectangle.left, transform._destinationRectangle.top,