From 521cea2004a7731155b474c1b4c8c33b5376213d Mon Sep 17 00:00:00 2001
From: Luis Boto <luisboto@hotmail.es>
Date: Wed, 3 Nov 2021 00:15:57 +0100
Subject: [PATCH] Fixed bug on ratio 1 case

---
 src/hider/imageHandling/ImageHiderHandler.java  | 4 ++--
 src/hider/imageHandling/ImageRevealHandler.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/hider/imageHandling/ImageHiderHandler.java b/src/hider/imageHandling/ImageHiderHandler.java
index 7823441..ecb71bb 100644
--- a/src/hider/imageHandling/ImageHiderHandler.java
+++ b/src/hider/imageHandling/ImageHiderHandler.java
@@ -36,11 +36,11 @@ private void merge() {
 		int secretPixel, canvasPixel, counter = 0, nextPixelPair = 0;
 		while (canvasHandler.hasNextInt()) {
 			if (counter == nextPixelPair && secretHandler.hasNextInt()) {
-				nextPixelPair = counter + 2 + ratio;
+				counter++;
+				nextPixelPair = counter + ratio;
 				secretPixel = secretHandler.getNextInt();
 				resultHandler.setNextInt(this.binaryConverter.mergeFirstHalfs(canvasHandler.getNextInt(), secretPixel));
 				resultHandler.setNextInt(this.binaryConverter.mergeSecondHalfs(canvasHandler.getNextInt(), secretPixel));
-				counter++;
 			} else {
 				canvasPixel = canvasHandler.getNextInt();
 				resultHandler.setNextInt(canvasPixel);
diff --git a/src/hider/imageHandling/ImageRevealHandler.java b/src/hider/imageHandling/ImageRevealHandler.java
index 09bdaaf..d15ac79 100644
--- a/src/hider/imageHandling/ImageRevealHandler.java
+++ b/src/hider/imageHandling/ImageRevealHandler.java
@@ -28,11 +28,11 @@ private void unmerge() {
 		int canvasPixel1, canvasPixel2, canvasCounter = 0, nextPixelPair = 0, secretPixelCount = 0;
 		while (canvasHandler.hasNextInt() && secretPixelCount < this.totalSecretPixels) {
 			if (canvasCounter == nextPixelPair) {
-				nextPixelPair = canvasCounter + 2 + ratio;
+				canvasCounter++;
+				nextPixelPair = canvasCounter + ratio;
 				canvasPixel1 = canvasHandler.getNextInt();
 				canvasPixel2 = canvasHandler.getNextInt();
 				secretHandler.setNextInt(this.binaryConverter.unmergeSecretPixel(canvasPixel1, canvasPixel2));
-				canvasCounter++;
 				secretPixelCount++;
 			} else {
 				canvasHandler.getNextInt();