Merge branch 'master' of git.mosad.xyz:localhorst/TextureSync

client/src/main/kotlin/org/hso/texturesyncclient/controller/RootController.kt

@@ -51,7 +51,7 @@ class RootController : Controller() {
         val uuid = UUID.randomUUID()
         val format = if (File(path).extension.toLowerCase() == "png") TextureFormat.PNG else TextureFormat.JPEG
         val bimg = ImageIO.read(File(path)) //image for obtaining resolution
-        val resolution = Pair(bimg.height, bimg.width)
+        val resolution = Pair(bimg.width, bimg.height)
         val cal = Calendar.getInstance() //calendar obj with current time
         val hash = Sha256(data)
 

client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/MainViewController.kt

@@ -60,7 +60,7 @@ class MainViewController : Controller() {
         }
     }
 
-    // DetailView actions
+    // MainView actions
 
     fun cvSearchAction(tags: ObservableList<String>) {
         // show spinner, block ui