java-game-lib-cvs Mailing List for Lightweight Java Game Library

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13820/src/java/org/lwjgl/opengl

Modified Files:
	MacOSXDisplay.java 
Log Message:
MacOSX: Fix bugs in MacOSXDisplay.setIcon

Index: MacOSXDisplay.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- MacOSXDisplay.java	9 Sep 2005 10:27:13 -0000	1.36
+++ MacOSXDisplay.java	31 Oct 2005 10:51:54 -0000	1.37
@@ -534,9 +534,9 @@
 		int biggest = -1;
 		
 		for (int i=0;i<icons.length;i++) {
-			if (icons[i].limit() > size) {
+			if (icons[i].remaining() > size) {
 				biggest = i;
-				size = icons[i].limit();
+				size = icons[i].remaining();
 			}
 		}
 		
@@ -547,9 +547,10 @@
 		int width;
 		int height;
 		
-		width = height = (int) Math.sqrt(size);
-		int[] imageData = new int[icons[biggest].remaining()];
-		icons[biggest].asIntBuffer().get(imageData);
+		IntBuffer biggest_icon = icons[biggest].asIntBuffer();
+		int[] imageData = new int[biggest_icon.remaining()];
+		width = height = (int) Math.sqrt(imageData.length);
+		biggest_icon.get(imageData);
 		
 		BufferedImage img = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
 		img.setRGB(0, 0, width, height, imageData, 0, width);