44 lines
1.4 KiB
Text
44 lines
1.4 KiB
Text
$NetBSD: patch-ab,v 1.2 2011/08/05 18:21:13 wiz Exp $
|
|
|
|
Try to fix stricter GCC 3.4 template handling.
|
|
|
|
--- libvideogfx/graphics/datatypes/bitmap.hh.orig 2006-01-15 20:11:54.000000000 +0000
|
|
+++ libvideogfx/graphics/datatypes/bitmap.hh
|
|
@@ -222,26 +222,26 @@ namespace videogfx {
|
|
{
|
|
Create(w,h,border,halign,valign);
|
|
}
|
|
- ~BitmapProvider_Mem() { if (d_bitmap_ptr) delete[] d_bitmap_ptr; }
|
|
+ ~BitmapProvider_Mem() { if (this->d_bitmap_ptr) delete[] this->d_bitmap_ptr; }
|
|
|
|
void Create(int w,int h,int border=0,int halign=1,int valign=1)
|
|
{
|
|
CalcInternalSizes(w,h,border,halign,valign,
|
|
- d_internal_width,d_internal_height,border);
|
|
+ this->d_internal_width,this->d_internal_height,border);
|
|
|
|
// total size including border
|
|
|
|
- d_total_width = d_internal_width +2*border;
|
|
- d_total_height = d_internal_height+2*border;
|
|
+ this->d_total_width = this->d_internal_width +2*border;
|
|
+ this->d_total_height = this->d_internal_height+2*border;
|
|
|
|
- if (d_bitmap_ptr)
|
|
- delete[] d_bitmap_ptr;
|
|
+ if (this->d_bitmap_ptr)
|
|
+ delete[] this->d_bitmap_ptr;
|
|
|
|
- d_bitmap_ptr = new Pel[d_total_width * d_total_height];
|
|
- d_width = w;
|
|
- d_height = h;
|
|
- d_border = border;
|
|
- SetFramePtrs();
|
|
+ this->d_bitmap_ptr = new Pel[this->d_total_width * this->d_total_height];
|
|
+ this->d_width = w;
|
|
+ this->d_height = h;
|
|
+ this->d_border = border;
|
|
+ this->SetFramePtrs();
|
|
}
|
|
};
|
|
|