From 965b0e1ec43db8da7a322dc125b2e4ca1e9d993f Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Mon, 31 Oct 2005 10:51:54 +0000 Subject: [PATCH] MacOSX: Fix bugs in MacOSXDisplay.setIcon --- src/java/org/lwjgl/opengl/MacOSXDisplay.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/java/org/lwjgl/opengl/MacOSXDisplay.java b/src/java/org/lwjgl/opengl/MacOSXDisplay.java index f339420a..50910113 100644 --- a/src/java/org/lwjgl/opengl/MacOSXDisplay.java +++ b/src/java/org/lwjgl/opengl/MacOSXDisplay.java @@ -534,9 +534,9 @@ final class MacOSXDisplay implements DisplayImplementation { int biggest = -1; for (int i=0;i size) { + if (icons[i].remaining() > size) { biggest = i; - size = icons[i].limit(); + size = icons[i].remaining(); } } @@ -547,9 +547,10 @@ final class MacOSXDisplay implements DisplayImplementation { 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);