Fix WindowsOffscreenWGLDrawable

5 files changed, 28 insertions, 2 deletions

diff --git a/make/deploy-jars-webstarttest.sh b/make/scripts/deploy-jars-webstarttest.sh
index 9f38c8e28..9f38c8e28 100755
--- a/make/deploy-jars-webstarttest.sh
+++ b/make/scripts/deploy-jars-webstarttest.sh
diff --git a/make/deploy-jars-webstarttest_pack200.sh b/make/scripts/deploy-jars-webstarttest_pack200.sh
index fd9e215a9..fd9e215a9 100755
--- a/make/deploy-jars-webstarttest_pack200.sh
+++ b/make/scripts/deploy-jars-webstarttest_pack200.sh
diff --git a/make/scripts/deploy-jnlp-webstarttest-filter.sh b/make/scripts/deploy-jnlp-webstarttest-filter.sh
new file mode 100755
index 000000000..e95be29cb
--- /dev/null
+++ b/make/scripts/deploy-jnlp-webstarttest-filter.sh
@@ -0,0 +1,25 @@
+#! /bin/sh
+
+wsdir=$1
+shift 
+
+if [ -z "$wsdir" ] ; then
+    echo usage $0 webstartdir
+    exit 1
+fi
+
+if [ ! -e $wsdir ] ; then
+    echo $wsdir does not exist
+    exit 1
+fi
+
+cd $wsdir
+
+rm -rf orig
+mkdir orig
+
+for i in *.jnlp ; do
+    mv $i orig
+    sed -e 's/<security>//g' -e 's/<\/security>//g' -e 's/<all-permissions\/>//g' orig/$i > $i
+done
+
diff --git a/make/deploy-jnlp-webstarttest.sh b/make/scripts/deploy-jnlp-webstarttest.sh
index 26a0f8b35..26a0f8b35 100755
--- a/make/deploy-jnlp-webstarttest.sh
+++ b/make/scripts/deploy-jnlp-webstarttest.sh
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java
index f254748d1..cb8390504 100644
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java
+++ b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java
@@ -66,7 +66,7 @@ public class WindowsOffscreenWGLDrawable extends WindowsWGLDrawable {
   }
 
   private void create() {
-    NullWindow nw = (NullWindow) getNativeWindow();
+    NativeWindow nw = getNativeWindow();
     WindowsWGLGraphicsConfiguration config = (WindowsWGLGraphicsConfiguration)nw.getGraphicsConfiguration().getNativeGraphicsConfiguration();
     GLCapabilities capabilities = (GLCapabilities)config.getRequestedCapabilities();
     int width = getWidth();
@@ -75,7 +75,8 @@ public class WindowsOffscreenWGLDrawable extends WindowsWGLDrawable {
     BITMAPINFOHEADER header = info.bmiHeader();
     int bitsPerPixel = (capabilities.getRedBits() +
                         capabilities.getGreenBits() +
-                        capabilities.getBlueBits());
+                        capabilities.getBlueBits() +
+                        capabilities.getAlphaBits());
     header.biSize(header.size());
     header.biWidth(width);
     // NOTE: negating the height causes the DIB to be in top-down row