paragui-cvs
[Top][All Lists]
Advanced

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

[paragui-cvs] CVS: paragui/src/core pgattrib.cpp,NONE,1.1.2.1 Makefile.a


From: Teunis Peters <address@hidden>
Subject: [paragui-cvs] CVS: paragui/src/core pgattrib.cpp,NONE,1.1.2.1 Makefile.am,1.4.2.3,1.4.2.4 pgapplication.cpp,1.10.2.9,1.10.2.10 pgfilearchive.cpp,1.4.2.5,1.4.2.6
Date: Wed, 30 Oct 2002 04:16:32 -0500

Update of /cvsroot/paragui/paragui/src/core
In directory subversions:/tmp/cvs-serv26981/src/core

Modified Files:
      Tag: devel-opengl
        Makefile.am pgapplication.cpp pgfilearchive.cpp 
Added Files:
      Tag: devel-opengl
        pgattrib.cpp 
Log Message:
Updating function names to be more consistent with ParaGUI
There's a persistant memory bug - somewhere - which is attempting to delete 
information already deleted.  Not all demos exhibit this, but paratest is 
amongst those that do.
Significant rewrite of most of OpenGL driver.  There's still more to be done 
and the driver as yet does not work correctly.  Any help would be quite 
appreciated but as I haven't received anything more than a couple comments yet 
I'm not holding my breath - T.


***** Error reading new file: [Errno 2] No such file or directory: 
'pgattrib.cpp'
Index: Makefile.am
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/Makefile.am,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -r1.4.2.3 -r1.4.2.4
*** Makefile.am 24 Oct 2002 16:08:13 -0000      1.4.2.3
--- Makefile.am 30 Oct 2002 09:16:29 -0000      1.4.2.4
***************
*** 17,21 ****
        pgsurfacecache.cpp \
        pgtimerobject.cpp \
!       pgdriver.cpp
  
  libpgcore_la_LIBADD =
--- 17,22 ----
        pgsurfacecache.cpp \
        pgtimerobject.cpp \
!       pgdriver.cpp \
!       pgattrib.cpp
  
  libpgcore_la_LIBADD =

Index: pgapplication.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgapplication.cpp,v
retrieving revision 1.10.2.9
retrieving revision 1.10.2.10
diff -C2 -r1.10.2.9 -r1.10.2.10
*** pgapplication.cpp   24 Oct 2002 16:08:13 -0000      1.10.2.9
--- pgapplication.cpp   30 Oct 2002 09:16:29 -0000      1.10.2.10
***************
*** 57,61 ****
  PG_Theme* PG_Application::my_Theme = NULL;
  bool PG_Application::bulkMode = false;
! bool PG_Application::glMode = false;
  bool PG_Application::emergencyQuit = false;
  bool PG_Application::enableBackground = true;
--- 57,61 ----
  PG_Theme* PG_Application::my_Theme = NULL;
  bool PG_Application::bulkMode = false;
! /* bool PG_Application::glMode = false; */
  bool PG_Application::emergencyQuit = false;
  bool PG_Application::enableBackground = true;
