sc2-cvs

[Sc2-cvs] SF.net SVN: sc2:[3479] trunk/sc2/src/libs/graphics/context.c

[<av...@us...>]

Revision: 3479
          http://sc2.svn.sourceforge.net/sc2/?rev=3479&view=rev
Author:   avolkov
Date:     2009-12-27 09:11:29 +0000 (Sun, 27 Dec 2009)

Log Message:
-----------
Fix a crash when asking for a cliprect for a CONTEXT having no foreground FRAME; broken by CONTEXT cliprect semantics change

Modified Paths:
--------------
    trunk/sc2/src/libs/graphics/context.c

Modified: trunk/sc2/src/libs/graphics/context.c
===================================================================
--- trunk/sc2/src/libs/graphics/context.c	2009-12-27 08:59:47 UTC (rev 3478)
+++ trunk/sc2/src/libs/graphics/context.c	2009-12-27 09:11:29 UTC (rev 3479)
@@ -227,7 +227,8 @@
 _get_context_fg_rect (void)
 {
 	RECT r = { {0, 0}, {0, 0} };
-	r.extent = GetFrameBounds (_CurFramePtr);
+	if (_CurFramePtr)
+		r.extent = GetFrameBounds (_CurFramePtr);
 	return r;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sc2-cvs] SF.net SVN: sc2:[3712] trunk/sc2/src/libs/graphics/context.c

[<Mee...@us...>]

Revision: 3712
          http://sc2.svn.sourceforge.net/sc2/?rev=3712&view=rev
Author:   Meep-Eep
Date:     2011-12-28 18:00:11 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
Fix memory leak, from Louis Delacroix.

Modified Paths:
--------------
    trunk/sc2/src/libs/graphics/context.c

Modified: trunk/sc2/src/libs/graphics/context.c
===================================================================
--- trunk/sc2/src/libs/graphics/context.c	2011-12-28 17:51:58 UTC (rev 3711)
+++ trunk/sc2/src/libs/graphics/context.c	2011-12-28 18:00:11 UTC (rev 3712)
@@ -139,6 +139,10 @@
 	}
 #endif  /* DEBUG */
 
+	TFB_Image *img = ContextRef->FontBacking;
+	if (img)
+		TFB_DrawImage_Delete (img);
+
 	FreeContext (ContextRef);
 	return TRUE;
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sc2-cvs] SF.net SVN: sc2:[3718] trunk/sc2/src/libs/graphics/context.c

[<av...@us...>]

Revision: 3718
          http://sc2.svn.sourceforge.net/sc2/?rev=3718&view=rev
Author:   avolkov
Date:     2011-12-29 15:00:32 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
Still no mid-block variable declaration in VC6. No matter how hard you try, VC6 just won't accept it! :P

Modified Paths:
--------------
    trunk/sc2/src/libs/graphics/context.c

Modified: trunk/sc2/src/libs/graphics/context.c
===================================================================
--- trunk/sc2/src/libs/graphics/context.c	2011-12-28 20:24:21 UTC (rev 3717)
+++ trunk/sc2/src/libs/graphics/context.c	2011-12-29 15:00:32 UTC (rev 3718)
@@ -123,6 +123,8 @@
 BOOLEAN
 DestroyContext (CONTEXT ContextRef)
 {
+	TFB_Image *img;
+
 	if (ContextRef == 0)
 		return (FALSE);
 
@@ -139,7 +141,7 @@
 	}
 #endif  /* DEBUG */
 
-	TFB_Image *img = ContextRef->FontBacking;
+	img = ContextRef->FontBacking;
 	if (img)
 		TFB_DrawImage_Delete (img);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.