[Adonthell-commits] CVS: adonthell/src/gfx/sdl surface_sdl.cc, 1.1.1.1, 1.2 surface_sdl.h, 1.1.1.1, 1.2

[Alexandre Courbot <address@hidden>]

Update of /cvsroot/adonthell/adonthell/src/gfx/sdl
In directory subversions:/tmp/cvs-serv8178/src/gfx/sdl

Modified Files:
        surface_sdl.cc surface_sdl.h 
Log Message:
Applied Fabien's changes and extended them to all the source
(changing using namespace's into real namespace enclosing and fixed some
 consts)


Index: surface_sdl.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/gfx/sdl/surface_sdl.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** surface_sdl.cc      18 Jul 2003 15:16:09 -0000      1.1.1.1
--- surface_sdl.cc      24 Jul 2003 12:57:58 -0000      1.2
***************
*** 19,406 ****
  #include "screen_sdl.h"
  
! using namespace gfx;
! 
! SDL_Rect surface_sdl::srcrect; 
! SDL_Rect surface_sdl::dstrect; 
  
! surface_sdl::surface_sdl() : surface () 
! { 
!     vis = NULL;
!     mask_changed = false; 
! }
  
! surface_sdl::~surface_sdl() 
! {
!     if (vis) SDL_FreeSurface (vis); 
! }
  
! void surface_sdl::set_mask (bool m)
! {
!     if (m != is_masked ())
      {
!         is_masked_ = m;
!         mask_changed = true; 
      }
- }
  
  
! void surface_sdl::set_alpha (u_int8 t)
! {
!     if ((t == 255) && (alpha_ != 255) && vis)
!         SDL_SetAlpha (vis, 0, 0);
!     alpha_ = t;
! }
! 
! void surface_sdl::draw (s_int16 x, s_int16 y, s_int16 sx, s_int16 sy, u_int16 
sl,
!                         u_int16 sh, const drawing_area * da_opt,
!                         surface * target) const
! { 
!     SDL_Surface * display_target;
  
!     if (target == NULL) display_target = display; 
!     else display_target = ((surface_sdl *)target)->vis;
  
!     setup_rects (x, y, sx, sy, sl, sh, da_opt); 
      
!     if (!dstrect.w || !dstrect.h)
!         return;
      
!     if (mask_changed)
!     {
!         mask_changed = false;
!         if (is_masked ()) 
!             SDL_SetColorKey (vis, SDL_SRCCOLORKEY | SDL_RLEACCEL, 
trans_color);
!         else
!             SDL_SetColorKey (vis, 0, 0); 
!     }
  
!     if (alpha () != 255)
!         SDL_SetAlpha (vis, SDL_SRCALPHA, alpha_);
      
!     SDL_BlitSurface (vis, &srcrect, display_target, &dstrect); 
! }
  
! void surface_sdl::fillrect (s_int16 x, s_int16 y, u_int16 l, u_int16 h, 
u_int32 col, 
!                              drawing_area * da_opt)
! {
!     if (da_opt) 
      {
!         drawing_area da = da_opt->setup_rects (); 
!         dstrect.x = da.x();
!         dstrect.y = da.y();
!         dstrect.w = da.length();
!         dstrect.h = da.height();
!     }
!     else
!     { 
!         dstrect.x = x;
!         dstrect.y = y;
!         dstrect.w = l;
!         dstrect.h = h;
!     }
      
!     SDL_FillRect (vis, &dstrect, col);
! }
  
