Update to Opencv 3.2.0, remove unused dependencies

Author: Lasse Häll

.gitignore

@@ -1,7 +1,6 @@
 dependency-reduced-pom.xml
 example/lib/image_recognition_library_test.jar
 target/
-testdroid.properties
 run-tests.sh
 *.zip
 application.ipa
@@ -10,4 +9,5 @@ application.apk
 *.project
 *.settings/
 .DS_Store
-
+*.idea
+*.iml

library/pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.testdroid</groupId>
     <artifactId>mobile-opencv-image-recognition-library</artifactId>
-    <version>0.2</version>
+    <version>0.3</version>
     <packaging>jar</packaging>
     <name>OpenCV Mobile Image Recognition Library</name>
     <description>Library for image recognition that can be used in mobile testing with for example Appium</description>
@@ -43,31 +43,21 @@
             <artifactId>logback-classic</artifactId>
             <version>1.1.7</version>
         </dependency>
-        <dependency>
-            <groupId>io.appium</groupId>
-            <artifactId>java-client</artifactId>
-            <version>4.1.2</version>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <version>1.7.4</version>
         </dependency>
         <dependency>
-            <groupId>opencv</groupId>
+            <groupId>org.openpnp</groupId>
             <artifactId>opencv</artifactId>
-            <version>2.4.13</version>
+            <version>3.2.0-1</version>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
             <version>20151123</version>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>

library/src/main/java/imagerecognition/AkazeImageFinder.java

@@ -5,15 +5,16 @@
 import org.json.JSONObject;
 import org.opencv.calib3d.Calib3d;
 import org.opencv.core.*;
-import org.opencv.highgui.Highgui;
+import org.opencv.imgcodecs.Imgcodecs;
+import org.opencv.imgproc.Imgproc;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import objects.ImageLocation;
 import objects.ImageSearchResult;
 
 import java.io.*;
