From 73a4431a34e3edbb70ce56552b4533d4f8b8d60f Mon Sep 17 00:00:00 2001
From: Nicklas Ansman Giertz <nicklas@ansman.se>
Date: Sun, 3 Nov 2019 10:19:45 -0500
Subject: [PATCH] Fix some warnings in the gltfio android jni code

---
 android/gltfio-android/src/main/cpp/Animator.cpp       | 6 +++---
 android/gltfio-android/src/main/cpp/AssetLoader.cpp    | 2 +-
 android/gltfio-android/src/main/cpp/FilamentAsset.cpp  | 8 ++++----
 android/gltfio-android/src/main/cpp/ResourceLoader.cpp | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/android/gltfio-android/src/main/cpp/Animator.cpp b/android/gltfio-android/src/main/cpp/Animator.cpp
index e1e42a2514..6e4dbaeb2f 100644
--- a/android/gltfio-android/src/main/cpp/Animator.cpp
+++ b/android/gltfio-android/src/main/cpp/Animator.cpp
@@ -27,7 +27,7 @@ extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_gltfio_Animator_nApplyAnimation(JNIEnv*, jclass, jlong nativeAnimator,
         jint index, jfloat time) {
     Animator* animator = (Animator*) nativeAnimator;
-    animator->applyAnimation(index, time);
+    animator->applyAnimation(static_cast<size_t>(index), time);
 }
 
 extern "C" JNIEXPORT void JNICALL
@@ -46,14 +46,14 @@ extern "C" JNIEXPORT float JNICALL
 Java_com_google_android_filament_gltfio_Animator_nGetAnimationDuration(JNIEnv*, jclass,
         jlong nativeAnimator, jint index) {
     Animator* animator = (Animator*) nativeAnimator;
-    return animator->getAnimationDuration(index);
+    return animator->getAnimationDuration(static_cast<size_t>(index));
 }
 
 extern "C" JNIEXPORT jstring JNICALL
 Java_com_google_android_filament_gltfio_Animator_nGetAnimationName(JNIEnv* env, jclass,
         jlong nativeAnimator, jint index) {
     Animator* animator = (Animator*) nativeAnimator;
-    const char* val = animator->getAnimationName(index);
+    const char* val = animator->getAnimationName(static_cast<size_t>(index));
     return val ? env->NewStringUTF(val) : nullptr;
 
 }
diff --git a/android/gltfio-android/src/main/cpp/AssetLoader.cpp b/android/gltfio-android/src/main/cpp/AssetLoader.cpp
index da9189c217..1425c55047 100644
--- a/android/gltfio-android/src/main/cpp/AssetLoader.cpp
+++ b/android/gltfio-android/src/main/cpp/AssetLoader.cpp
@@ -32,7 +32,7 @@ using namespace utils;
 extern void registerCallbackUtils(JNIEnv*);
 extern void registerNioUtils(JNIEnv*);
 
-jint JNI_OnLoad(JavaVM* vm, void* reserved) {
+jint JNI_OnLoad(JavaVM* vm, void*) {
     JNIEnv* env;
     if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
         return -1;
diff --git a/android/gltfio-android/src/main/cpp/FilamentAsset.cpp b/android/gltfio-android/src/main/cpp/FilamentAsset.cpp
index b1db966be3..f51be63080 100644
--- a/android/gltfio-android/src/main/cpp/FilamentAsset.cpp
+++ b/android/gltfio-android/src/main/cpp/FilamentAsset.cpp
@@ -49,7 +49,7 @@ extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_gltfio_FilamentAsset_nGetBoundingBox(JNIEnv* env, jclass,
         jlong nativeAsset, jfloatArray result) {
     FilamentAsset* asset = (FilamentAsset*) nativeAsset;
-    float* values = (float*) env->GetFloatArrayElements(result, nullptr);
+    float* values = env->GetFloatArrayElements(result, nullptr);
     const filament::Aabb box = asset->getBoundingBox();
     const float3 center = box.center();
     const float3 extent = box.extent();
@@ -59,13 +59,13 @@ Java_com_google_android_filament_gltfio_FilamentAsset_nGetBoundingBox(JNIEnv* en
     values[3] = extent.x;
     values[4] = extent.y;
     values[5] = extent.z;
-    env->ReleaseFloatArrayElements(result, (jfloat*) values, 0);
+    env->ReleaseFloatArrayElements(result, values, 0);
 }
 
 extern "C" JNIEXPORT jstring JNICALL
 Java_com_google_android_filament_gltfio_FilamentAsset_nGetName(JNIEnv* env, jclass,
         jlong nativeAsset, jint entityId) {
-    uint32_t id = entityId;
+    uint32_t id = static_cast<uint32_t>(entityId);
     Entity* entity = (Entity*) &id;
     FilamentAsset* asset = (FilamentAsset*) nativeAsset;
     const char* val = asset->getName(*entity);
@@ -73,7 +73,7 @@ Java_com_google_android_filament_gltfio_FilamentAsset_nGetName(JNIEnv* env, jcla
 }
 
 extern "C" JNIEXPORT jlong JNICALL
-Java_com_google_android_filament_gltfio_FilamentAsset_nGetAnimator(JNIEnv* env, jclass,
+Java_com_google_android_filament_gltfio_FilamentAsset_nGetAnimator(JNIEnv* , jclass,
         jlong nativeAsset) {
     FilamentAsset* asset = (FilamentAsset*) nativeAsset;
     return (jlong) asset->getAnimator();
diff --git a/android/gltfio-android/src/main/cpp/ResourceLoader.cpp b/android/gltfio-android/src/main/cpp/ResourceLoader.cpp
index de5be1087e..60fc272169 100644
--- a/android/gltfio-android/src/main/cpp/ResourceLoader.cpp
+++ b/android/gltfio-android/src/main/cpp/ResourceLoader.cpp
@@ -28,7 +28,7 @@ using namespace filament;
 using namespace gltfio;
 using namespace utils;
 
-static void destroy(void* data, size_t size, void *userData) {
+static void destroy(void*, size_t, void *userData) {
     AutoBuffer* buffer = (AutoBuffer*) userData;
     delete buffer;
 }