From 0bbc2cf5cd8dab822b3337c664e487ad9964234e Mon Sep 17 00:00:00 2001
From: Cheng Yang <cheng@dongmi.ai>
Date: Sun, 10 Jan 2021 17:50:21 +0800
Subject: [PATCH 1/2] make project run with Android Studio 4

---
 ImageSegmentation/build.gradle                             | 2 +-
 ImageSegmentation/gradle/wrapper/gradle-wrapper.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ImageSegmentation/build.gradle b/ImageSegmentation/build.gradle
index 6754c23d..04baf1e7 100644
--- a/ImageSegmentation/build.gradle
+++ b/ImageSegmentation/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.0.1"
+        classpath 'com.android.tools.build:gradle:4.1.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/ImageSegmentation/gradle/wrapper/gradle-wrapper.properties b/ImageSegmentation/gradle/wrapper/gradle-wrapper.properties
index 8eba0e70..db97decb 100644
--- a/ImageSegmentation/gradle/wrapper/gradle-wrapper.properties
+++ b/ImageSegmentation/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

From 225cf7593d9f9e3c10ecf7a9fdf4e342acc4cf1a Mon Sep 17 00:00:00 2001
From: Cheng Yang <cheng@dongmi.ai>
Date: Sun, 10 Jan 2021 17:54:24 +0800
Subject: [PATCH 2/2] fix width/height indexing error for case when image is
 not a square

---
 .../app/src/main/assets/dog_landscape.jpg        | Bin 0 -> 5756 bytes
 .../pytorch/imagesegmentation/MainActivity.java  |   8 +++++---
 2 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 ImageSegmentation/app/src/main/assets/dog_landscape.jpg

diff --git a/ImageSegmentation/app/src/main/assets/dog_landscape.jpg b/ImageSegmentation/app/src/main/assets/dog_landscape.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..615637fb05925de300a80011343245d9e8d2a2e7
GIT binary patch
literal 5756
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
H_4I!MQ>>>j

literal 0
HcmV?d00001

diff --git a/ImageSegmentation/app/src/main/java/org/pytorch/imagesegmentation/MainActivity.java b/ImageSegmentation/app/src/main/java/org/pytorch/imagesegmentation/MainActivity.java
index f25da3cc..5520409b 100644
--- a/ImageSegmentation/app/src/main/java/org/pytorch/imagesegmentation/MainActivity.java
+++ b/ImageSegmentation/app/src/main/java/org/pytorch/imagesegmentation/MainActivity.java
@@ -75,8 +75,10 @@ protected void onCreate(Bundle savedInstanceState) {
         final Button buttonRestart = findViewById(R.id.restartButton);
         buttonRestart.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
-                if (mImagename == "deeplab.jpg")
+                if (mImagename.equals("deeplab.jpg"))
                     mImagename = "dog.jpg";
+                else if (mImagename.equals("dog.jpg"))
+                    mImagename = "dog_landscape.jpg";
                 else
                     mImagename = "deeplab.jpg";
                 try {
@@ -123,8 +125,8 @@ public void run() {
         int width = mBitmap.getWidth();
         int height = mBitmap.getHeight();
         int[] intValues = new int[width * height];
-        for (int j = 0; j < width; j++) {
-            for (int k = 0; k < height; k++) {
+        for (int j = 0; j < height; j++) {
+            for (int k = 0; k < width; k++) {
                 int maxi = 0, maxj = 0, maxk = 0;
                 double maxnum = -Double.MAX_VALUE;
                 for (int i = 0; i < CLASSNUM; i++) {