[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3808] branches/osx-java7/LWJGL/src/native/macosx /org_lwjgl_opengl_Display.m

[<ka...@us...>]

Revision: 3808
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3808&view=rev
Author:   kappa1
Date:     2012-11-01 22:39:22 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
Fix memory leaks by adding an NSAutoreleasePool when creating a windows and draining it on window destroy

Modified Paths:
--------------
    branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m

Modified: branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m
===================================================================
--- branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m	2012-11-01 22:21:23 UTC (rev 3807)
+++ branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m	2012-11-01 22:39:22 UTC (rev 3808)
@@ -53,6 +53,8 @@
 
 static NSOpenGLPixelFormat *default_format = nil;
 
+static NSAutoreleasePool *pool;
+
 @implementation MacOSXKeyableWindow
 - (BOOL)canBecomeKeyWindow;
 {
@@ -390,21 +392,6 @@
     [window_info->window setStyleMask:style_mask];
 }
 
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXDisplay_nDestroyWindow(JNIEnv *env, jobject this, jobject window_handle) {
-	MacOSXWindowInfo *window_info = (MacOSXWindowInfo *)(*env)->GetDirectBufferAddress(env, window_handle);
-    
-    if (window_info->window != nil) {
-        [window_info->window close];
-    }
-    window_info->window = nil;
-    
-    if (window_info->view != nil) {
-        [window_info->view release];
-    }
-    window_info->view = nil;
-    //[window_info->window release];
-}
-
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXDisplay_nSetTitle(JNIEnv *env, jobject this, jobject window_handle, jobject title_buffer) {
 	MacOSXWindowInfo *window_info = (MacOSXWindowInfo *)(*env)->GetDirectBufferAddress(env, window_handle);
 	const char *title_cstr = (const char *)(*env)->GetDirectBufferAddress(env, title_buffer);
@@ -421,6 +408,8 @@
             return NULL;
         }
     }
+	
+	pool = [[NSAutoreleasePool alloc] init];
 
 	MacOSXWindowInfo *window_info = (MacOSXWindowInfo *)(*env)->GetDirectBufferAddress(env, window_handle);
     MacOSXPeerInfo *peer_info = (MacOSXPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle);
@@ -467,6 +456,22 @@
     return window_handle;
 }
 
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXDisplay_nDestroyWindow(JNIEnv *env, jobject this, jobject window_handle) {
+	MacOSXWindowInfo *window_info = (MacOSXWindowInfo *)(*env)->GetDirectBufferAddress(env, window_handle);
+    
+    if (window_info->window != nil) {
+        [window_info->window close];
+    }
+    window_info->window = nil;
+    
+    if (window_info->view != nil) {
+        [window_info->view release];
+    }
+    window_info->view = nil;
+    //[window_info->window release];
+	[pool drain];
+}
+
 JNIEXPORT jint JNICALL Java_org_lwjgl_DefaultSysImplementation_getJNIVersion
   (JNIEnv *env, jobject ignored) {
 	return org_lwjgl_MacOSXSysImplementation_JNI_VERSION;

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