[paragui-cvs] CVS: paragui/src/draw draw.cpp,1.1.2.9,1.1.2.10 drawable.cpp,1.1.2.7,1.1.2.8 drawline.cpp,1.3.2.1,1.3.2.2

[Alexander Pipelka <address@hidden>]

Update of /cvsroot/paragui/paragui/src/draw
In directory subversions:/tmp/cvs-serv29364/src/draw

Modified Files:
      Tag: devel-opengl
        draw.cpp drawable.cpp drawline.cpp 
Log Message:
- GCC 3.2 compilation fixes
- updated physfs



Index: draw.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/draw/Attic/draw.cpp,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -C2 -r1.1.2.9 -r1.1.2.10
*** draw.cpp    30 Oct 2002 09:16:29 -0000      1.1.2.9
--- draw.cpp    30 Oct 2002 20:15:17 -0000      1.1.2.10
***************
*** 252,257 ****
  PG_Draw::PG_DrawableSurface*
  PG_Draw::PG_Draw::CreateDrawableSurface(Uint32 flags,
!                              int width, int height, int depth=0,
!                              Uint32 Rmask=0, Uint32 Gmask=0, Uint32 Bmask=0, 
Uint32 Amask=0) {
    // depth = Rmask = Gmask = Bmask = Amask = 0;
    if (depth == 0) depth = screen->ref->format->BitsPerPixel;
--- 252,257 ----
  PG_Draw::PG_DrawableSurface*
  PG_Draw::PG_Draw::CreateDrawableSurface(Uint32 flags,
!                              int width, int height, int depth,
!                              Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 
Amask) {
    // depth = Rmask = Gmask = Bmask = Amask = 0;
    if (depth == 0) depth = screen->ref->format->BitsPerPixel;
***************
*** 305,310 ****
  PG_Draw::PG_DrawableSurface*
  PG_Draw::PG_Draw::CreateDrawableSurfaceFrom(void* pixels,
!                                           int width, int height, int depth=0, 
int pitch=0,
!                                           Uint32 Rmask=0, Uint32 Gmask=0, 
Uint32 Bmask=0, Uint32 Amask=0) {
    // depth = Rmask = Gmask = Bmask = Amask = 0;
  #if 0
--- 305,310 ----
  PG_Draw::PG_DrawableSurface*
  PG_Draw::PG_Draw::CreateDrawableSurfaceFrom(void* pixels,
!                                           int width, int height, int depth, 
int pitch,
!                                           Uint32 Rmask, Uint32 Gmask, Uint32 
Bmask, Uint32 Amask) {
    // depth = Rmask = Gmask = Bmask = Amask = 0;
  #if 0

Index: drawable.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/draw/Attic/drawable.cpp,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -C2 -r1.1.2.7 -r1.1.2.8
*** drawable.cpp        30 Oct 2002 09:16:29 -0000      1.1.2.7
--- drawable.cpp        30 Oct 2002 20:15:17 -0000      1.1.2.8
***************
*** 218,227 ****
   */
  int PG_Draw::PG_DrawableSurface::GetAttrOffset(std::string name) {
!   if (!name.compare("pixels", 0, 6)) return -1;
    if (!name.compare("width",  0, 5)) return -2;
    if (!name.compare("height", 0, 6)) return -3;
    if (!name.compare("depth",  0, 5)) return -4;
    if (!name.compare("format", 0, 6)) return -5;
!   if (!name.compare("SDL",    0, 3)) return -99;
    return PG_AttribList::GetAttrOffset(name);
  };
--- 218,233 ----
   */
  int PG_Draw::PG_DrawableSurface::GetAttrOffset(std::string name) {
! /*  if (!name.compare("pixels", 0, 6)) return -1;
    if (!name.compare("width",  0, 5)) return -2;
    if (!name.compare("height", 0, 6)) return -3;
    if (!name.compare("depth",  0, 5)) return -4;
    if (!name.compare("format", 0, 6)) return -5;
!   if (!name.compare("SDL",    0, 3)) return -99;*/
!   if (name.substr(0,6) != "pixels") return -1;
!   if (name.substr(0,5) != "width") return -2;
!   if (name.substr(0,6) != "height") return -2;
!   if (name.substr(0,5) != "depth") return -2;
!   if (name.substr(0,6) != "format") return -2;
!   if (name.substr(0,3) != "SDL") return -2;
    return PG_AttribList::GetAttrOffset(name);
  };

Index: drawline.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/draw/drawline.cpp,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** drawline.cpp        18 Jun 2002 22:40:38 -0000      1.3.2.1
--- drawline.cpp        30 Oct 2002 20:15:17 -0000      1.3.2.2
***************
*** 221,225 ****
                                           Uint32 x1, Uint32 y1,
                                           const SDL_Color& color,
!                                          Uint8 width = 1) {
    __DrawLine(this, x0,y0,x1,y1,color,width);
  };
--- 221,225 ----
                                           Uint32 x1, Uint32 y1,
                                           const SDL_Color& color,
!                                          Uint8 width) {
    __DrawLine(this, x0,y0,x1,y1,color,width);
  };