! void surface_sdl::draw_line(const s_int16 x1, const s_int16 y1, const s_int16 
x2, const s_int16 y2, 
!                              const u_int32 color, const drawing_area * da_opt)
! {
!    int i;
!    int x,y;
!    int IncX,IncY;
!    int Dx,Dy;
!    int Err;
!    int inc1,inc2;
!    int offset;
! 
!    x=x1;
!    y=y1;
! 
!    if(x1<=x2)
!    {
!        IncX=1;
!        Dx=x2-x1;
!    }
!    else
!    {
!        IncX=-1;
!        Dx=x1-x2;
!    }
     
!    if(y1<=y2)
!    {
!        IncY=1;
!        Dy=y2-y1;
!    }
!    else
!    {
!        IncY=-1;
!        Dy=y1-y2;
!    }
     
!    lock ();
!    if(Dy<Dx)
!    {
!        inc1=(Dy-Dx)<<1;
!        inc2=Dy<<1;
!        Err=inc2-Dx;
         
!        for(i=0;i<Dx;i++)
!        {
!            if (!da_opt || (x >= da_opt->x() && x < da_opt->x() + 
da_opt->length() &&
!                            y >= da_opt->y() && y < da_opt->y() + 
da_opt->height()))
!                put_pix (x, y, color);
             
!            if(Err>0)
!            {
!                y+=IncY;
!                Err+=inc1;
!            }
!            else
!                Err+=inc2;
             
!            x+=IncX;
!            offset+=IncX;
!        }
!    }
!    else
!    {
!        inc1=(Dx-Dy)<<1;
!        inc2=Dx<<1;
!        Err=inc2-Dy;
         
!        for(i=0;i<Dy;i++)
!        {
!            if (!da_opt || (x >= da_opt->x() && x < da_opt->x() + 
da_opt->length() &&
!                            y >= da_opt->y() && y < da_opt->y() + 
da_opt->height()))
!                put_pix(x, y, color);
             
!            if(Err>0)
!            {
!                x+=IncX;
!                Err+=inc1;
!            }
!            else
!                Err+=inc2;
             
!            y+=IncY;
!        }
!    }
!    unlock();
! }
  
! u_int32 surface_sdl::map_color(u_int8 r, u_int8 g, u_int8 b) const
! {
!     return SDL_MapRGB(vis->format, r, g, b);
! }
  
! void surface_sdl::unmap_color(u_int32 col, u_int8 & r, u_int8 & g, u_int8 & 
b) const
! {
!     SDL_GetRGB(col, vis->format, &r, &g, &b);
! }
  
! void surface_sdl::lock () const
! {
!     if (!length () || !height ()) return;   
!     if (SDL_MUSTLOCK(vis)) 
!         SDL_LockSurface (vis);
! }
  
! void surface_sdl::unlock () const
! {
!     if (!length () || !height ()) return;   
!     if (SDL_MUSTLOCK(vis)) 
!         SDL_UnlockSurface (vis);
! }
  
! void surface_sdl::put_pix (u_int16 x, u_int16 y, u_int32 col) 
! {
!     u_int8 * offset = ((Uint8 *) vis->pixels) + y * vis->pitch
!         + x*vis->format->BytesPerPixel;
!      
!     switch (vis->format->BytesPerPixel) 
      {
!         case 1:
!             *((Uint8 *) (offset)) = (Uint8) col;
!             break;
!         case 2:
!             *((Uint16 *) (offset)) = (Uint16) col;
!             break;
!         case 3:
          {
!             u_int8 r, g, b;
              
!             r = (col >> vis->format->Rshift);
!             g = (col >> vis->format->Gshift);
!             b = (col >> vis->format->Bshift);
!             *((offset) + (vis->format->Rshift >> 3)) = r; 
!             *((offset) + (vis->format->Gshift >> 3)) = g;
!             *((offset) + (vis->format->Bshift >> 3)) = b;
!             break;
!         }
!         case 4:
!             *((Uint32 *) (offset)) = (Uint32) col;
!             break;
!     }     
! }
  
! u_int32 surface_sdl::get_pix (u_int16 x, u_int16 y) const
! {
!     u_int32 col;
  
!     u_int8 * offset = ((Uint8 *) vis->pixels) + y * vis->pitch
!         + x * vis->format->BytesPerPixel;
      
!     switch (vis->format->BytesPerPixel) 
!     {
!         case 1:
!             col = *((Uint8 *)(offset));
!             break;
!         case 2:
!             col = *((Uint16 *)(offset));
!             break;
!         case 3:
!         {
!             u_int8 r, g, b;
!             col = 0;
!             u_int32 t;
              
!             r = *((offset) + (vis->format->Rshift >> 3)); 
!             g = *((offset) + (vis->format->Gshift >> 3));
!             b = *((offset) + (vis->format->Bshift >> 3));
! 
!             t = r << vis->format->Rshift;
!             col |= t; 
!             t = g << vis->format->Gshift;
!             col |= t; 
!             t = b << vis->format->Bshift;
!             col |= t; 
              
!             break;
          }
!         case 4:
!             col = *((Uint32 *)(offset));
!             break;
      }
-     return col;
- }
   