***************
*** 81,88 ****
  static bool __drawable = false;
  void PARAGUI_ShutDownCode() {
!       /* fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__); */
        PG_Draw::PG_Draw* dr = PG_Draw::PG_Draw::GetDefaultDrawable();
        // this is pretty much the only spot where it's safe to delete in
        // quite this manner...
        if (__drawable && dr != NULL) {
                dr->quit();
--- 81,89 ----
  static bool __drawable = false;
  void PARAGUI_ShutDownCode() {
!       fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        PG_Draw::PG_Draw* dr = PG_Draw::PG_Draw::GetDefaultDrawable();
        // this is pretty much the only spot where it's safe to delete in
        // quite this manner...
+       fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        if (__drawable && dr != NULL) {
                dr->quit();
***************
*** 93,99 ****
--- 94,102 ----
                fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        }; */
+       fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        
        // shutdown log
        PG_LogConsole::Done();
+       fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
  
        // shutdown SDL
***************
*** 101,104 ****
--- 104,108 ----
                SDL_Quit();
        };
+       fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
  }
  
***************
*** 183,186 ****
--- 187,191 ----
  bool PG_Application::InitScreen(int w, int h, int depth, Uint32 flags) {
  
+       // PG_LogMSG("%s[%s:%i]", __FUNCTION__, __FILE__, __LINE__);
          if (drawable == NULL) {
                __drawable = true;
***************
*** 203,209 ****
--- 208,217 ----
  #endif // DEBUG
  
+       // PG_LogMSG("%s[%s:%i]", __FUNCTION__, __FILE__, __LINE__);
        SetScreen(screen);
+       // PG_LogMSG("%s[%s:%i]", __FUNCTION__, __FILE__, __LINE__);
  
        eventInit();
+       // PG_LogMSG("%s[%s:%i]", __FUNCTION__, __FILE__, __LINE__);
  
        PG_LogConsole::SetMethod( PG_LogConsole::GetMethod() 
|PG_LOGMTH_CONSOLE);
***************
*** 236,242 ****
--- 244,252 ----
        my_quitEventLoop = false;
  
+       PG_LogMSG("%s[%s:%i]", __FUNCTION__, __FILE__, __LINE__);
        assert(data);
  
        while(!my_quitEventLoop) {
+               PG_LogMSG("%s[%s:%i]", __FUNCTION__, __FILE__, __LINE__);
                
  #if 1
***************
*** 248,251 ****
--- 258,262 ----
  #endif
  
+               PG_LogMSG("%s[%s:%i]", __FUNCTION__, __FILE__, __LINE__);
                if(enableAppIdleCalls) {
                        if (SDL_PollEvent(&event) == 0) {
***************
*** 260,264 ****
--- 271,277 ----
                }
  
+               PG_LogMSG("%s[%s:%i]", __FUNCTION__, __FILE__, __LINE__);
                DrawCursor();
+               PG_LogMSG("%s[%s:%i]", __FUNCTION__, __FILE__, __LINE__);
        }
        return -1;
***************
*** 271,286 ****
        }
  
!       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        PG_RectList *widgetList = PG_Widget::GetWidgetList();
        PG_Application::RedrawBackground(my_mouse_position);
!       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
  
        drawable->SetClipRect(my_mouse_position);
        PG_RectList backlist = widgetList->Intersect(&my_mouse_position);
!       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        backlist.Blit(my_mouse_position);
!       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        drawable->SetClipRect(PG_Rect());
!       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        return;
  }
--- 284,299 ----
        }
  
!       PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        PG_RectList *widgetList = PG_Widget::GetWidgetList();
        PG_Application::RedrawBackground(my_mouse_position);
!       PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
  
        drawable->SetClipRect(my_mouse_position);
        PG_RectList backlist = widgetList->Intersect(&my_mouse_position);
!       PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        backlist.Blit(my_mouse_position);
!       PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        drawable->SetClipRect(PG_Rect());
!       PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        return;
  }
***************
*** 304,310 ****
        my_mouse_position.my_xpos = x;
        my_mouse_position.my_ypos = y;
!       // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        drawable->BlitSurface(my_mouse_pointer, PG_Rect(), my_mouse_position);
!       // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        if(!GetBulkMode() && bUpdate) {
                drawable->UpdateRects(1, &saved);
--- 317,323 ----
        my_mouse_position.my_xpos = x;
        my_mouse_position.my_ypos = y;
!       fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        drawable->BlitSurface(my_mouse_pointer, PG_Rect(), my_mouse_position);
!       fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        if(!GetBulkMode() && bUpdate) {
                drawable->UpdateRects(1, &saved);
***************
*** 350,359 ****
                  return false;
          
!       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
!         // screen->getScreen()->flags |= SDL_GLSDL;
!       screen = drawable->SetMode(
!                    event->w, event->h,
!                    screen->getScreen()->format->BitsPerPixel,
!                    screen->getScreen()->flags);
  
        PG_Rect r = PG_Rect(0,0,event->w,event->h);
--- 363,371 ----
                  return false;
          
!       PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
!         // screen->GetScreen()->flags |= SDL_GLSDL;
!       screen = drawable->SetMode(event->w, event->h,
!                                  screen->GetDepth(),
!                                  screen->GetSDLFlags());
  
        PG_Rect r = PG_Rect(0,0,event->w,event->h);
***************
*** 384,390 ****
                my_mouse_pointer = image;
        }
