diff --git a/ImageConverter/.idea/workspace.xml b/ImageConverter/.idea/workspace.xml index 7f3da045..5f05e503 100644 --- a/ImageConverter/.idea/workspace.xml +++ b/ImageConverter/.idea/workspace.xml @@ -64,91 +64,47 @@ - - - - - - - - - - - - - - - - - - + + - + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + ImageConverter @@ -204,8 +160,6 @@ - - @@ -252,7 +206,9 @@ + + @@ -593,16 +549,311 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - @@ -657,10 +908,6 @@ - - - - @@ -669,6 +916,17 @@ + + + + + + + + + + + @@ -677,6 +935,16 @@ + + + + + + + + + + @@ -688,16 +956,20 @@ - + - - + + + + + + + + + + - - - - @@ -705,39 +977,11 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ImageConverter/out/production/ImageConverter/sample/OCIF.class b/ImageConverter/out/production/ImageConverter/sample/OCIF.class index 28567c6f..371578de 100644 Binary files a/ImageConverter/out/production/ImageConverter/sample/OCIF.class and b/ImageConverter/out/production/ImageConverter/sample/OCIF.class differ diff --git a/ImageConverter/src/sample/OCIF.java b/ImageConverter/src/sample/OCIF.java index ede4658b..acf1b9b3 100644 --- a/ImageConverter/src/sample/OCIF.java +++ b/ImageConverter/src/sample/OCIF.java @@ -104,17 +104,16 @@ public class OCIF { FileOutputStream out = new FileOutputStream(convertedImagePath); out.write("OCIF".getBytes(StandardCharsets.US_ASCII)); - out.write((byte) (encodingMethod)); + out.write((byte) encodingMethod); out.write((byte) requestedWidth); out.write((byte) requestedHeight); - int xModifyer = 1, yModifyer = 2; - if (convertAsBraille) { - xModifyer = 2; - yModifyer = 4; - } - - sample.Image image = new sample.Image(new javafx.scene.image.Image(imagePath, requestedWidth * xModifyer, requestedHeight * yModifyer, false, true)); + sample.Image image = new sample.Image(new javafx.scene.image.Image(imagePath, + requestedWidth * (convertAsBraille ? 2 : 1), + requestedHeight * (convertAsBraille ? 4 : 2), + false, + true + )); if (enableDithering) { image = sample.Image.dither(image, ditheringIntensity);