enigma-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Enigma-cvs] enigma/src/px font.cc,1.2,1.3


From: Ralf Westram <address@hidden>
Subject: [Enigma-cvs] enigma/src/px font.cc,1.2,1.3
Date: Thu, 30 Oct 2003 19:52:04 +0000

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

Modified Files:
        font.cc 
Log Message:
- removed throw specification



Index: font.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/px/font.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** font.cc     18 May 2003 18:45:07 -0000      1.2
--- font.cc     30 Oct 2003 19:52:01 -0000      1.3
***************
*** 6,10 ****
   * as published by the Free Software Foundation; either version 2
   * of the License, or (at your option) any later version.
!  *  
   * This program is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 6,10 ----
   * as published by the Free Software Foundation; either version 2
   * of the License, or (at your option) any later version.
!  *
   * This program is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
***************
*** 36,40 ****
  {
      class InvalidFont {};
!     
      class BitmapFont : public Font {
        vector<Rect>    char_rects;
--- 36,40 ----
  {
      class InvalidFont {};
! 
      class BitmapFont : public Font {
        vector<Rect>    char_rects;
***************
*** 42,46 ****
        Surface         *surface;
      public:
!       BitmapFont(Surface *s, const char *descr) throw(InvalidFont);
        ~BitmapFont() { delete surface; }
  
--- 42,46 ----
        Surface         *surface;
      public:
!       BitmapFont(Surface *s, const char *descr);
        ~BitmapFont() { delete surface; }
  
***************
*** 56,64 ****
  
  BitmapFont::BitmapFont(Surface *s, const char *descr)
-     throw(InvalidFont)
      : char_rects(256), advance(256), surface(s)
  {
- //     Assert<InvalidFont>(surface != 0);
-     
      // Read and interpret the font description file.
      // expected line format:
--- 56,61 ----
***************
*** 103,107 ****
  }
  
! void 
  BitmapFont::render(const GC &gc, int x, int y, const char *str)
  {
--- 100,104 ----
  }
  
! void
  BitmapFont::render(const GC &gc, int x, int y, const char *str)
  {
***************
*** 120,124 ****
      return 0;
  }
!  
  //
  // TrueType fonts (using SDL_ttf if available)
--- 117,121 ----
      return 0;
  }
! 
  //
  // TrueType fonts (using SDL_ttf if available)





reply via email to

[Prev in Thread] Current Thread [Next in Thread]