! surface & surface_sdl::operator = (surface& src)
! {
!     const surface_sdl & src_sdl = (surface_sdl &) src;
  
!     (drawable&) (*this) = (drawable&) src;
!     is_masked_ = src.is_masked();
!     alpha_ = src.alpha();
!     if (vis) SDL_FreeSurface (vis);
!     if (!src_sdl.vis) 
!         vis = NULL;
!     else
!         vis = SDL_DisplayFormat (src_sdl.vis);
!     return *this; 
! }
   
  
  
! void surface_sdl::resize (u_int16 l, u_int16 h)
! {
!     if (l == length () && h == height ()) return;
      
!     if (vis) SDL_FreeSurface (vis); 
  
!     set_length (l);
!     set_height (h); 
  
!     vis = SDL_CreateRGBSurface (SDL_HWSURFACE | SDL_SRCCOLORKEY | 
SDL_SRCALPHA | SDL_ASYNCBLIT,
!                                 length (), height (),
!                                 display->format->BitsPerPixel,
!                                 display->format->Rmask,
!                                 display->format->Gmask,
!                                 display->format->Bmask,
!                                 display->format->Amask); 
! }
  
! void surface_sdl::clear () 
! {
!     if (vis) 
      {
!         SDL_FreeSurface (vis);
!         vis = NULL; 
!         set_length (0);
!         set_height (0); 
!         set_alpha (255);
!         set_mask (false);
      }
- }
- 
- void surface_sdl::set_data(void * data, u_int16 l, u_int16 h, u_int8 
bytes_per_pixel, u_int32 red_mask, 
-                            u_int32 green_mask, u_int32 blue_mask)
- {
-     if (vis) SDL_FreeSurface(vis);
  
!     set_length(l);
!     set_height(h);
  
!     SDL_Surface * tmp = SDL_CreateRGBSurfaceFrom(data, length(),
!                                                  height(), bytes_per_pixel * 
8,
!                                                  length() * bytes_per_pixel,
!                                                  red_mask, green_mask,
!                                                  blue_mask, 0);
  
!     vis = SDL_DisplayFormat(tmp);
  
!     SDL_FreeSurface(tmp);
! }
  
! void * surface_sdl::get_data (u_int8 bytes_per_pixel,
!                  u_int32 red_mask, u_int32 green_mask,
!                  u_int32 blue_mask) const
! {
!     SDL_Surface * tmp = SDL_CreateRGBSurface(0, 10, 10,
!                                              bytes_per_pixel * 8,
!                                              red_mask, green_mask, blue_mask, 
0);
! 
!     SDL_Surface * tmp2 = SDL_ConvertSurface(vis, tmp->format, 0);
!     SDL_FreeSurface(tmp);
! 
!     void * ret = calloc(bytes_per_pixel, length() * height());
!     memcpy(ret, tmp2->pixels, length() * height() * bytes_per_pixel);
!     SDL_FreeSurface(tmp2);
  
!     return ret;
! }
  
! void surface_sdl::setup_rects (s_int16 x, s_int16 y, s_int16 sx, s_int16 sy,
!                                 u_int16 sl, u_int16 sh, const drawing_area * 
draw_to) const
! {
!     if (draw_to)
!     { 
!         drawing_area im_zone (x, y, sl, sh);
!         drawing_area da_int = draw_to->setup_rects ();
  
!         im_zone.assign_drawing_area (&da_int);
!         da_int = im_zone.setup_rects ();
!         SDL_Rect tr;
!         tr.x = da_int.x();
!         tr.y = da_int.y();
!         tr.w = da_int.length();
!         tr.h = da_int.height();
! 
!         dstrect = tr; 
!         srcrect = dstrect;
!         srcrect.x = x < dstrect.x ? sx + dstrect.x - x : sx;
!         srcrect.y = y < dstrect.y ? sy + dstrect.y - y : sy;
!     }
!     else
!     {
!         srcrect.x = sx;
!         srcrect.y = sy;
!         srcrect.w = sl;
!         srcrect.h = sh;
  
!         dstrect = srcrect;
          
!         dstrect.x = x;
!         dstrect.y = y;
!     } 
  }
--- 19,407 ----
  #include "screen_sdl.h"
  