!       image->getScreen()->refcount++;
!       my_mouse_position.my_width  = my_mouse_pointer->getWidth();
!       my_mouse_position.my_height = my_mouse_pointer->getHeight();
        DrawCursor();
  }
--- 396,403 ----
                my_mouse_pointer = image;
        }
!       /* at this point this just does some internal housekeeping... */
!       drawable->SetCursor(my_mouse_pointer);
!       my_mouse_position.my_width  = my_mouse_pointer->GetWidth();
!       my_mouse_position.my_height = my_mouse_pointer->GetHeight();
        DrawCursor();
  }
***************
*** 419,436 ****
          if (!surf)
                  return PG_Application::screen;
!       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
          
          PG_Application::screen = surf; // new 
PG_Draw::PG_DrawableSurface(surf);
  
!       glMode = (surf->getScreen()->flags & (SDL_OPENGLBLIT | SDL_OPENGL));
!       // fprintf(stderr, "%s:%s:%i\n  glMode %c", __FILE__, __FUNCTION__, 
__LINE__, (glMode?'T':'F'));
  
        SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, 
SDL_DEFAULT_REPEAT_INTERVAL);
        SDL_EnableUNICODE(true);
  
!       // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
!         PG_Rect r = 
PG_Rect(0,0,screen->getScreen()->w,screen->getScreen()->h);
        PG_Widget::UpdateRect(r);
        drawable->UpdateRects(1, &r);
  
        return PG_Application::screen;
--- 432,454 ----
          if (!surf)
                  return PG_Application::screen;
!       PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
          
          PG_Application::screen = surf; // new 
PG_Draw::PG_DrawableSurface(surf);
  
! #if 0
!       glMode = (surf->GetSDLFlags() & (SDL_OPENGLBLIT | SDL_OPENGL));
!       fprintf(stderr, "%s:%s:%i\n  glMode %c", __FILE__, __FUNCTION__, 
__LINE__, (glMode?'T':'F'));
! #endif
  
        SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, 
SDL_DEFAULT_REPEAT_INTERVAL);
        SDL_EnableUNICODE(true);
  
!       fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
!         PG_Rect r = PG_Rect(0,0,screen->GetWidth(),screen->GetHeight());
!       PG_LogMSG("%s[%s:%i]", __FUNCTION__, __FILE__, __LINE__);
        PG_Widget::UpdateRect(r);
+       PG_LogMSG("%s[%s:%i]", __FUNCTION__, __FILE__, __LINE__);
        drawable->UpdateRects(1, &r);
+       PG_LogMSG("%s[%s:%i]", __FUNCTION__, __FILE__, __LINE__);
  
        return PG_Application::screen;
***************
*** 454,458 ****
                my_freeBackground = true;
                my_backmode = mode;
!               
RedrawBackground(PG_Rect(0,0,screen->getScreen()->w,screen->getScreen()->h));
                return true;
        } else {
--- 472,478 ----
                my_freeBackground = true;
                my_backmode = mode;
!               PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, 
__LINE__);
!               
RedrawBackground(PG_Rect(0,0,screen->GetWidth(),screen->GetHeight()));
!               PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, 
__LINE__);
                return true;
        } else {
***************
*** 482,486 ****
        my_backmode = mode;
  
!       
RedrawBackground(PG_Rect(0,0,screen->getScreen()->w,screen->getScreen()->h));
        return true;
  }
--- 502,508 ----
        my_backmode = mode;
  
!       PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
!       RedrawBackground(PG_Rect(0,0,screen->GetWidth(),screen->GetHeight()));
!       PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        return true;
  }
