[Enigma-cvs] enigma/src/px tools.cc,1.3,1.4 video.cc,1.9,1.10

[Ralf Westram <address@hidden>]

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

Modified Files:
        tools.cc video.cc 
Log Message:
- replaced exception



Index: video.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/px/video.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** video.cc    31 Jul 2003 07:28:04 -0000      1.9
--- video.cc    30 Oct 2003 19:52:31 -0000      1.10
***************
*** 54,58 ****
  void px::line (const GC &gc, int x1, int y1, int x2, int y2)
  {
!     gc.drawable->line (gc, x1, y1, x2, y2); 
  }
  
--- 54,58 ----
  void px::line (const GC &gc, int x1, int y1, int x2, int y2)
  {
!     gc.drawable->line (gc, x1, y1, x2, y2);
  }
  
***************
*** 63,67 ****
  namespace
  {
!     inline bool NOCLIP(const GS &gs) 
      {
          return gs.flags & GS_NOCLIP;
--- 63,67 ----
  namespace
  {
!     inline bool NOCLIP(const GS &gs)
      {
          return gs.flags & GS_NOCLIP;
***************
*** 116,120 ****
              r = rr;
              return true;
!         } 
          return false;
      }
--- 116,120 ----
              r = rr;
              return true;
!         }
          return false;
      }
***************
*** 278,282 ****
  //----------------------------------------
  
! Surface::Surface (SDL_Surface* sfc) 
  : m_surface(sfc)
  {
--- 278,282 ----
  //----------------------------------------
  
! Surface::Surface (SDL_Surface* sfc)
  : m_surface(sfc)
  {
***************
*** 285,289 ****
  Surface::~Surface()
  {
!     SDL_FreeSurface(m_surface); 
  }
  
--- 285,289 ----
  Surface::~Surface()
  {
!     SDL_FreeSurface(m_surface);
  }
  
***************
*** 300,304 ****
  }
  
! PackedColor 
  Surface::map_color(int r, int g, int b)
  {
--- 300,304 ----
  }
  
! PackedColor
  Surface::map_color(int r, int g, int b)
  {
***************
*** 313,317 ****
  
  
! void 
  Surface::box (const GS &gs, int x, int y, int w, int h)
  {
--- 313,317 ----
  
  
! void
  Surface::box (const GS &gs, int x, int y, int w, int h)
  {
***************
*** 324,328 ****
  }
  
! void 
  Surface::line (const GS &gs, int x1, int y1, int x2, int y2)
  {
--- 324,328 ----
  }
  
! void
  Surface::line (const GS &gs, int x1, int y1, int x2, int y2)
  {
***************
*** 336,340 ****
      if (has_flags(gs.flags, GS_ANTIALIAS))
          aalineRGBA (m_surface, x1, y1, x2, y2, r, g, b, a);
!     else 
          lineRGBA (m_surface, x1, y1, x2, y2, r, g, b, a);
  
--- 336,340 ----
      if (has_flags(gs.flags, GS_ANTIALIAS))
          aalineRGBA (m_surface, x1, y1, x2, y2, r, g, b, a);
!     else
          lineRGBA (m_surface, x1, y1, x2, y2, r, g, b, a);
  
***************
*** 393,397 ****
      case 24: return new Surface24(sdls); break;
      default:
!         throw XVideo("Invalid bit depth in surface.");
      }
  }
--- 393,398 ----
      case 24: return new Surface24(sdls); break;
      default:
!         fprintf(stderr, "Invalid bit depth in surface.\n");
!         return 0; // throw XVideo("Invalid bit depth in surface.");
      }
  }
***************
*** 455,460 ****
  }
  
! Rect px::Screen::size() const 
! { 
      return Rect(0, 0, width(), height());
  }
--- 456,461 ----
  }
  
! Rect px::Screen::size() const
! {
      return Rect(0, 0, width(), height());
  }

Index: tools.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/px/tools.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tools.cc    28 Oct 2003 09:58:07 -0000      1.3
--- tools.cc    30 Oct 2003 19:52:31 -0000      1.4
***************
*** 67,71 ****
              if (!buffer) {
                  assert(buffer); // to stop when debugging
!                 throw std::bad_alloc();
              }
  
--- 67,71 ----
              if (!buffer) {
                  assert(buffer); // to stop when debugging
!                 return "<alloc problem>";
              }