diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-30 21:33:31 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-30 21:33:31 +0100 |
commit | 2f8db31405fac68eea6f7257d58529243815033b (patch) | |
tree | 54259cc8988a98a10586fc0496b1f3501cd1e2a1 /dev-games/crystalspace/files/crystalspace-2.0-gcc52.patch | |
parent | a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad (diff) |
gentoo resync : 30.04.2018
Diffstat (limited to 'dev-games/crystalspace/files/crystalspace-2.0-gcc52.patch')
-rw-r--r-- | dev-games/crystalspace/files/crystalspace-2.0-gcc52.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-gcc52.patch b/dev-games/crystalspace/files/crystalspace-2.0-gcc52.patch deleted file mode 100644 index 96b6aa712340..000000000000 --- a/dev-games/crystalspace/files/crystalspace-2.0-gcc52.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- a/include/csgfx/imagememory.h.old 2016-04-17 09:09:31.497152401 +0200 -+++ b/include/csgfx/imagememory.h 2016-04-17 09:12:13.838355158 +0200 -@@ -179,8 +179,8 @@ - /// Get a pointer to the alpha data that can be changed. - uint8* GetAlphaPtr (); - -- virtual const void* GetImageData () { return GetImagePtr (); } -- virtual int GetWidth () const { return Width; } -+ virtual const void* GetImageData (); -+ virtual int GetWidth () const; - virtual int GetHeight () const { return Height; } - virtual int GetDepth () const { return Depth; } - ---- a/libs/csgfx/imagememory.cpp.old 2016-04-17 09:07:19.555451540 +0200 -+++ b/libs/csgfx/imagememory.cpp 2016-04-17 09:13:09.339398463 +0200 -@@ -208,6 +208,23 @@ - EnsureImage(); - return (void*)databuf->GetData (); - } -+ -+const void* csImageMemory::GetImageData () -+{ -+ return GetImagePtr (); -+} -+ -+int csImageMemory::GetWidth () const -+{ -+ return Width; -+} -+ -+void csImageBase::SetName (const char* iName) -+{ -+ cs_free (fName); -+ fName = CS::StrDup (iName); -+} -+ - csRGBpixel* csImageMemory::GetPalettePtr () - { - EnsureImage(); ---- a/include/csgfx/imagebase.h.old 2016-04-17 09:59:09.211101864 +0200 -+++ b/include/csgfx/imagebase.h 2016-04-17 09:59:20.041919599 +0200 -@@ -61,10 +61,7 @@ - // Most images are 2D, so provide a sensible default - virtual int GetDepth () const { return 1; } - -- virtual void SetName (const char* iName) -- { -- cs_free (fName); fName = CS::StrDup (iName); -- } -+ virtual void SetName (const char* iName); - virtual const char* GetName () const { return fName; } - - /* Commented out: should be implemented by all descendants. |