From f1dd84fdf80c24ea60da9a3ca52ee86e8853e72a Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Mon, 26 Dec 2016 18:54:44 +0100 Subject: WINTERMUTE: Fix references to TransparentSurface templates --- graphics/transparent_surface.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'graphics/transparent_surface.cpp') diff --git a/graphics/transparent_surface.cpp b/graphics/transparent_surface.cpp index 6eee635ad2..48e6da6c79 100644 --- a/graphics/transparent_surface.cpp +++ b/graphics/transparent_surface.cpp @@ -677,7 +677,7 @@ systems. struct tColorRGBA { byte r; byte g; byte b; byte a; }; template -TransparentSurface *TransparentSurface::rotoscale_(const TransformStruct &transform) const { +TransparentSurface *TransparentSurface::rotoscaleT(const TransformStruct &transform) const { assert(transform._angle != 0); // This would not be ideal; rotoscale() should never be called in conditional branches where angle = 0 anyway. @@ -791,7 +791,7 @@ TransparentSurface *TransparentSurface::rotoscale_(const TransformStruct &transf } template -TransparentSurface *TransparentSurface::scale_(uint16 newWidth, uint16 newHeight) const { +TransparentSurface *TransparentSurface::scaleT(uint16 newWidth, uint16 newHeight) const { Common::Rect srcRect(0, 0, (int16)w, (int16)h); Common::Rect dstRect(0, 0, (int16)newWidth, (int16)newHeight); @@ -1054,17 +1054,17 @@ TransparentSurface *TransparentSurface::convertTo(const PixelFormat &dstFormat, } -template TransparentSurface *TransparentSurface::rotoscale_(const TransformStruct &transform) const; -template TransparentSurface *TransparentSurface::rotoscale_(const TransformStruct &transform) const; -template TransparentSurface *TransparentSurface::scale_(uint16 newWidth, uint16 newHeight) const; -template TransparentSurface *TransparentSurface::scale_(uint16 newWidth, uint16 newHeight) const; +template TransparentSurface *TransparentSurface::rotoscaleT(const TransformStruct &transform) const; +template TransparentSurface *TransparentSurface::rotoscaleT(const TransformStruct &transform) const; +template TransparentSurface *TransparentSurface::scaleT(uint16 newWidth, uint16 newHeight) const; +template TransparentSurface *TransparentSurface::scaleT(uint16 newWidth, uint16 newHeight) const; TransparentSurface *TransparentSurface::rotoscale(const TransformStruct &transform) const { - return rotoscale_(transform); + return rotoscaleT(transform); } TransparentSurface *TransparentSurface::scale(uint16 newWidth, uint16 newHeight) const { - return scale_(newWidth, newHeight); + return scaleT(newWidth, newHeight); } } // End of namespace Graphics -- cgit v1.2.3