minor refactoring

Author: Severi Haverila

src/main/java/library/AkazeImageFinder.java

@@ -23,16 +23,18 @@
 public class AkazeImageFinder {
 
     private static final Logger logger = LoggerFactory.getLogger(AkazeImageFinder.class);
-    public double scene_height;
-    public double scene_width;
-    double lastResizeFactor;
+    double lastResizeFactor; //TODO Severi remove this
 
-    public double getSceneHeight() {
+    public double getSceneHeight(String sceneFile) {
+        Mat img_scene = Highgui.imread(sceneFile, Highgui.CV_LOAD_IMAGE_UNCHANGED);
+        double scene_height = img_scene.rows();
         return scene_height;
     }
 
-    public double getSceneWidth() {
-        return scene_width;
+    public double getSceneWidth(String sceneFile) {
+    	Mat img_scene = Highgui.imread(sceneFile, Highgui.CV_LOAD_IMAGE_UNCHANGED);
+    	double scene_width = img_scene.cols();
+    	return scene_width;
     }
 
     public Point[] findImage(String queryImageFile, String sceneFile, double tolerance) {
@@ -41,9 +43,9 @@ public Point[] findImage(String queryImageFile, String sceneFile, double toleran
         Mat img_object = Highgui.imread(queryImageFile, Highgui.CV_LOAD_IMAGE_UNCHANGED);
         Mat img_scene = Highgui.imread(sceneFile, Highgui.CV_LOAD_IMAGE_UNCHANGED);
 
-        Mat resized_img_scene = new Mat();
-        scene_height = img_scene.rows();
-        scene_width = img_scene.cols();
+        
+        double scene_height = img_scene.rows();
+        double scene_width = img_scene.cols();
         //logger.info("Scene height and width: " + scene_height + ", " + scene_width);
 
         double resizeFactor = 1;
@@ -53,6 +55,7 @@ public Point[] findImage(String queryImageFile, String sceneFile, double toleran
             resizeFactor = scene_height / 750;
 
         if (resizeFactor > 1) {
+            Mat resized_img_scene = new Mat();
             Size size = new Size(scene_width / resizeFactor, scene_height / resizeFactor);
             resize(img_scene, resized_img_scene, size);
             Highgui.imwrite(sceneFile, resized_img_scene);

src/main/java/library/ImageRecognition.java

@@ -41,7 +41,7 @@ public static Point[] findImage(String image, String scene, ImageRecognitionSett
 
         if (imgRect != null) {
             if (platformName.equalsIgnoreCase("iOS")) {
-                imgRect = scaleImageRectangleForIos(screenSize, imgRect);
+                imgRect = scaleImageRectangleForIos(screenSize, imgRect, scene);
             }
             Point center = imgRect[4];
             if (!isPointInsideScreenBounds(center, screenSize)) {
@@ -67,11 +67,11 @@ private static Point[] findImageUsingAkaze(String image, String scene, ImageReco
 
 
 
-	private static Point[] scaleImageRectangleForIos(Dimension screenSize, Point[] imgRect) {
+	private static Point[] scaleImageRectangleForIos(Dimension screenSize, Point[] imgRect, String scene) {
 		Point[] imgRectScaled;
 		//for retina devices we need to recalculate coordinates
-		double sceneHeight = imageFinder.getSceneHeight();
-		double sceneWidth = imageFinder.getSceneWidth();
+		double sceneHeight = imageFinder.getSceneHeight(scene);
+		double sceneWidth = imageFinder.getSceneWidth(scene);
 
 		int screenHeight = screenSize.getHeight();
 		int screenWidth = screenSize.getWidth();