diff options
Diffstat (limited to 'Stars45/Bitmap.cpp')
| -rw-r--r-- | Stars45/Bitmap.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/Stars45/Bitmap.cpp b/Stars45/Bitmap.cpp index e5b8811..70cff64 100644 --- a/Stars45/Bitmap.cpp +++ b/Stars45/Bitmap.cpp @@ -11,7 +11,6 @@ Bitmap Resource class */ -#include "MemDebug.h" #include "Bitmap.h" #include "Clock.h" #include "Video.h" @@ -263,7 +262,7 @@ Bitmap::CopyBitmap(const Bitmap& rhs) mapsize = width * height; if (rhs.pix) { - pix = new(__FILE__,__LINE__) ColorIndex[mapsize]; + pix = new ColorIndex[mapsize]; if (!pix) { width = 0; @@ -277,7 +276,7 @@ Bitmap::CopyBitmap(const Bitmap& rhs) } if (rhs.hipix) { - hipix = new(__FILE__,__LINE__) Color[mapsize]; + hipix = new Color[mapsize]; if (!hipix && !pix) { width = 0; @@ -335,7 +334,7 @@ Bitmap::CopyImage(int w, int h, BYTE* p, int t) texture = false; mapsize = w * h; - pix = new(__FILE__,__LINE__) ColorIndex[mapsize]; + pix = new ColorIndex[mapsize]; if (!pix) { width = 0; @@ -370,7 +369,7 @@ Bitmap::CopyHighColorImage(int w, int h, DWORD* p, int t) texture = false; mapsize = w * h; - hipix = new(__FILE__,__LINE__) Color[mapsize]; + hipix = new Color[mapsize]; if (!hipix) { width = 0; @@ -497,7 +496,7 @@ Bitmap::ScaleTo(int w, int h) if (hipix) { Color* src = hipix; - Color* buf = new(__FILE__,__LINE__) Color[w*h]; + Color* buf = new Color[w*h]; Color* dst = buf; if (!buf) { @@ -524,7 +523,7 @@ Bitmap::ScaleTo(int w, int h) if (pix) { ColorIndex* src = pix; - ColorIndex* buf = new(__FILE__,__LINE__) ColorIndex[w*h]; + ColorIndex* buf = new ColorIndex[w*h]; ColorIndex* dst = buf; if (!buf) { @@ -564,7 +563,7 @@ Bitmap::MakeIndexed() if (hipix) { if (pix && ownpix) delete [] pix; - pix = new(__FILE__,__LINE__) ColorIndex[mapsize]; + pix = new ColorIndex[mapsize]; if (pix) { Color* src = hipix; @@ -594,7 +593,7 @@ Bitmap::MakeHighColor() if (hipix && ownpix) delete [] hipix; - hipix = new(__FILE__,__LINE__) Color[mapsize]; + hipix = new Color[mapsize]; if (hipix) { ColorIndex* src = pix; @@ -802,7 +801,7 @@ Bitmap::Default() def.width = def.height = 64; def.mapsize = 64*64; def.ownpix = true; - def.pix = new(__FILE__,__LINE__) ColorIndex[def.mapsize]; + def.pix = new ColorIndex[def.mapsize]; // 8 bit palette mode if (def.pix) { |