Bugfix: height and width swapped

Author: Milchreis

src/milchreis/imageprocessing/Comparison.java

@@ -14,8 +14,8 @@ public static float howDifferent(PImage img1, PImage img2) {
 
         long diff = 0L;
 
-        for (int y = 0; y < img1.width; y++) {
-            for (int x = 0; x < img1.height; x++) {
+        for (int y = 0; y < img1.height; y++) {
+            for (int x = 0; x < img1.width; x++) {
 
                 int[] rgb1 = Tools.getRGB(img1.get(x, y));
                 int[] rgb2 = Tools.getRGB(img2.get(x, y));
@@ -39,8 +39,8 @@ public static PImage calculateDifferenceImage(PImage img1, PImage img2) {
 
         PImage output = Tools.createBlankImageLike(img1);
 
-        for (int y = 0; y < img1.width; y++) {
-            for (int x = 0; x < img1.height; x++) {
+        for (int y = 0; y < img1.height; y++) {
+            for (int x = 0; x < img1.width; x++) {
 
                 int[] rgb1 = Tools.getRGB(img1.get(x, y));
                 int[] rgb2 = Tools.getRGB(img2.get(x, y));

src/milchreis/imageprocessing/Contrast.java

@@ -20,28 +20,35 @@ public static PImage apply(PImage image, float intensity) {
 		PImage output = image.copy();
 
 		int contrastIntensity = (int) map(intensity, -1.0f, 1.0f, -255, 255);
-
-		float contrastCorrectionFactor =
-				(259.f * (contrastIntensity + 255))
-				/
-				(255f * (259 - contrastIntensity));
+		float contrastCorrectionFactor = getContrasCorrectionFactor(contrastIntensity);
 
 		for(int x=0; x < image.width; x++) {
 			for(int y=0; y < image.height; y++) {
 
 				int[] rgb = Tools.getColors(image, x, y);
-
-				rgb[0] = (int)constrain(contrastCorrectionFactor * (rgb[0] - 128) + 128, 0, 255);
-				rgb[1] = (int)constrain(contrastCorrectionFactor * (rgb[1] - 128) + 128, 0, 255);
-				rgb[2] = (int)constrain(contrastCorrectionFactor * (rgb[2] - 128) + 128, 0, 255);
-
+				contrastPixel(rgb, contrastCorrectionFactor);
 				Tools.set(output, x, y, rgb[0], rgb[1], rgb[2]);
 			}
 		}
-		
+
 		return output;
 	}
 
+	/**
+	 *
+	 * @param contrastIntensity	value between -255 and 255
+	 * @return
+	 */
+	static float getContrasCorrectionFactor(int contrastIntensity) {
+		return (259.f * (contrastIntensity + 255))
+				/
+				(255f * (259 - contrastIntensity));
+	}
+
+	static void contrastPixel(int[] rgb, float contrastCorrectionFactor) {
+		rgb[0] = (int)constrain(contrastCorrectionFactor * (rgb[0] - 128) + 128, 0, 255);
+		rgb[1] = (int)constrain(contrastCorrectionFactor * (rgb[1] - 128) + 128, 0, 255);
+		rgb[2] = (int)constrain(contrastCorrectionFactor * (rgb[2] - 128) + 128, 0, 255);
+	}
 
-	
 }

src/milchreis/imageprocessing/Halftone.java

@@ -47,8 +47,8 @@ public static PImage apply(PImage image, int dotsize, int foreground, int backgr
 
 		int xOffset = 0;
 
-		for (int y = 0; y < canvas.width; y += dotsize + spacing) {
-			for (int x = xOffset; x < canvas.height; x += dotsize + spacing) {
+		for (int y = 0; y < canvas.height; y += dotsize + spacing) {
+			for (int x = xOffset; x < canvas.width; x += dotsize + spacing) {
 
 				int color = image.get(x+dotsize/2, y+dotsize/2);
 

src/milchreis/imageprocessing/Intensity.java

@@ -17,8 +17,8 @@ public static PImage apply(PImage image, float intensity) {
 
         PImage out = image.copy();
 
-        for (int y = 0; y < image.width; y++) {
-            for (int x = 0; x < image.height; x++) {
+        for (int y = 0; y < image.height; y++) {
+            for (int x = 0; x < image.width; x++) {
 
                 int rgb = image.get(x, y);
                 float[] hsb = Tools.rgbToHsb(rgb);

src/milchreis/imageprocessing/Saturation.java

@@ -20,8 +20,8 @@ public static PImage apply(PImage image, int highlightColor, float highlightInte
         int[] highlightTone = Tools.getRGB(highlightColor);
         int[] shadowTone = Tools.getRGB(shadowsColor);
 
-        for (int y = 0; y < image.width; y++) {
-            for (int x = 0; x < image.height; x++) {
+        for (int y = 0; y < image.height; y++) {
+            for (int x = 0; x < image.width; x++) {
 
                 int color = image.get(x, y);
                 int[] rgb = Tools.getRGB(color);

src/milchreis/imageprocessing/SplitToning.java

@@ -18,8 +18,8 @@ public static PImage apply(PImage image, int color, float intensity) {
         PImage output = Tools.createBlankImageLike(image);
         int[] tone = Tools.getRGB(color);
 
-        for (int y = 0; y < image.width; y++) {
-            for (int x = 0; x < image.height; x++) {
+        for (int y = 0; y < image.height; y++) {
+            for (int x = 0; x < image.width; x++) {
 
                 int[] rgb = Tools.getRGB(image.get(x, y));
                 tonePixel(rgb, tone, intensity);

src/milchreis/imageprocessing/Toning.java

@@ -102,10 +102,13 @@ public static int getRGB(int red, int green, int blue) {
 	 * @return
 	 */
 	public static float[] rgbToHsb(int rgb) {
-		int[] arrRGB = getRGB(rgb);
-		return rgbToHsb(arrRGB[0], arrRGB[1], arrRGB[2]);
+		return rgbToHsb(getRGB(rgb));
 	}
-	
+
+	public static float[] rgbToHsb(int[] rgb) {
+		return rgbToHsb(rgb[0], rgb[1], rgb[2]);
+	}
+
 	/**
 	 * Returns an array for hue, saturation and brightness
 	 * in range: