Rogue Class Linux Download Login

Artifact Content

Artifact 5129135fdfa36102cfa910deff33178ce5cc23d1:


--- agar-svn-r9744/gui/pixmap.h.orig	2015-07-11 15:59:05.402502917 -0700
+++ agar-svn-r9744/gui/pixmap.h	2015-07-11 15:59:40.574504694 -0700
@@ -29,7 +29,7 @@
 extern AG_WidgetClass agPixmapClass;
 
 AG_Pixmap *AG_PixmapNew(void *, Uint, Uint, Uint);
-AG_Pixmap *AG_PixmapFromSurface(void *, Uint, const AG_Surface *);
+AG_Pixmap *AG_PixmapFromSurface(void *, Uint, AG_Surface *);
 AG_Pixmap *AG_PixmapFromSurfaceScaled(void *, Uint, const AG_Surface *, Uint, Uint);
 AG_Pixmap *AG_PixmapFromSurfaceNODUP(void *, Uint, AG_Surface *);
 AG_Pixmap *AG_PixmapFromFile(void *, Uint, const char *);
--- agar-svn-r9744/gui/pixmap.c.orig	2015-07-11 16:00:37.232507556 -0700
+++ agar-svn-r9744/gui/pixmap.c	2015-07-11 16:01:04.760508947 -0700
@@ -50,7 +50,7 @@
 }
 
 AG_Pixmap *
-AG_PixmapFromSurface(void *parent, Uint flags, const AG_Surface *su)
+AG_PixmapFromSurface(void *parent, Uint flags, AG_Surface *su)
 {
 	AG_Pixmap *px;
 
@@ -62,11 +62,7 @@
 	if (flags & AG_PIXMAP_VFILL) { AG_ExpandVert(px); }
 	
 	AG_ObjectAttach(parent, px);
-	if (su != NULL) {
-		AG_WidgetMapSurface(px, AG_SurfaceConvert(su, agSurfaceFmt));
-	} else {
-		AG_WidgetMapSurface(px, AG_SurfaceEmpty());
-	}
+	AG_WidgetMapSurface(px, su);
 	return (px);
 }