diff --git a/build.gradle b/build.gradle index 5ceb7ab..6030a77 100644 --- a/build.gradle +++ b/build.gradle @@ -66,7 +66,7 @@ configure(install.repositories.mavenInstaller) { packaging 'jar' description project.description - url 'https://github.com/romankh3/image-comparison' + url 'https://romankh3.github.io/image-comparison/' scm { connection 'git@github.com:romankh3/image-comparison.git' diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..f649af9 --- /dev/null +++ b/pom.xml @@ -0,0 +1,35 @@ + + 4.0.0 + + com.github.romankh3 + image-comparison + 2.0.2 + jar + + Image Comparison + + https://romankh3.github.io/image-comparison/ + + + 1.8 + 1.8 + + + + + org.mockito + mockito-core + 2.26.0 + test + + + junit + junit + 4.12 + test + + + \ No newline at end of file diff --git a/src/main/java/ua/comparison/image/ImageComparison.java b/src/main/java/ua/comparison/image/ImageComparison.java index b71d05e..91ff231 100644 --- a/src/main/java/ua/comparison/image/ImageComparison.java +++ b/src/main/java/ua/comparison/image/ImageComparison.java @@ -58,7 +58,7 @@ public class ImageComparison { private int regionCount = counter; private int[][] matrix; - ImageComparison(String image1, String image2) throws IOException, URISyntaxException { + public ImageComparison(String image1, String image2) throws IOException, URISyntaxException { this(readImageFromResources(image1), readImageFromResources(image2), null); } @@ -75,6 +75,10 @@ public ImageComparison(BufferedImage image1, BufferedImage image2, File destinat this.destination = destination; } + public ImageComparison(BufferedImage image1, BufferedImage image2) { + this(image1, image2, null); + } + public static void main(String[] args) throws IOException, URISyntaxException { ImageComparison imgCmp = create(args); BufferedImage result = imgCmp.compareImages(); diff --git a/src/main/java/ua/comparison/image/ImageComparisonTools.java b/src/main/java/ua/comparison/image/ImageComparisonTools.java index 8a8bf94..07bf9f8 100644 --- a/src/main/java/ua/comparison/image/ImageComparisonTools.java +++ b/src/main/java/ua/comparison/image/ImageComparisonTools.java @@ -71,7 +71,7 @@ public static void checkCorrectImageSize(BufferedImage image1, BufferedImage ima * @param rgb2 the RGB value of the Pixel of the Image2. * @return {@code true} if they' are difference, {@code false} otherwise. */ - public static boolean isDifferent(int rgb1, int rgb2) { + public static boolean isDifferentPixels(int rgb1, int rgb2) { int red1 = (rgb1 >> 16) & 0xff; int green1 = (rgb1 >> 8) & 0xff; int blue1 = (rgb1) & 0xff; @@ -97,7 +97,7 @@ static int[][] populateTheMatrixOfTheDifferences(BufferedImage image1, BufferedI int[][] matrix = new int[image1.getWidth()][image1.getHeight()]; for (int y = 0; y < image1.getHeight(); y++) { for (int x = 0; x < image1.getWidth(); x++) { - matrix[x][y] = isDifferent(image1.getRGB(x, y), image2.getRGB(x, y)) ? 1 : 0; + matrix[x][y] = isDifferentPixels(image1.getRGB(x, y), image2.getRGB(x, y)) ? 1 : 0; } } return matrix; diff --git a/src/main/resources/logos/favicon-no-BG.png b/src/test/resources/logos/favicon-no-BG.png similarity index 100% rename from src/main/resources/logos/favicon-no-BG.png rename to src/test/resources/logos/favicon-no-BG.png diff --git a/src/main/resources/logos/favicon-red-BG.png b/src/test/resources/logos/favicon-red-BG.png similarity index 100% rename from src/main/resources/logos/favicon-red-BG.png rename to src/test/resources/logos/favicon-red-BG.png diff --git a/src/main/resources/logos/logo-trans.png b/src/test/resources/logos/logo-trans.png similarity index 100% rename from src/main/resources/logos/logo-trans.png rename to src/test/resources/logos/logo-trans.png diff --git a/src/main/resources/logos/logo-white-BG.jpg b/src/test/resources/logos/logo-white-BG.jpg similarity index 100% rename from src/main/resources/logos/logo-white-BG.jpg rename to src/test/resources/logos/logo-white-BG.jpg