Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / client / guiscalingfilter.h

diff --git a/src/client/guiscalingfilter.h b/src/client/guiscalingfilter.h
index 703cbfb93b16fc6073e72268600340e00a935584..379a4bdb0964faeb36f7e8817c1fe949863f3529 100644 (file)
--- a/src/client/guiscalingfilter.h
+++ b/src/client/guiscalingfilter.h
@@ -23,8 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 /* Manually insert an image into the cache, useful to avoid texture-to-image
  * conversion whenever we can intercept it.
  */
-void guiScalingCache(
-               const io::path &key, video::IVideoDriver *driver, video::IImage *value);
+void guiScalingCache(const io::path &key, video::IVideoDriver *driver, video::IImage *value);
 
 // Manually clear the cache, e.g. when switching to different worlds.
 void guiScalingCacheClear();
@@ -39,20 +38,21 @@ video::ITexture *guiScalingResizeCached(video::IVideoDriver *driver, video::ITex
 /* Convenience wrapper for guiScalingResizeCached that accepts parameters that
  * are available at GUI imagebutton creation time.
  */
-video::ITexture *guiScalingImageButton(
-               video::IVideoDriver *driver, video::ITexture *src, s32 width, s32 height);
+video::ITexture *guiScalingImageButton(video::IVideoDriver *driver, video::ITexture *src,
+               s32 width, s32 height);
 
 /* Replacement for driver->draw2DImage() that uses the high-quality pre-scaled
  * texture, if configured.
  */
 void draw2DImageFilterScaled(video::IVideoDriver *driver, video::ITexture *txr,
                const core::rect<s32> &destrect, const core::rect<s32> &srcrect,
-               const core::rect<s32> *cliprect = 0,
-               const video::SColor *const colors = 0, bool usealpha = false);
+               const core::rect<s32> *cliprect = 0, const video::SColor *const colors = 0,
+               bool usealpha = false);
 
 /*
  * 9-slice / segment drawing
  */
 void draw2DImage9Slice(video::IVideoDriver *driver, video::ITexture *texture,
                const core::rect<s32> &rect, const core::rect<s32> &middle,
-               const core::rect<s32> *cliprect = nullptr);
+               const core::rect<s32> *cliprect = nullptr,
+               const video::SColor *const colors = nullptr);