aboutsummaryrefslogtreecommitdiff
path: root/graphics/transparent_surface.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2016-12-26 18:54:44 +0100
committerEugene Sandulenko2016-12-26 18:54:44 +0100
commitf1dd84fdf80c24ea60da9a3ca52ee86e8853e72a (patch)
treeeea7568a196a5f126f249eb5b076809bb9a9b0a3 /graphics/transparent_surface.cpp
parent6a11ac7f12fa96bb4e67596ee5cb166895846834 (diff)
downloadscummvm-rg350-f1dd84fdf80c24ea60da9a3ca52ee86e8853e72a.tar.gz
scummvm-rg350-f1dd84fdf80c24ea60da9a3ca52ee86e8853e72a.tar.bz2
scummvm-rg350-f1dd84fdf80c24ea60da9a3ca52ee86e8853e72a.zip
WINTERMUTE: Fix references to TransparentSurface templates
Diffstat (limited to 'graphics/transparent_surface.cpp')
-rw-r--r--graphics/transparent_surface.cpp16
1 files changed, 8 insertions, 8 deletions
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 <TFilteringMode filteringMode>
-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 <TFilteringMode filteringMode>
-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_<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::rotoscaleT<FILTER_NEAREST>(const TransformStruct &transform) const;
+template TransparentSurface *TransparentSurface::rotoscaleT<FILTER_BILINEAR>(const TransformStruct &transform) const;
+template TransparentSurface *TransparentSurface::scaleT<FILTER_NEAREST>(uint16 newWidth, uint16 newHeight) const;
+template TransparentSurface *TransparentSurface::scaleT<FILTER_BILINEAR>(uint16 newWidth, uint16 newHeight) const;
TransparentSurface *TransparentSurface::rotoscale(const TransformStruct &transform) const {
- return rotoscale_<FILTER_BILINEAR>(transform);
+ return rotoscaleT<FILTER_BILINEAR>(transform);
}
TransparentSurface *TransparentSurface::scale(uint16 newWidth, uint16 newHeight) const {
- return scale_<FILTER_NEAREST>(newWidth, newHeight);
+ return scaleT<FILTER_NEAREST>(newWidth, newHeight);
}
} // End of namespace Graphics