thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WINTERMUTE: Fix references to TransparentSurface templates

Browse source
This commit is contained in:
Eugene Sandulenko 2016-12-26 18:54:44 +01:00
parent 6a11ac7f12
commit f1dd84fdf8
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/wintermute/base/gfx/osystem/render_ticket.cpp
View file

@ -62,9 +62,9 @@ RenderTicket::RenderTicket(BaseSurfaceOSystem *owner, const Graphics::Surface *s
Graphics::TransparentSurface src(*_surface, false); Graphics::TransparentSurface src(*_surface, false);
Graphics::Surface *temp; Graphics::Surface *temp;
if (owner->_gameRef->getBilinearFiltering()) { if (owner->_gameRef->getBilinearFiltering()) {
temp = src.rotoscale<Graphics::FILTER_BILINEAR>(transform); temp = src.rotoscaleT<Graphics::FILTER_BILINEAR>(transform);
} else { } else {
temp = src.rotoscale<Graphics::FILTER_NEAREST>(transform); temp = src.rotoscaleT<Graphics::FILTER_NEAREST>(transform);
} }
_surface->free(); _surface->free();
delete _surface; delete _surface;
@ -75,9 +75,9 @@ RenderTicket::RenderTicket(BaseSurfaceOSystem *owner, const Graphics::Surface *s
Graphics::TransparentSurface src(*_surface, false); Graphics::TransparentSurface src(*_surface, false);
Graphics::Surface *temp; Graphics::Surface *temp;
if (owner->_gameRef->getBilinearFiltering()) { 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 { } else {
temp = src.scale<Graphics::FILTER_NEAREST>(dstRect->width(), dstRect->height()); temp = src.scaleT<Graphics::FILTER_NEAREST>(dstRect->width(), dstRect->height());
} }
_surface->free(); _surface->free();
delete _surface; delete _surface;

16
graphics/transparent_surface.cpp
View file

@ -677,7 +677,7 @@ systems.
struct tColorRGBA { byte r; byte g; byte b; byte a; }; struct tColorRGBA { byte r; byte g; byte b; byte a; };
template <TFilteringMode filteringMode> 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. 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> 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 srcRect(0, 0, (int16)w, (int16)h);
Common::Rect dstRect(0, 0, (int16)newWidth, (int16)newHeight); 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::rotoscaleT<FILTER_NEAREST>(const TransformStruct &transform) const;
template TransparentSurface *TransparentSurface::rotoscale_<FILTER_BILINEAR>(const TransformStruct &transform) const; template TransparentSurface *TransparentSurface::rotoscaleT<FILTER_BILINEAR>(const TransformStruct &transform) const;
template TransparentSurface *TransparentSurface::scale_<FILTER_NEAREST>(uint16 newWidth, uint16 newHeight) const; template TransparentSurface *TransparentSurface::scaleT<FILTER_NEAREST>(uint16 newWidth, uint16 newHeight) const;
template TransparentSurface *TransparentSurface::scale_<FILTER_BILINEAR>(uint16 newWidth, uint16 newHeight) const; template TransparentSurface *TransparentSurface::scaleT<FILTER_BILINEAR>(uint16 newWidth, uint16 newHeight) const;
TransparentSurface *TransparentSurface::rotoscale(const TransformStruct &transform) 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 { TransparentSurface *TransparentSurface::scale(uint16 newWidth, uint16 newHeight) const {
return scale_<FILTER_NEAREST>(newWidth, newHeight); return scaleT<FILTER_NEAREST>(newWidth, newHeight);
} }
} // End of namespace Graphics } // End of namespace Graphics

4
graphics/transparent_surface.h
View file

@ -147,7 +147,7 @@ struct TransparentSurface : public Graphics::Surface {
* @see TransformStruct * @see TransformStruct
*/ */
template <TFilteringMode filteringMode> template <TFilteringMode filteringMode>
TransparentSurface *scale_(uint16 newWidth, uint16 newHeight) const; TransparentSurface *scaleT(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> template <TFilteringMode filteringMode>
TransparentSurface *rotoscale_(const TransformStruct &transform) const; TransparentSurface *rotoscaleT(const TransformStruct &transform) const;
TransparentSurface *rotoscale(const TransformStruct &transform) const; TransparentSurface *rotoscale(const TransformStruct &transform) const;