Merge branch 'master' of github.com:mbien/gluegen

sgothel · Jun 10, 2010 · 336ab1a · 336ab1a
2 parents bf38822 + 1d9b041
commit 336ab1a
Show file tree

Hide file tree

Showing 13 changed files with 550 additions and 76 deletions.
diff --git a/nbproject/ide-file-targets.xml b/nbproject/ide-file-targets.xml
@@ -50,7 +50,6 @@
             <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
             <formatter type="brief" usefile="false"/>
         </junit>
-        <java classname="${run.class}" fork="true"/>
     </target>
     <!-- TODO: edit the following target according to your needs -->
     <!-- (more info: http://www.netbeans.org/kb/articles/freeform-config.html#runsingle) -->

diff --git a/src/java/com/jogamp/common/jvm/JNILibLoaderBase.java b/src/java/com/jogamp/common/jvm/JNILibLoaderBase.java
@@ -45,7 +45,6 @@
 import java.lang.reflect.Method;
 import java.security.AccessController;
 import java.security.AccessControlContext;
-import java.security.PrivilegedAction;
 import java.util.HashSet;
 import com.jogamp.common.impl.Debug;
 
@@ -55,43 +54,56 @@ public class JNILibLoaderBase {
 
   public interface LoaderAction {
     /**
-     * Loads the library specified by libname. Optionally preloads the libraries specified by
-     * preload. The implementation should ignore, if the preload-libraries have already been
-     * loaded.
+     * Loads the library specified by libname.<br>
+     * The implementation should ignore, if the library has been loaded already.<br>
+     * @param libname the library to load
+     * @param ignoreError if true, errors during loading the library should be ignored 
+     * @return true if library loaded successful
+     */
+    boolean loadLibrary(String libname, boolean ignoreError);
+
+    /**
+     * Loads the library specified by libname.<br>
+     * Optionally preloads the libraries specified by preload.<br>
+     * The implementation should ignore, if any library has been loaded already.<br>
      * @param libname the library to load
      * @param preload the libraries to load before loading the main library if not null
-     * @param preloadIgnoreError true, if errors during loading the preload-libraries should be ignored 
+     * @param preloadIgnoreError if true, errors during loading the preload-libraries should be ignored 
      */
-    void loadLibrary(String libname, String[] preload, 
-        boolean preloadIgnoreError);
+    void loadLibrary(String libname, String[] preload, boolean preloadIgnoreError);
   }
 
   private static class DefaultAction implements LoaderAction {
-    public void loadLibrary(String libname, String[] preload, boolean preloadIgnoreError) {
-      if (null!=preload) {
-        for (int i=0; i<preload.length; i++) {
-          if(!isLoaded(preload[i])) {
-              try {
-                loadLibraryInternal(preload[i]);
-                addLoaded(preload[i]);
-                if(DEBUG) {
-                    System.err.println("NativeLibLoaderBase preloaded "+preload[i]);
-                }
-              } catch (UnsatisfiedLinkError e) {
-                if(DEBUG) {
-                    e.printStackTrace();
-                }
-                if (!preloadIgnoreError && e.getMessage().indexOf("already loaded") < 0) {
-                  throw e;
-                }
-              }
+    public boolean loadLibrary(String libname, boolean ignoreError) {
+      boolean res = true;
+      if(!isLoaded(libname)) {
+          try {
+            loadLibraryInternal(libname);
+            addLoaded(libname);
+            if(DEBUG) {
+                System.err.println("JNILibLoaderBase loaded "+libname);
+            }
+          } catch (UnsatisfiedLinkError e) {
+            res = false;
+            if(DEBUG) {
+                e.printStackTrace();
+            }
+            if (!ignoreError && e.getMessage().indexOf("already loaded") < 0) {
+              throw e;
+            }
           }
-        }
       }
-      loadLibraryInternal(libname);
-      addLoaded(libname);
-      if(DEBUG) {
-          System.err.println("NativeLibLoaderBase    loaded "+libname);
+      return res;
+    }
+
+    public void loadLibrary(String libname, String[] preload, boolean preloadIgnoreError) {
+      if(!isLoaded(libname)) {
+          if (null!=preload) {
+            for (int i=0; i<preload.length; i++) {
+              loadLibrary(preload[i], preloadIgnoreError);
+            }
+          }
+          loadLibrary(libname, false);
       }
     }
   }
@@ -106,7 +118,7 @@ public static boolean isLoaded(String libName) {
   public static void addLoaded(String libName) {
     loaded.add(libName);
     if(DEBUG) {
-        System.err.println("NativeLibLoaderBase Loaded Native Library: "+libName);
+        System.err.println("JNILibLoaderBase Loaded Native Library: "+libName);
     }
   }
 
@@ -122,14 +134,19 @@ public static synchronized void setLoadingAction(LoaderAction action) {
     loaderAction = action;
   }
 
-  protected static synchronized void loadLibrary(String libname, String[] preload, 
-      boolean preloadIgnoreError) {
-    if (loaderAction != null && !isLoaded(libname))
-    {
-      loaderAction.loadLibrary(libname, preload, preloadIgnoreError);    
+  protected static synchronized boolean loadLibrary(String libname, boolean ignoreError) {
+    if (loaderAction != null) {
+        return loaderAction.loadLibrary(libname, ignoreError);    
     }
+    return false;
   }
 
+  protected static synchronized void loadLibrary(String libname, String[] preload, boolean preloadIgnoreError) {
+    if (loaderAction != null) {
+        loaderAction.loadLibrary(libname, preload, preloadIgnoreError);    
+    }
+  }
+
   private static final Class  customLauncherClass;
   private static final Method customLoadLibraryMethod;
 

diff --git a/src/java/com/jogamp/common/nio/Buffers.java b/src/java/com/jogamp/common/nio/Buffers.java
@@ -505,6 +505,14 @@ public static ByteBuffer copyShortBufferAsByteBuffer(ShortBuffer orig) {
     //----------------------------------------------------------------------
     // Conversion routines
     //
+
+    public static float[] getFloatArray(double[] source) {
+        int i=source.length;
+        float[] dest = new float[i--];
+        while(i>=0) { dest[i]=(float)source[i]; i--; }
+        return dest;
+    }
+
     public final static FloatBuffer getFloatBuffer(DoubleBuffer source) {
         source.rewind();
         FloatBuffer dest = newDirectFloatBuffer(source.limit());