stratagus-cvs
[Top][All Lists]
Advanced

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

[Stratagus-CVS] stratagus/src include/video.h video/graphic.c


From: address@hidden
Subject: [Stratagus-CVS] stratagus/src include/video.h video/graphic.c
Date: 25 Jan 2004 09:17:47 +1100

CVSROOT:        /home/strat
Module name:    stratagus
Changes by:      <address@hidden>       04/01/25 09:17:47

Modified files:
        src/include    : video.h 
        src/video      : graphic.c 

Log message:
        Fixed big memory leak

Patches:
Index: stratagus/src/include/video.h
diff -u stratagus/src/include/video.h:1.117 stratagus/src/include/video.h:1.118
--- stratagus/src/include/video.h:1.117 Thu Jan 22 07:01:28 2004
+++ stratagus/src/include/video.h       Sun Jan 25 09:17:46 2004
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: video.h,v 1.117 2004/01/21 20:01:28 jsalmon3 Exp $
+//      $Id: video.h,v 1.118 2004/01/24 22:17:46 jsalmon3 Exp $
 
 #ifndef __VIDEO_H__
 #define __VIDEO_H__
@@ -43,13 +43,13 @@
 #undef DrawIcon
 #endif
 
-typedef struct _graphic_
-{
-       SDL_Surface *Surface;
-       SDL_Surface *SurfaceFlip;
+typedef struct _graphic_ {
+       SDL_Surface* Surface;
+       SDL_Surface* SurfaceFlip;
        int Width;
        int Height;
        int NumFrames;
+       void* Data;
 #ifdef USE_OPENGL
        int GraphicWidth;       /// Original graphic width
        int GraphicHeight;      /// Original graphic height
@@ -60,8 +60,7 @@
 #endif
 } Graphic;
 
-typedef struct _unit_colors_
-{
+typedef struct _unit_colors_ {
        SDL_Color Colors[4];
 } UnitColors;
 
Index: stratagus/src/video/graphic.c
diff -u stratagus/src/video/graphic.c:1.68 stratagus/src/video/graphic.c:1.69
--- stratagus/src/video/graphic.c:1.68  Thu Jan 22 09:00:02 2004
+++ stratagus/src/video/graphic.c       Sun Jan 25 09:17:47 2004
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: graphic.c,v 1.68 2004/01/21 22:00:02 jsalmon3 Exp $
+//      $Id: graphic.c,v 1.69 2004/01/24 22:17:47 jsalmon3 Exp $
 
 //@{
 
@@ -211,6 +211,7 @@
                VideoPaletteListRemove(graphic->SurfaceFlip);
                SDL_FreeSurface(graphic->SurfaceFlip);
        }
+       free(graphic->Data);
        free(graphic);
 }
 
@@ -245,6 +246,7 @@
        }
        graphic->Width = width;
        graphic->Height = height;
+       graphic->Data = data;
 
        // FIXME: endian
 




reply via email to

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