blob: 96b6aa712340e8ae7bc0a915ba4a26ec1ec77251 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
--- 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.
|
GitWeb
