Fix to use SIZE_T for GType rather than expecting it to be native long size (errors with Windows and Java 9) (#100)

Author: neilcsmith-net

src/org/freedesktop/gstreamer/GObject.java

@@ -144,7 +144,13 @@ public static GType getType(Pointer ptr) {
     	// Quick getter for GType without allocation
     	// same as : new GObjectStruct(ptr).g_type_instance.g_class.g_type 
     	Pointer g_class = ptr.getPointer(0);
-    	return GType.valueOf(g_class.getNativeLong(0).longValue());
+    	if(Native.SIZE_T_SIZE == 8) {
+            return GType.valueOf(g_class.getLong(0));
+        } else if (Native.SIZE_T_SIZE == 4) {
+            return GType.valueOf( ((long) g_class.getInt(0)) & 0xffffffffL );
+        } else {
+            throw new IllegalStateException("SIZE_T size not supported: " + Native.SIZE_T_SIZE);
+        }
     }
 
     /**

src/org/freedesktop/gstreamer/MiniObject.java

@@ -21,6 +21,7 @@
 
 package org.freedesktop.gstreamer;
 
+import com.sun.jna.Native;
 import com.sun.jna.Pointer;
 
 import org.freedesktop.gstreamer.lowlevel.GType;
@@ -49,9 +50,15 @@ public MiniObject(Initializer init) {
      * Gives the type value.
      */
     public static GType getType(Pointer ptr) {
-    	// Quick getter for GType without allocation
-    	// same as : new MiniObjectStruct(ptr).type
-    	return GType.valueOf(ptr.getNativeLong(0).longValue());
+        // Quick getter for GType without allocation
+        // same as : new MiniObjectStruct(ptr).type
+        if (Native.SIZE_T_SIZE == 8) {
+            return GType.valueOf(ptr.getLong(0));
+        } else if (Native.SIZE_T_SIZE == 4) {
+            return GType.valueOf( ((long) ptr.getInt(0)) & 0xffffffffL );
+        } else {
+            throw new IllegalStateException("SIZE_T size not supported: " + Native.SIZE_T_SIZE);
+        }
     }
 
     /**
@@ -87,32 +94,32 @@ protected <T extends MiniObject> T makeWritable() {
      * @return the new MiniObject.
      */
     public <T extends MiniObject> T copy() {
-    	MiniObject result = GSTMINIOBJECT_API.gst_mini_object_copy(this);
+        MiniObject result = GSTMINIOBJECT_API.gst_mini_object_copy(this);
         if (result == null) {
             throw new NullPointerException("Could not make a copy of " + this.getClass().getSimpleName());
         }
         return (T)result;
     }
 
     @Override
-	protected void ref() {
+    protected void ref() {
         GSTMINIOBJECT_API.gst_mini_object_ref(this);
     }
-    
+
     @Override
-	protected void unref() {
-    	GSTMINIOBJECT_API.gst_mini_object_unref(this);
+    protected void unref() {
+        GSTMINIOBJECT_API.gst_mini_object_unref(this);
     }
 
     public int getRefCount() {
-    	final MiniObjectStruct struct = new MiniObjectStruct(handle());
-    	return (Integer) struct.readField("refcount");
+        final MiniObjectStruct struct = new MiniObjectStruct(handle());
+        return (Integer) struct.readField("refcount");
     }
 
     @Override
-	protected void disposeNativeHandle(Pointer ptr) {
-    	if (ownsHandle.get()) {
-    		GSTMINIOBJECT_API.gst_mini_object_unref(ptr);
-    	}
-    }    
+    protected void disposeNativeHandle(Pointer ptr) {
+        if (ownsHandle.get()) {
+            GSTMINIOBJECT_API.gst_mini_object_unref(ptr);
+        }
+    }
 }