From e2d7816823039fc75be809d64b88a3d3af9cdca8 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 10 Oct 2014 03:37:21 +0200
Subject: Bug 1093 - NEWT PointerIcon swizzled on X11 and OSX; WindowIcon
 swizzled on OSX ([R] -> [B])

Following mistakes were made in native PixelFormat
for PointerIcon and WindowIcon:

PointerIcon:
  X11: RGBA8888 -> BGRA8888
  OSX: BGRA8888 -> RGBA8888

WindowIcon:
  OSX: BGRA8888 -> RGBA8888

Test case: TestWindowAndPointerIconNEWT

(requires visual validation)

+++

Summary:

PointerIcon:
  BGRA8888: X11, Win32
  RGBA8888: OSX

WindowIcon:
  BGRA8888: X11, Win32
  RGBA8888: OSX

+++

Reported by 'LT'
  <http://forum.jogamp.org/Mac-OSX-newt-pointer-and-window-icon-displays-incorrectly-tp4033294.html>
---
 .../classes/javax/media/nativewindow/util/PixelFormat.java         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/nativewindow/classes/javax')

diff --git a/src/nativewindow/classes/javax/media/nativewindow/util/PixelFormat.java b/src/nativewindow/classes/javax/media/nativewindow/util/PixelFormat.java
index fd3c31f7f..e5901f584 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/util/PixelFormat.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/util/PixelFormat.java
@@ -119,7 +119,8 @@ public enum PixelFormat {
      * <ul>
      *   <li>OpenGL: data-format GL_RGBA, data-type GL_UNSIGNED_BYTE</li>
      *   <li>AWT: <i>None</i></li>
-     *   <li>PointerIcon: X11 (XCURSOR)</li>
+     *   <li>PointerIcon: OSX (NSBitmapImageRep)</li>
+     *   <li>Window Icon: OSX (NSBitmapImageRep)</li>
      *   <li>PNGJ: Scanlines</li>
      * </ul>
      * </p>
@@ -175,8 +176,8 @@ public enum PixelFormat {
      * <ul>
      *   <li>OpenGL: data-format GL_BGRA, data-type GL_UNSIGNED_BYTE</li>
      *   <li>AWT: {@link java.awt.image.BufferedImage#TYPE_INT_ARGB TYPE_INT_ARGB}</li>
-     *   <li>PointerIcon: Win32, OSX (NSBitmapImageRep), AWT</li>
-     *   <li>Window Icon: X11, Win32, OSX (NSBitmapImageRep)</li>
+     *   <li>PointerIcon: X11 (XCURSOR), Win32, AWT</li>
+     *   <li>Window Icon: X11, Win32</li>
      * </ul>
      * </p>
      */
-- 
cgit v1.2.3