[Scummvm-git-logs] scummvm master -> 6a11ac7f12fa96bb4e67596ee5cb166895846834

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6a11ac7f12 GRAPHICS: Avoid name clashes for templates/non-template function


Commit: 6a11ac7f12fa96bb4e67596ee5cb166895846834
    https://github.com/scummvm/scummvm/commit/6a11ac7f12fa96bb4e67596ee5cb166895846834
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-12-26T18:31:54+01:00

Commit Message:
GRAPHICS: Avoid name clashes for templates/non-template function

Changed paths:
    graphics/transparent_surface.cpp
    graphics/transparent_surface.h


diff --git a/graphics/transparent_surface.cpp b/graphics/transparent_surface.cpp
index a0e175e..6eee635 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 <TFilteringMode filteringMode>
-TransparentSurface *TransparentSurface::rotoscale(const TransformStruct &transform) const {
+TransparentSurface *TransparentSurface::rotoscale_(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 &transfo
 }
 
 template <TFilteringMode filteringMode>
-TransparentSurface *TransparentSurface::scale(uint16 newWidth, uint16 newHeight) const {
+TransparentSurface *TransparentSurface::scale_(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<FILTER_NEAREST>(const TransformStruct &transform) const;
-template TransparentSurface *TransparentSurface::rotoscale<FILTER_BILINEAR>(const TransformStruct &transform) const;
-template TransparentSurface *TransparentSurface::scale<FILTER_NEAREST>(uint16 newWidth, uint16 newHeight) const;
-template TransparentSurface *TransparentSurface::scale<FILTER_BILINEAR>(uint16 newWidth, uint16 newHeight) const;
+template TransparentSurface *TransparentSurface::rotoscale_<FILTER_NEAREST>(const TransformStruct &transform) const;
+template TransparentSurface *TransparentSurface::rotoscale_<FILTER_BILINEAR>(const TransformStruct &transform) const;
+template TransparentSurface *TransparentSurface::scale_<FILTER_NEAREST>(uint16 newWidth, uint16 newHeight) const;
+template TransparentSurface *TransparentSurface::scale_<FILTER_BILINEAR>(uint16 newWidth, uint16 newHeight) const;
 
 TransparentSurface *TransparentSurface::rotoscale(const TransformStruct &transform) const {
-	return rotoscale<FILTER_BILINEAR>(transform);
+	return rotoscale_<FILTER_BILINEAR>(transform);
 }
 
 TransparentSurface *TransparentSurface::scale(uint16 newWidth, uint16 newHeight) const {
-	return scale<FILTER_NEAREST>(newWidth, newHeight);
+	return scale_<FILTER_NEAREST>(newWidth, newHeight);
 }
 
 } // End of namespace Graphics
diff --git a/graphics/transparent_surface.h b/graphics/transparent_surface.h
index 83c6576..0c9a8fa 100644
--- a/graphics/transparent_surface.h
+++ b/graphics/transparent_surface.h
@@ -147,7 +147,7 @@ struct TransparentSurface : public Graphics::Surface {
 	 * @see TransformStruct
 	 */
 	template <TFilteringMode filteringMode>
-	TransparentSurface *scale(uint16 newWidth, uint16 newHeight) const;
+	TransparentSurface *scale_(uint16 newWidth, uint16 newHeight) const;
 
 	TransparentSurface *scale(uint16 newWidth, uint16 newHeight) const;
 	/**
@@ -158,7 +158,7 @@ struct TransparentSurface : public Graphics::Surface {
 	 *
 	 */
 	template <TFilteringMode filteringMode>
-	TransparentSurface *rotoscale(const TransformStruct &transform) const;
+	TransparentSurface *rotoscale_(const TransformStruct &transform) const;
 
 	TransparentSurface *rotoscale(const TransformStruct &transform) const;