diff options
author | krzys-h <krzys_h@interia.pl> | 2014-07-11 15:24:44 +0200 |
---|---|---|
committer | krzys-h <krzys_h@interia.pl> | 2014-07-11 15:24:44 +0200 |
commit | 96d49d84aafecd78c902681f20de6207badf7e85 (patch) | |
tree | 7a835fce4f264c6c0886441c4f79e02cdf47582c /src/common/image.h | |
parent | 5223ef1fb116780298495a4d2f63e6c2c39fdfbd (diff) | |
parent | 852223262055440569ecca70f1b9da46089424c4 (diff) | |
download | colobot-96d49d84aafecd78c902681f20de6207badf7e85.tar.gz colobot-96d49d84aafecd78c902681f20de6207badf7e85.tar.bz2 colobot-96d49d84aafecd78c902681f20de6207badf7e85.zip |
Merge branch 'dev' into dev-physfs
Conflicts:
data
src/app/gamedata.cpp
src/ui/control.cpp
src/ui/edit.cpp
src/ui/maindialog.cpp
Diffstat (limited to 'src/common/image.h')
-rw-r--r-- | src/common/image.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/common/image.h b/src/common/image.h index 31dab2d..b93f2f9 100644 --- a/src/common/image.h +++ b/src/common/image.h @@ -109,6 +109,12 @@ public: //! Returns the last error std::string GetError(); + //! Flips the image vertically + void flipVertically(); + + //! sets/replaces the pixels from the surface + void SetDataPixels(void *pixels); + private: //! Blit to new RGBA surface with given size void BlitToNewRGBASurface(int width, int height); |