diff src/video/photon/SDL_ph_image.c @ 19:8cc4dbfab9ab

Date: Thu, 19 Apr 2001 08:36:54 +0300 From: "Mike Gorchak" <mike@malva.com.ua> Subject: Patches for QNX RtP Here my patch for QNX RtP/Photon for SDL-1.2. Detailed description of my changes: SDL/configure.in: If Photon detected declare define ENABLE_PHOTON. SDL/src/video/SDL_sysvideo.h: Added extern to ph_bootstrap. SDL/src/video/SDL_video.c: Added ph_bootstrap to bootstrap array. SDL/src/video/photon/SDL_ph_events.c: Declare DISABLE_X11 if compiled for Photon. SDL/src/video/photon/SDL_ph_image.c: Fixed segment violation on exit. Please update BUGS file. SDL/src/video/photon/SDL_ph_video.c: 1. Enabling window manager. 2. Added to device capabilities Photon Window Manager functions: SetCaption and IconifyWindow. 3. Renamed X11_bootstrap to ph_bootstrap. 4. Removed SEGFAULT termination of programs if Photon not available. SDL/src/video/photon/SDL_ph_wm.c: 1. Declare DISABLE_X11 if compiled for Photon. 2. Added ph_SetCaption and ph_IconifyWindow code. (Thanks to 'phearbear' for iconify window source). 3. Some stubers for other wm functions. Thanks ! ---------------------------- Mike Gorchak CJSC Malva System Programmer
author Sam Lantinga <slouken@lokigames.com>
date Thu, 10 May 2001 18:42:17 +0000
parents 74212992fb08
children e8157fcb3114
line wrap: on
line diff
--- a/src/video/photon/SDL_ph_image.c	Thu May 10 18:31:21 2001 +0000
+++ b/src/video/photon/SDL_ph_image.c	Thu May 10 18:42:17 2001 +0000
@@ -78,8 +78,7 @@
 	}
 
 	//using shared memory for speed (set last param to 1)
-	if ((SDL_Image = PhCreateImage( NULL, screen->w, screen->h, type, NULL, 0, 1 )) 
-		== NULL)
+	if ((SDL_Image = PhCreateImage( NULL, screen->w, screen->h, type, NULL, 0, 1 )) == NULL)
 	{
 		fprintf(stderr,"error: PhCreateImage failed.\n");
 		return -1;
@@ -194,14 +193,16 @@
 
 	if (SDL_Image->image)
 	{
-		//free(SDL_Image->image);
-		//SDL_Image->image = NULL;
-		PhReleaseImage(SDL_Image);
-		SDL_Image = NULL;
+                // SDL_Image->flags=Ph_RELEASE_IMAGE;
+                // PhReleaseImage(SDL_Image);
+                PgShmemDestroy(SDL_Image->image); // Use this if you using shared memory, or uncomment
+                                                  // lines above if not (and comment this line ;-)
+                free(SDL_Image);
 	}
 
-	if ( screen ) {
-    	screen->pixels = NULL;
+	if ( screen )
+        {
+    	        screen->pixels = NULL;
 	}
 	
 	SDL_Image = NULL;