[Enigma-cvs] enigma/src/px video.hh,1.5,1.6

[Daniel Heck <address@hidden>]

Update of /cvsroot/enigma/enigma/src/px
In directory subversions:/tmp/cvs-serv14711/src/px

Modified Files:
        video.hh 
Log Message:
changed blit() to take pointer to const Surface


Index: video.hh
===================================================================
RCS file: /cvsroot/enigma/enigma/src/px/video.hh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** video.hh    17 Jul 2003 20:14:56 -0000      1.5
--- video.hh    16 Nov 2003 17:56:45 -0000      1.6
***************
*** 97,102 ****
          virtual PackedColor map_color(int r, int g, int b, int a) = 0;
  
!       virtual void blit (const GS &gs, int x, int y, Surface* s) = 0;
!       virtual void blit (const GS &gs, int x, int y, Surface* s, const Rect& 
r) = 0;
  
        virtual Uint32 get_pixel (int x, int y) = 0;
--- 97,102 ----
          virtual PackedColor map_color(int r, int g, int b, int a) = 0;
  
!       virtual void blit (const GS &gs, int x, int y, const Surface* s) = 0;
!       virtual void blit (const GS &gs, int x, int y, const Surface* s, const 
Rect& r) = 0;
  
        virtual Uint32 get_pixel (int x, int y) = 0;
***************
*** 171,176 ****
          void box (const GS &gs, int x, int y, int w, int h);
          void line (const GS &gs, int x1, int y2, int x2, int y2);
!         void blit (const GS &gs, int x, int y, Surface* s, const Rect &r);
!         void blit (const GS &gs, int x, int y, Surface* src);
  
        /*
--- 171,176 ----
          void box (const GS &gs, int x, int y, int w, int h);
          void line (const GS &gs, int x1, int y2, int x2, int y2);
!         void blit (const GS &gs, int x, int y, const Surface* s, const Rect 
&r);
!         void blit (const GS &gs, int x, int y, const Surface* src);
  
        /*
***************
*** 293,302 ****
      }
  
!     inline void blit (const GC &gc, int x, int y, Surface *s)
      { 
          gc.drawable->blit (gc, x, y, s); 
      }
  
!     inline void blit(const GC &gc, int x, int y, Surface *s, const Rect &r)
      { 
          gc.drawable->blit (gc, x, y, s, r); 
--- 293,302 ----
      }
  
!     inline void blit (const GC &gc, int x, int y, const Surface *s)
      { 
          gc.drawable->blit (gc, x, y, s); 
      }
  
!     inline void blit(const GC &gc, int x, int y, const Surface *s, const Rect 
&r)
      { 
          gc.drawable->blit (gc, x, y, s, r); 
***************
*** 352,362 ****
      void TintRect(Surface *s, Rect rect, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
  
!     /* Create a surface from image data that is already somewhere in
!        memory.  */
      Surface * MakeSurface(void* data, int w, int h, int bipp, int pitch,
                            const RGBA_Mask &mask = RGBA_Mask());
  
!     Surface *Duplicate(Surface *s);
!     Surface *Grab(Surface *s, Rect r);
      Surface* DisplayFormat(Surface* s);
  
--- 352,367 ----
      void TintRect(Surface *s, Rect rect, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
  
!     /** Create a surface from image data that is already somewhere in
!         memory.  */
      Surface * MakeSurface(void* data, int w, int h, int bipp, int pitch,
                            const RGBA_Mask &mask = RGBA_Mask());
  
!     /** Create a copy of a surface. */
!     Surface *Duplicate(const Surface *s);
! 
!     /** Create a new surface from a selection of an old one. */
!     Surface *Grab(const Surface *s, Rect r);
! 
!     /** Convert a surface to the current screen's native format. */
      Surface* DisplayFormat(Surface* s);