***************
*** 488,493 ****
  /**  */
  void PG_Application::RedrawBackground(const PG_Rect& rect) {
!       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
!       /*static*/ PG_Rect 
screenrect(0,0,screen->getScreen()->w,screen->getScreen()->h);
  
        if(GetBulkMode() || !enableBackground) {
--- 510,515 ----
  /**  */
  void PG_Application::RedrawBackground(const PG_Rect& rect) {
!       PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
!       /*static*/ PG_Rect 
screenrect(0,0,screen->GetWidth(),screen->GetHeight());
  
        if(GetBulkMode() || !enableBackground) {
***************
*** 498,516 ****
        //PG_Application::LockScreen();
  
!       // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        if(!my_background) {
!               // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, 
__LINE__);
                SDL_Color c = my_backcolor;
!               screen->FillRect(fillrect, 
SDL_MapRGB(screen->getScreen()->format, c.r, c.g, c.b));
                PG_Application::UnlockScreen();
                return;
        }
!       // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        if(my_backmode == BKMODE_STRETCH &&
!          (my_background->getScreen()->w != screen->getScreen()->w ||
!           my_background->getScreen()->h != screen->getScreen()->h)) {
                if(my_scaled_background && 
!                  (my_scaled_background->getScreen()->w != 
screen->getScreen()->w ||
!                   my_scaled_background->getScreen()->h != 
screen->getScreen()->h)) {
                        delete my_scaled_background; // 
SDL_FreeSurface(my_scaled_background); // size mismatch
                        my_scaled_background = 0;
--- 520,538 ----
        //PG_Application::LockScreen();
  
!       fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        if(!my_background) {
!               fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
                SDL_Color c = my_backcolor;
!               screen->FillRect(fillrect, SDL_MapRGB(screen->GetFormat(), c.r, 
c.g, c.b));
                PG_Application::UnlockScreen();
                return;
        }
!       fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        if(my_backmode == BKMODE_STRETCH &&
!          (my_background->GetWidth() != screen->GetWidth() ||
!           my_background->GetHeight() != screen->GetHeight())) {
                if(my_scaled_background && 
!                  (my_scaled_background->GetWidth() != screen->GetWidth() ||
!                   my_scaled_background->GetHeight() != screen->GetHeight())) {
                        delete my_scaled_background; // 
SDL_FreeSurface(my_scaled_background); // size mismatch
                        my_scaled_background = 0;
***************
*** 518,529 ****
                if(!my_scaled_background) {
                        my_scaled_background =
!                               
my_background->ScaleSurface(static_cast<Uint16>(screen->getScreen()->w), 
static_cast<Uint16>(screen->getScreen()->h));
                }
!               // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, 
__LINE__);
                drawable->GetClipRect(fillrect);
                drawable->SetClipRect(rect);
!               // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, 
__LINE__);
                drawable->BlitSurface(my_scaled_background, PG_Rect(), 
PG_Rect());
!               // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, 
__LINE__);
                drawable->SetClipRect(fillrect);
  
--- 540,551 ----
                if(!my_scaled_background) {
                        my_scaled_background =
!                               
my_background->ScaleSurface(static_cast<Uint16>(screen->GetWidth()), 
static_cast<Uint16>(screen->GetHeight()));
                }
!               fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
                drawable->GetClipRect(fillrect);
                drawable->SetClipRect(rect);
!               fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
                drawable->BlitSurface(my_scaled_background, PG_Rect(), 
PG_Rect());
!               fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
                drawable->SetClipRect(fillrect);
  
***************
*** 531,538 ****
                // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, 
__LINE__);
                PG_LogDBG("ParaGUI app[%s]: %s:%i", __FILE__, __FUNCTION__, 
__LINE__);
!               PG_LogMSG("tile creator %s", 
my_background->getCreator()->getName().c_str());
                screen->DrawTile(screenrect, rect, my_background);
        }
!       // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        
        //PG_Application::UnlockScreen();
--- 553,560 ----
                // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, 
__LINE__);
                PG_LogDBG("ParaGUI app[%s]: %s:%i", __FILE__, __FUNCTION__, 
__LINE__);
!               PG_LogMSG("tile creator %s", 
my_background->GetCreator()->GetName().c_str());
                screen->DrawTile(screenrect, rect, my_background);
        }
