diff options
| author | Eugene Sandulenko | 2016-12-26 18:54:44 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-12-26 18:54:44 +0100 |
| commit | f1dd84fdf80c24ea60da9a3ca52ee86e8853e72a (patch) | |
| tree | eea7568a196a5f126f249eb5b076809bb9a9b0a3 | |
| parent | 6a11ac7f12fa96bb4e67596ee5cb166895846834 (diff) | |
| download | scummvm-rg350-f1dd84fdf80c24ea60da9a3ca52ee86e8853e72a.tar.gz scummvm-rg350-f1dd84fdf80c24ea60da9a3ca52ee86e8853e72a.tar.bz2 scummvm-rg350-f1dd84fdf80c24ea60da9a3ca52ee86e8853e72a.zip | |
WINTERMUTE: Fix references to TransparentSurface templates
| -rw-r--r-- | engines/wintermute/base/gfx/osystem/render_ticket.cpp | 8 | ||||
| -rw-r--r-- | graphics/transparent_surface.cpp | 16 | ||||
| -rw-r--r-- | graphics/transparent_surface.h | 4 |
3 files changed, 14 insertions, 14 deletions
diff --git a/engines/wintermute/base/gfx/osystem/render_ticket.cpp b/engines/wintermute/base/gfx/osystem/render_ticket.cpp index 78d445ac8c..acc9530684 100644 --- a/engines/wintermute/base/gfx/osystem/render_ticket.cpp +++ b/engines/wintermute/base/gfx/osystem/render_ticket.cpp @@ -62,9 +62,9 @@ RenderTicket::RenderTicket(BaseSurfaceOSystem *owner, const Graphics::Surface *s Graphics::TransparentSurface src(*_surface, false); Graphics::Surface *temp; if (owner->_gameRef->getBilinearFiltering()) { - temp = src.rotoscale<Graphics::FILTER_BILINEAR>(transform); + temp = src.rotoscaleT<Graphics::FILTER_BILINEAR>(transform); } else { - temp = src.rotoscale<Graphics::FILTER_NEAREST>(transform); + temp = src.rotoscaleT<Graphics::FILTER_NEAREST>(transform); } _surface->free(); delete _surface; @@ -75,9 +75,9 @@ RenderTicket::RenderTicket(BaseSurfaceOSystem *owner, const Graphics::Surface *s Graphics::TransparentSurface src(*_surface, false); Graphics::Surface *temp; if (owner->_gameRef->getBilinearFiltering()) { - temp = src.scale<Graphics::FILTER_BILINEAR>(dstRect->width(), dstRect->height()); + temp = src.scaleT<Graphics::FILTER_BILINEAR>(dstRect->width(), dstRect->height()); } else { - temp = src.scale<Graphics::FILTER_NEAREST>(dstRect->width(), dstRect->height()); + temp = src.scaleT<Graphics::FILTER_NEAREST>(dstRect->width(), dstRect->height()); } _surface->free(); delete _surface; 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 diff --git a/graphics/transparent_surface.h b/graphics/transparent_surface.h index 0c9a8fa67e..6fcdac1735 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 *scaleT(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 *rotoscaleT(const TransformStruct &transform) const; TransparentSurface *rotoscale(const TransformStruct &transform) const; |