contrib/android: cleanup RGB color parameter names

No functional change, just RGB instead of RBG in some lines. Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>
open-mpi · Nov 4, 2020 · c319a2b · c319a2b
1 parent 35e3824
commit c319a2b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/contrib/android/AndroidApp/lstopo/src/main/cpp/lib.c b/contrib/android/AndroidApp/lstopo/src/main/cpp/lib.c
@@ -155,7 +155,7 @@ void JNIbox(int r, int g, int b, int x, int y, int width, int height, int gp_ind
     jmethodID ctor = (*tools.jni)->GetMethodID(tools.jni, class, "<init>", "([BLjava/lang/String;)V");
     jstring str = (jstring) (*tools.jni)->NewObject(tools.jni, class, ctor, array, strEncode);
 
-    (*tools.jni)->CallVoidMethod(tools.jni, tools.lstopo, tools.methods.box, r, b, g, x, y, width, height, gp_index, str);
+    (*tools.jni)->CallVoidMethod(tools.jni, tools.lstopo, tools.methods.box, r, g, b, x, y, width, height, gp_index, str);
     (*tools.jni)->DeleteLocalRef(tools.jni, str);
     (*tools.jni)->DeleteLocalRef(tools.jni, array);
     (*tools.jni)->DeleteLocalRef(tools.jni, strEncode);

diff --git a/contrib/android/AndroidApp/lstopo/src/main/java/com/hwloc/lstopo/Lstopo.java b/contrib/android/AndroidApp/lstopo/src/main/java/com/hwloc/lstopo/Lstopo.java
@@ -51,13 +51,13 @@ public Lstopo(Activity activity) {
     /**
      * Draw topology box
      */
-    public void box(int r, int b, int g, int x, int y, final int width, final int height, int id, String info){
+    public void box(int r, int g, int b, int x, int y, final int width, final int height, int id, String info){
         LinearLayout view = new LinearLayout(activity);
         view.setOrientation(LinearLayout.VERTICAL);
         view.setId(id);
         layout.addView(view);
         setBoxInfo(view, info);
-        setBoxAttributes(view, r, b, g,
+        setBoxAttributes(view, r, g, b,
                 (int) (xscale * x),
                 (int) (yscale * y),
                 (int) (xscale * width),
@@ -106,7 +106,7 @@ public void onClick(View v) {
         });
     }
 
-    private void setBoxAttributes(View view, int r, int b, int g, int x, int y, int width, int height){
+    private void setBoxAttributes(View view, int r, int g, int b, int x, int y, int width, int height){
         RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(width, height);
         view.setY(y);
         view.setX(x);