diff --git a/Vision-CW2/media/mark.png b/Vision-CW2/media/mark.png new file mode 100644 index 0000000000000000000000000000000000000000..70ba208daa6fa2bb857e6b6ae0f2106266d2b6d6 Binary files /dev/null and b/Vision-CW2/media/mark.png differ diff --git a/Vision-CW2/media/old.png b/Vision-CW2/media/old.png new file mode 100644 index 0000000000000000000000000000000000000000..fd6d593b8921c11a2fe8650ac880f91c4b6f0801 Binary files /dev/null and b/Vision-CW2/media/old.png differ diff --git a/Vision-CW2/media/older.png b/Vision-CW2/media/older.png new file mode 100644 index 0000000000000000000000000000000000000000..4d9c79e564e3cdbfc4168d5875f3b7e88d3b22b2 Binary files /dev/null and b/Vision-CW2/media/older.png differ diff --git a/Vision-CW2/media/wonka.png b/Vision-CW2/media/wonka.png new file mode 100644 index 0000000000000000000000000000000000000000..1daa2643a73574d61befef4d55091d09db96a775 Binary files /dev/null and b/Vision-CW2/media/wonka.png differ diff --git a/Vision-CW2/src/main/java/uk/ac/soton/ecs/ik1g19/hybridimages/App.java b/Vision-CW2/src/main/java/uk/ac/soton/ecs/ik1g19/hybridimages/App.java index b48cbdc75e29fa229bd6e55a816fefe66787a4be..2fb6479a6f3fb0156e9a94dfd7469ef840030b5f 100644 --- a/Vision-CW2/src/main/java/uk/ac/soton/ecs/ik1g19/hybridimages/App.java +++ b/Vision-CW2/src/main/java/uk/ac/soton/ecs/ik1g19/hybridimages/App.java @@ -10,6 +10,7 @@ import org.openimaj.image.processing.convolution.FGaussianConvolve; import org.openimaj.image.typography.hershey.HersheyFont; import javax.swing.*; +import java.io.File; import java.net.URL; /** @@ -19,10 +20,12 @@ import java.net.URL; public class App { public static void main( String[] args ) throws Exception { //Create an image - MBFImage dog = ImageUtilities.readMBF(new URL("http://comp3204.ecs.soton.ac.uk/cw/dog.jpg")); - MBFImage cat = ImageUtilities.readMBF(new URL("http://comp3204.ecs.soton.ac.uk/cw/cat.jpg")); +// MBFImage dog = ImageUtilities.readMBF(new URL("http://comp3204.ecs.soton.ac.uk/cw/dog.jpg")); +// MBFImage cat = ImageUtilities.readMBF(new URL("http://comp3204.ecs.soton.ac.uk/cw/cat.jpg")); + MBFImage img1 = ImageUtilities.readMBF(new File("C:\\Users\\isaac\\Documents\\repos\\visioncw2\\Vision-CW2\\media\\wonka.png")); + MBFImage img2 = ImageUtilities.readMBF(new File("C:\\Users\\isaac\\Documents\\repos\\visioncw2\\Vision-CW2\\media\\mark.png")); - MBFImage hybrid = MyHybridImages.makeHybrid(dog, 5, cat, 6); + MBFImage hybrid = MyHybridImages.makeHybrid(img1, 5, img2, 6); //Display the image DisplayUtilities.display(hybrid); diff --git a/mark wonka gimp.xcf b/mark wonka gimp.xcf new file mode 100644 index 0000000000000000000000000000000000000000..ccb2c13d194a1cbef0a21192b6bcf8722f8bba23 Binary files /dev/null and b/mark wonka gimp.xcf differ