! namespace gfx
! {
!     SDL_Rect surface_sdl::srcrect; 
!     SDL_Rect surface_sdl::dstrect; 
  
!     surface_sdl::surface_sdl() : surface () 
!     { 
!         vis = NULL;
!         mask_changed = false; 
!     }
  
!     surface_sdl::~surface_sdl() 
!     {
!         if (vis) SDL_FreeSurface (vis); 
!     }
  
!     void surface_sdl::set_mask (bool m)
      {
!         if (m != is_masked ())
!         {
!             is_masked_ = m;
!             mask_changed = true; 
!         }
      }
  
  
!     void surface_sdl::set_alpha (u_int8 t)
!     {
!         if ((t == 255) && (alpha_ != 255) && vis)
!             SDL_SetAlpha (vis, 0, 0);
!         alpha_ = t;
!     }
! 
!     void surface_sdl::draw (s_int16 x, s_int16 y, s_int16 sx, s_int16 sy, 
u_int16 sl,
!                             u_int16 sh, const drawing_area * da_opt,
!                             surface * target) const
!     { 
!         SDL_Surface * display_target;
  
!         if (target == NULL) display_target = display; 
!         else display_target = ((surface_sdl *)target)->vis;
  
!         setup_rects (x, y, sx, sy, sl, sh, da_opt); 
      
!         if (!dstrect.w || !dstrect.h)
!             return;
      
!         if (mask_changed)
!         {
!             mask_changed = false;
!             if (is_masked ()) 
!                 SDL_SetColorKey (vis, SDL_SRCCOLORKEY | SDL_RLEACCEL, 
trans_color);
!             else
!                 SDL_SetColorKey (vis, 0, 0); 
!         }
  
!         if (alpha () != 255)
!             SDL_SetAlpha (vis, SDL_SRCALPHA, alpha_);
      
!         SDL_BlitSurface (vis, &srcrect, display_target, &dstrect); 
!     }
  
!     void surface_sdl::fillrect (s_int16 x, s_int16 y, u_int16 l, u_int16 h, 
u_int32 col, 
!                                 drawing_area * da_opt)
      {
!         if (da_opt) 
!         {
!             drawing_area da = da_opt->setup_rects (); 
!             dstrect.x = da.x();
!             dstrect.y = da.y();
!             dstrect.w = da.length();
!             dstrect.h = da.height();
!         }
!         else
!         { 
!             dstrect.x = x;
!             dstrect.y = y;
!             dstrect.w = l;
!             dstrect.h = h;
!         }
      
!         SDL_FillRect (vis, &dstrect, col);
!     }
  
!     void surface_sdl::draw_line(const s_int16 x1, const s_int16 y1, const 
s_int16 x2, const s_int16 y2, 
!                                 const u_int32 color, const drawing_area * 
da_opt)
!     {
!         int i;
!         int x,y;
!         int IncX,IncY;
!         int Dx,Dy;
!         int Err;
!         int inc1,inc2;
!         int offset;
! 
!         x=x1;
!         y=y1;
! 
!         if(x1<=x2)
!         {
!             IncX=1;
!             Dx=x2-x1;
!         }
!         else
!         {
!             IncX=-1;
!             Dx=x1-x2;
!         }
     
!         if(y1<=y2)
!         {
!             IncY=1;
!             Dy=y2-y1;
!         }
!         else
!         {
!             IncY=-1;
!             Dy=y1-y2;
!         }
     
!         lock ();
!         if(Dy<Dx)
!         {
!             inc1=(Dy-Dx)<<1;
!             inc2=Dy<<1;
!             Err=inc2-Dx;
         
!             for(i=0;i<Dx;i++)
!             {
!                 if (!da_opt || (x >= da_opt->x() && x < da_opt->x() + 
da_opt->length() &&
!                                 y >= da_opt->y() && y < da_opt->y() + 
da_opt->height()))
!                     put_pix (x, y, color);
             
!                 if(Err>0)
!                 {
!                     y+=IncY;
!                     Err+=inc1;
!                 }
!                 else
!                     Err+=inc2;
             
!                 x+=IncX;
!                 offset+=IncX;
!             }
!         }
!         else
!         {
!             inc1=(Dx-Dy)<<1;
!             inc2=Dx<<1;
!             Err=inc2-Dy;
         
!             for(i=0;i<Dy;i++)
!             {
!                 if (!da_opt || (x >= da_opt->x() && x < da_opt->x() + 
da_opt->length() &&
!                                 y >= da_opt->y() && y < da_opt->y() + 
da_opt->height()))
!                     put_pix(x, y, color);
             
!                 if(Err>0)
!                 {
!                     x+=IncX;
!                     Err+=inc1;
!                 }
!                 else
!                     Err+=inc2;
             
!                 y+=IncY;
!             }
!         }
!         unlock();
!     }
  
!     u_int32 surface_sdl::map_color(u_int8 r, u_int8 g, u_int8 b) const
!     {
!         return SDL_MapRGB(vis->format, r, g, b);
!     }
  
!     void surface_sdl::unmap_color(u_int32 col, u_int8 & r, u_int8 & g, u_int8 
& b) const
!     {
!         SDL_GetRGB(col, vis->format, &r, &g, &b);
!     }
  
!     void surface_sdl::lock () const
!     {
!         if (!length () || !height ()) return;   
!         if (SDL_MUSTLOCK(vis)) 
!             SDL_LockSurface (vis);
!     }
  
!     void surface_sdl::unlock () const
!     {
!         if (!length () || !height ()) return;   
!         if (SDL_MUSTLOCK(vis)) 
!             SDL_UnlockSurface (vis);
!     }
  
!     void surface_sdl::put_pix (u_int16 x, u_int16 y, u_int32 col) 
      {
!         u_int8 * offset = ((Uint8 *) vis->pixels) + y * vis->pitch
!             + x*vis->format->BytesPerPixel;
!      
!         switch (vis->format->BytesPerPixel) 
          {
!             case 1:
!                 *((Uint8 *) (offset)) = (Uint8) col;
!                 break;
!             case 2:
!                 *((Uint16 *) (offset)) = (Uint16) col;
!                 break;
!             case 3:
!             {
!                 u_int8 r, g, b;
              
!                 r = (col >> vis->format->Rshift);
!                 g = (col >> vis->format->Gshift);
!                 b = (col >> vis->format->Bshift);
!                 *((offset) + (vis->format->Rshift >> 3)) = r; 
!                 *((offset) + (vis->format->Gshift >> 3)) = g;
!                 *((offset) + (vis->format->Bshift >> 3)) = b;
!                 break;
!             }
!             case 4:
!                 *((Uint32 *) (offset)) = (Uint32) col;
!                 break;
!         }     
!     }
  
!     u_int32 surface_sdl::get_pix (u_int16 x, u_int16 y) const
!     {
!         u_int32 col;
  
!         u_int8 * offset = ((Uint8 *) vis->pixels) + y * vis->pitch
!             + x * vis->format->BytesPerPixel;
      
!         switch (vis->format->BytesPerPixel) 
!         {
!             case 1:
!                 col = *((Uint8 *)(offset));
!                 break;
!             case 2:
!                 col = *((Uint16 *)(offset));
!                 break;
!             case 3:
!             {
!                 u_int8 r, g, b;
!                 col = 0;
!                 u_int32 t;
              
!                 r = *((offset) + (vis->format->Rshift >> 3)); 
!                 g = *((offset) + (vis->format->Gshift >> 3));
!                 b = *((offset) + (vis->format->Bshift >> 3));
! 
!                 t = r << vis->format->Rshift;
!                 col |= t; 
!                 t = g << vis->format->Gshift;
!                 col |= t; 
!                 t = b << vis->format->Bshift;
!                 col |= t; 
              
!                 break;
!             }
!             case 4:
!                 col = *((Uint32 *)(offset));
!                 break;
          }
!         return col;
      }
   
!     surface & surface_sdl::operator = (const surface& src)
!     {
!         const surface_sdl & src_sdl = (const surface_sdl &) src;
  
!         (drawable&) (*this) = (drawable&) src;
!         is_masked_ = src.is_masked();
!         alpha_ = src.alpha();
!         if (vis) SDL_FreeSurface (vis);
!         if (!src_sdl.vis) 
!             vis = NULL;
!         else
!             vis = SDL_DisplayFormat (src_sdl.vis);
!         return *this; 
!     }
   
  
  
!     void surface_sdl::resize (u_int16 l, u_int16 h)
!     {
!         if (l == length () && h == height ()) return;
      
!         if (vis) SDL_FreeSurface (vis); 
  
!         set_length (l);
!         set_height (h); 
  
!         vis = SDL_CreateRGBSurface (SDL_HWSURFACE | SDL_SRCCOLORKEY | 
SDL_SRCALPHA | SDL_ASYNCBLIT,
!                                     length (), height (),
!                                     display->format->BitsPerPixel,
!                                     display->format->Rmask,
!                                     display->format->Gmask,
!                                     display->format->Bmask,
!                                     display->format->Amask); 
!     }
  
!     void surface_sdl::clear () 
      {
!         if (vis) 
!         {
!             SDL_FreeSurface (vis);
!             vis = NULL; 
!             set_length (0);
!             set_height (0); 
!             set_alpha (255);
!             set_mask (false);
!         }
      }
  
!     void surface_sdl::set_data(void * data, u_int16 l, u_int16 h, u_int8 
bytes_per_pixel, u_int32 red_mask, 
!                                u_int32 green_mask, u_int32 blue_mask)
!     {
!         if (vis) SDL_FreeSurface(vis);
  
!         set_length(l);
!         set_height(h);
  
!         SDL_Surface * tmp = SDL_CreateRGBSurfaceFrom(data, length(),
!                                                      height(), 
bytes_per_pixel * 8,
!                                                      length() * 
bytes_per_pixel,
!                                                      red_mask, green_mask,
!                                                      blue_mask, 0);
  
!         vis = SDL_DisplayFormat(tmp);
  
!         SDL_FreeSurface(tmp);
!     }
  
!     void * surface_sdl::get_data (u_int8 bytes_per_pixel,
!                                   u_int32 red_mask, u_int32 green_mask,
!                                   u_int32 blue_mask) const
!     {
!         SDL_Surface * tmp = SDL_CreateRGBSurface(0, 10, 10,
!                                                  bytes_per_pixel * 8,
!                                                  red_mask, green_mask, 
blue_mask, 0);
! 
!         SDL_Surface * tmp2 = SDL_ConvertSurface(vis, tmp->format, 0);
!         SDL_FreeSurface(tmp);
! 
!         void * ret = calloc(bytes_per_pixel, length() * height());
!         memcpy(ret, tmp2->pixels, length() * height() * bytes_per_pixel);
!         SDL_FreeSurface(tmp2);
  
!         return ret;
!     }
  
!     void surface_sdl::setup_rects (s_int16 x, s_int16 y, s_int16 sx, s_int16 
sy,
!                                    u_int16 sl, u_int16 sh, const drawing_area 
* draw_to) const
!     {
!         if (draw_to)
!         { 
!             drawing_area im_zone (x, y, sl, sh);
!             drawing_area da_int = draw_to->setup_rects ();
! 
!             im_zone.assign_drawing_area (&da_int);
!             da_int = im_zone.setup_rects ();
!             SDL_Rect tr;
!             tr.x = da_int.x();
!             tr.y = da_int.y();
!             tr.w = da_int.length();
!             tr.h = da_int.height();
! 
!             dstrect = tr; 
!             srcrect = dstrect;
!             srcrect.x = x < dstrect.x ? sx + dstrect.x - x : sx;
!             srcrect.y = y < dstrect.y ? sy + dstrect.y - y : sy;
!         }
!         else
!         {
!             srcrect.x = sx;
!             srcrect.y = sy;
!             srcrect.w = sl;
!             srcrect.h = sh;
  
!             dstrect = srcrect;
          
!             dstrect.x = x;
!             dstrect.y = y;
!         } 
!     }
  }

Index: surface_sdl.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/gfx/sdl/surface_sdl.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** surface_sdl.h       18 Jul 2003 15:16:09 -0000      1.1.1.1
--- surface_sdl.h       24 Jul 2003 12:57:58 -0000      1.2
***************
*** 50,54 ****
          u_int32 get_pix (u_int16 x, u_int16 y) const; 
      
!         surface& operator = (surface& src); 
  
          void resize (u_int16 l, u_int16 h);
--- 50,54 ----
          u_int32 get_pix (u_int16 x, u_int16 y) const; 
      
!         surface& operator = (const surface& src); 
  
          void resize (u_int16 l, u_int16 h);