-import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.LinkedList;
@@ -28,22 +29,20 @@ public class AkazeImageFinder {
     private static final Logger logger = LoggerFactory.getLogger(AkazeImageFinder.class);
 
     protected double getSceneHeight(String sceneFile) {
-        Mat img_scene = Highgui.imread(sceneFile, Highgui.CV_LOAD_IMAGE_UNCHANGED);
-        double scene_height = img_scene.rows();
-        return scene_height;
+        Mat img_scene = Imgcodecs.imread(sceneFile, Imgcodecs.CV_LOAD_IMAGE_UNCHANGED);
+        return img_scene.rows();
     }
 
     protected double getSceneWidth(String sceneFile) {
-        Mat img_scene = Highgui.imread(sceneFile, Highgui.CV_LOAD_IMAGE_UNCHANGED);
-        double scene_width = img_scene.cols();
-        return scene_width;
+        Mat img_scene = Imgcodecs.imread(sceneFile, Imgcodecs.CV_LOAD_IMAGE_UNCHANGED);
+        return img_scene.cols();
     }
 
     protected ImageLocation findImage(String queryImageFile, String sceneFile, double tolerance) {
 
         long start_time = System.nanoTime();
-        Mat img_object = Highgui.imread(queryImageFile, Highgui.CV_LOAD_IMAGE_UNCHANGED);
-        Mat img_scene = Highgui.imread(sceneFile, Highgui.CV_LOAD_IMAGE_UNCHANGED);
+        Mat img_object = Imgcodecs.imread(queryImageFile, Imgcodecs.CV_LOAD_IMAGE_UNCHANGED);
+        Mat img_scene = Imgcodecs.imread(sceneFile, Imgcodecs.CV_LOAD_IMAGE_UNCHANGED);
 
 
         double scene_height = img_scene.rows();
@@ -60,8 +59,8 @@ protected ImageLocation findImage(String queryImageFile, String sceneFile, doubl
             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);
-            img_scene = Highgui.imread(sceneFile, Highgui.CV_LOAD_IMAGE_UNCHANGED);
+            Imgcodecs.imwrite(sceneFile, resized_img_scene);
+            img_scene = Imgcodecs.imread(sceneFile, Imgcodecs.CV_LOAD_IMAGE_UNCHANGED);
             logger.info("Image was resized, resize factor is: " + resizeFactor);
         } else{
             resizeFactor = 1;        	
@@ -84,7 +83,7 @@ protected ImageLocation findImage(String queryImageFile, String sceneFile, doubl
         double initial_height = img_object.size().height;
         double initial_width = img_object.size().width;
 
-        Highgui.imwrite(sceneFile, img_scene);
+        Imgcodecs.imwrite(sceneFile, img_scene);
 
         //finding homography
         LinkedList<Point> objList = new LinkedList<Point>();
@@ -253,7 +252,7 @@ protected void cropImage(ImageSearchResult imageDto) {
         int scaleFactor = imageDto.getImageLocation().getScaleFactor();
         double resizeFactor = imageDto.getImageLocation().getResizeFactor();
 
-        Mat img_object = Highgui.imread(scene_filename);
+        Mat img_object = Imgcodecs.imread(scene_filename);
 
         int x_resized = (int) (x / resizeFactor)*scaleFactor;
         int y_resized = (int) (y / resizeFactor)*scaleFactor;
@@ -263,7 +262,7 @@ protected void cropImage(ImageSearchResult imageDto) {
         log(img_object.toString());
         log(croppedRect.toString());
         Mat croppedImage = new Mat(img_object, croppedRect);
-        Highgui.imwrite(scene_filename, croppedImage);
+        Imgcodecs.imwrite(scene_filename, croppedImage);
     }
 
     private Mat drawFoundHomography(Mat img_object, String filename, Mat h) {
@@ -277,14 +276,14 @@ private Mat drawFoundHomography(Mat img_object, String filename, Mat h) {
 
         Core.perspectiveTransform(obj_corners, scene_corners, h);
 
-        Mat img = Highgui.imread(filename, Highgui.CV_LOAD_IMAGE_COLOR);
+        Mat img = Imgcodecs.imread(filename, Imgcodecs.CV_LOAD_IMAGE_COLOR);
 
-        Core.line(img, new Point(scene_corners.get(0, 0)), new Point(scene_corners.get(1, 0)), new Scalar(0, 255, 0), 4);
-        Core.line(img, new Point(scene_corners.get(1, 0)), new Point(scene_corners.get(2, 0)), new Scalar(0, 255, 0), 4);
-        Core.line(img, new Point(scene_corners.get(2, 0)), new Point(scene_corners.get(3, 0)), new Scalar(0, 255, 0), 4);
-        Core.line(img, new Point(scene_corners.get(3, 0)), new Point(scene_corners.get(0, 0)), new Scalar(0, 255, 0), 4);
+        Imgproc.line(img, new Point(scene_corners.get(0, 0)), new Point(scene_corners.get(1, 0)), new Scalar(0, 255, 0), 4);
+        Imgproc.line(img, new Point(scene_corners.get(1, 0)), new Point(scene_corners.get(2, 0)), new Scalar(0, 255, 0), 4);
+        Imgproc.line(img, new Point(scene_corners.get(2, 0)), new Point(scene_corners.get(3, 0)), new Scalar(0, 255, 0), 4);
+        Imgproc.line(img, new Point(scene_corners.get(3, 0)), new Point(scene_corners.get(0, 0)), new Scalar(0, 255, 0), 4);
 
-        Highgui.imwrite(filename, img);
+        Imgcodecs.imwrite(filename, img);
 
         return scene_corners;
     }
@@ -377,42 +376,10 @@ private String runAkazeMatch(String object_filename, String scene_filename) thro
     }
 
     protected static void setupOpenCVEnv() {
-        addOpenCvToJavaLibraryPath();
-        setSysPathAccessible();
-        logger.info("java.library.path: " + System.getProperty("java.library.path"));
+        nu.pattern.OpenCV.loadShared();
         System.loadLibrary(Core.NATIVE_LIBRARY_NAME);
     }
 
-    private static void setSysPathAccessible() {
-        Field fieldSysPath = null;
-        try {
-            fieldSysPath = ClassLoader.class.getDeclaredField("sys_paths");
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
-        }
-        fieldSysPath.setAccessible(true);
-        try {
-            fieldSysPath.set(null, null);
-        } catch (IllegalAccessException e) {
-        }
-    }
-
-    private static void addOpenCvToJavaLibraryPath() {
-        String platformName = System.getProperty("os.name");
-        logger.info(platformName);
-        if (platformName.toLowerCase().contains("mac")) {
-            System.setProperty("java.library.path", System.getProperty("java.library.path") + File.pathSeparator + System.getProperty("user.dir") + "/lib/mac/opencv");
-        } else if (platformName.toLowerCase().contains("win")) {
-            if (System.getProperty("os.arch").contains("64")) {
-                System.setProperty("java.library.path", System.getProperty("java.library.path") + File.pathSeparator + System.getProperty("user.dir") + "/lib/win/opencv/x64");
-            } else {
-                System.setProperty("java.library.path", System.getProperty("java.library.path") + File.pathSeparator + System.getProperty("user.dir") + "/lib/win/opencv/x86");
-            }
-        } else {
-            System.setProperty("java.library.path", System.getProperty("java.library.path") + File.pathSeparator + System.getProperty("user.dir") + "/lib/linux/opencv");
-        }
-    }
-
     private JSONObject getJsonObject(String filename) {
         File jsonFile = new File(filename);
         InputStream is = null;

library/src/main/java/imagerecognition/ImageRecognition.java

@@ -8,7 +8,7 @@
 
 import org.apache.commons.io.FilenameUtils;
 import org.opencv.core.Point;
-import org.openqa.selenium.Dimension;
+import org.opencv.core.Size;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -58,26 +58,26 @@ public static ImageLocation findImage(String searchedImageFilePath, String scene
         ImageLocation imgLocation = imageFinder.findImage(searchedImageFilePath, sceneImageFilePath, settings.getTolerance());
 
         if (imgLocation != null) {
-            Dimension screenSize = getScreenSize(platform, sceneImageFilePath);
+            Size screenSize = getScreenSize(platform, sceneImageFilePath);
             if (platform.equals(PlatformType.IOS)) {
                 imgLocation = scaleImageRectangleForIos(screenSize, imgLocation, sceneImageFilePath);
             }
             Point center = imgLocation.getCenter();
             if (!isPointInsideScreenBounds(center, screenSize)) {
-                log("Screen size is (width, height): " + screenSize.getWidth() + ", " + screenSize.getHeight());
+                log("Screen size is (width, height): " + screenSize.width + ", " + screenSize.height);
                 log("WARNING: Coordinates found do not match the screen --> image not found.");
                 imgLocation = null;
             }
         }
         return imgLocation;
     }
 
-    private static ImageLocation scaleImageRectangleForIos(Dimension screenSize, ImageLocation imageLocation, String sceneImageFilePath) {
+    private static ImageLocation scaleImageRectangleForIos(Size screenSize, ImageLocation imageLocation, String sceneImageFilePath) {
         //for retina devices we need to recalculate coordinates
         double sceneHeight = imageFinder.getSceneHeight(sceneImageFilePath);
         double sceneWidth = imageFinder.getSceneWidth(sceneImageFilePath);
-        int screenHeight = screenSize.getHeight();
-        int screenWidth = screenSize.getWidth();
+        int screenHeight = (int) screenSize.height;
+        int screenWidth = (int) screenSize.width;
 
         // Make sure screenshot size values are "landscape" for comparison
         if (sceneHeight > sceneWidth) {
@@ -108,7 +108,7 @@ private static ImageLocation scaleImageRectangleForIos(Dimension screenSize, Ima
         return imageLocation;
     }
 
-    private static boolean isPointInsideScreenBounds(Point center, Dimension screenSize) {
+    private static boolean isPointInsideScreenBounds(Point center, Size screenSize) {
         return !((center.x >= screenSize.width) || (center.x < 0) || (center.y >= screenSize.height) || (center.y < 0));
     }
 
@@ -280,27 +280,25 @@ private static void takeIDeviceScreenshot(String screenShotFilePath) throws Exce
         }
     }
 
-    private static Dimension getScreenSize(PlatformType platform, String sceneImageFilePath) throws Exception {
+    private static Size getScreenSize(PlatformType platform, String sceneImageFilePath) throws Exception {
         if (platform.equals(PlatformType.IOS)) {
             return getIosScreenSize(sceneImageFilePath);
         } else {
             return getAndroidScreenSize();
         }
     }
 
-    private static Dimension getIosScreenSize(String sceneImageFilePath) throws Exception {
+    private static Size getIosScreenSize(String sceneImageFilePath) throws Exception {
         String udid = getIosUdid();
         String productType = getIosProductType(udid);
         try {
-            Dimension screenSize = getIosScreenSizePointsFromPropertiesFile(productType);
-            return screenSize;
+            return getIosScreenSizePointsFromPropertiesFile(productType);
         } catch(UnsupportedOperationException e){
             logger.warn("Current device not included in the ios-screen-size.properties-file. Assuming x3 Retina display.");
             logger.warn("Add the devices screen size information to the ios-screen-size.properties-file");
             int screenHeight = (int) (imageFinder.getSceneHeight(sceneImageFilePath)/3);
             int screenWidth = (int) (imageFinder.getSceneWidth(sceneImageFilePath)/3);
-            Dimension screenSize = new Dimension(screenWidth, screenHeight);
-            return screenSize;
+            return new Size(screenWidth, screenHeight);
         }
     }
 
@@ -313,8 +311,7 @@ private static String getIosProductType(String udid) throws IOException, Interru
         if (exitVal != 0) {
             throw new Exception("ideviceinfo process exited with value: " + exitVal);
         }
-        String productType = in.readLine();
-        return productType;
+        return in.readLine();
     }
 
     private static String getIosUdid() throws Exception {
@@ -325,7 +322,7 @@ private static String getIosUdid() throws Exception {
         return udid;
     }
 
-    private static Dimension getIosScreenSizePointsFromPropertiesFile(String productType) throws UnsupportedOperationException, Exception {
+    private static Size getIosScreenSizePointsFromPropertiesFile(String productType) throws UnsupportedOperationException, Exception {
         Properties screenSizeProperties = fetchProperties();
         String screenDimensionString = (String) screenSizeProperties.get(productType);
         if (screenDimensionString == null){
@@ -337,7 +334,7 @@ private static Dimension getIosScreenSizePointsFromPropertiesFile(String product
         }
         int width = Integer.parseInt(screenDimensions[0]);
         int height = Integer.parseInt(screenDimensions[1]);
-        return new Dimension(width, height);
+        return new Size(width, height);
     }
 
     private static Properties fetchProperties() throws Exception {
@@ -366,7 +363,7 @@ private static Properties fetchProperties() throws Exception {
         return iosScreenSizeProperties;
     }
 
-    private static Dimension getAndroidScreenSize() throws IOException, InterruptedException {
+    private static Size getAndroidScreenSize() throws IOException, InterruptedException {
         String adb = "adb";
         String[] adbCommand = {adb, "shell", "dumpsys", "window"};
         ProcessBuilder p = new ProcessBuilder(adbCommand);
@@ -386,8 +383,7 @@ private static Dimension getAndroidScreenSize() throws IOException, InterruptedE
         }
         int width = Integer.parseInt(size[0]);
         int height = Integer.parseInt(size[1]);
-        Dimension screenSize = new Dimension(width, height);
-        return screenSize;
+        return new Size(width, height);
     }