!       fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        
        //PG_Application::UnlockScreen();
***************
*** 796,804 ****
  void PG_Application::SetIcon(const char *filename) {
        PG_Draw::PG_DrawableSurface* icon;
!       Uint8* pixels;
!       Uint8* mask;
!       int mlen, i;
!       PG_LogDBG("ParaGUI: %s", __FUNCTION__);
! 
        // Load the icon surface
        icon = LoadSurface(filename);
--- 818,822 ----
  void PG_Application::SetIcon(const char *filename) {
        PG_Draw::PG_DrawableSurface* icon;
!       
        // Load the icon surface
        icon = LoadSurface(filename);
***************
*** 807,859 ****
                return;
        }
! 
!       // Check width and height
!       if ( (icon->getScreen()->w%8) != 0 ) {
!               PG_LogWRN("Icon width must be a multiple of 8!");
!               UnloadSurface(icon);
!               return;
!       }
! 
!       //Check the palette
!       if ( icon->getScreen()->format->palette == NULL ) {
!               PG_LogWRN("Icon must have a palette!");
                UnloadSurface(icon);
!               return;
!       }
! 
!       // Set the colorkey
!       icon->SetColorKey(SDL_SRCCOLORKEY, *((Uint8 
*)icon->getScreen()->pixels));
! 
!       // Create the mask
!       pixels = (Uint8 *)icon->getScreen()->pixels;
!       mlen = icon->getScreen()->w*icon->getScreen()->h;
!       mask =  new Uint8[mlen/8];
! 
!       if ( mask == NULL ) {
!               PG_LogWRN("Out of memory when allocating mask for icon !");
!               UnloadSurface(icon);
!               return;
!       }
! 
!       memset(mask, 0, mlen/8);
!       for ( i=0; i<mlen; ) {
!               if ( pixels[i] != *pixels ) {
!                       mask[i/8] |= 0x01;
!               }
! 
!               ++i;
!               if ( (i%8) != 0 ) {
!                       mask[i/8] <<= 1;
!               }
!       }
! 
!       //Set icon
!       if ( icon != NULL ) {
!               SDL_WM_SetIcon(icon->getScreen(), mask);
!       }
! 
!       //Clean up
!       delete[] mask;
!       return;
  }
  
--- 825,831 ----
                return;
        }
!       if (drawable->SetIcon(icon) < 0) {
                UnloadSurface(icon);
!       };
  }
  
***************
*** 1006,1015 ****
  int PG_Application::GetScreenHeight() {
        // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
!       return screen->getScreen()->h;
  }
  
  int PG_Application::GetScreenWidth() {
        // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
!       return screen->getScreen()->w;
  }
  
--- 978,987 ----
  int PG_Application::GetScreenHeight() {
        // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
!       return screen->GetHeight();
  }
  
  int PG_Application::GetScreenWidth() {
        // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
!       return screen->GetWidth();
  }
  
***************
*** 1022,1028 ****
--- 994,1002 ----
  }
  
+ #if 0
  bool PG_Application::GetGLMode() {
                return glMode;
  }
+ #endif
  
  void PG_Application::EnableBackground(bool enable) {

Index: pgfilearchive.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgfilearchive.cpp,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -C2 -r1.4.2.5 -r1.4.2.6
*** pgfilearchive.cpp   24 Oct 2002 16:08:13 -0000      1.4.2.5
--- pgfilearchive.cpp   30 Oct 2002 09:16:29 -0000      1.4.2.6
***************
*** 341,345 ****
                PG_LogDBG("ParaGUI: %s", __FUNCTION__);
                PG_Draw::PG_DrawableSurface* tmpsrf =
!                       draw->AccelDrawableSurface(surface->getScreen());
                if(tmpsrf) {
                        delete surface; // SDL_FreeSurface(surface);
--- 341,345 ----
                PG_LogDBG("ParaGUI: %s", __FUNCTION__);
                PG_Draw::PG_DrawableSurface* tmpsrf =
!                       draw->AccelerateSurface(surface);
                if(tmpsrf) {
                        delete surface; // SDL_FreeSurface(surface);





reply via email to

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