From 9db1b3ca2898cb1e4a6ffc0ad14ef46ebab3cd03 Mon Sep 17 00:00:00 2001 From: Igor Timofeev Date: Sun, 30 Apr 2017 09:37:02 +0300 Subject: [PATCH] faefa --- ImageConverter/.idea/workspace.xml | 470 +++++++++++++----- .../ImageConverter/sample/OCIF.class | Bin 5052 -> 5139 bytes ImageConverter/src/sample/OCIF.java | 15 +- 3 files changed, 364 insertions(+), 121 deletions(-) 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 28567c6febdaaae1d34cc96800531d32670fd91c..371578de6dedf4834bc643b3de9a77665174240e 100644 GIT binary patch delta 1050 zcmZva`EN{76vsbr=5_A8*DF*sW`wAOZd5fPu?0yJQGT!`5)w<3R$HpIRPDx6YFEZq zYpqkeDq3pa_x11a9|+DFkqF-MecyAx-+RuvFXwJnJUjOK`yyDUWy=*-sIXFDmBMO|HLUgNPE394e9~E;$_6$n)TOeC%?kB~Ek0e@s)lWb?LPVJ zFzht!@`K4xy11RTVX(9D><7(;VEw>XK52J>Ne#XItMpBLe1}^eUaTc5%xB zAt@}i;`>7xv4mw3&4%-q3lv%|a>;U8*%gI}G+U-Bo6Ho$Rm(M6EZ1pO>kZ3IZW-Dv z?cBE9p~G;_a+iCS`#f++n^#<0oL^a7RhC~=Ra074y4doNN0!GtQ8hl;jOp=I^FLE~ z&I`*>hFMEdZWv4E$?`5naM262R>THGr>}< z;U^70x7zSm&kyt@Rc^Qt4|dIqbfK^s3&aS@ zNWxgs1k3T6C$l!6-c*vw0`jP42DQv)nW!seWtC2)4kg=IPlHV1Vd^-;7S6MkA(CaT zWRc@h!W8)`D;4G>*<1<?d&m1I&kGbjFxwy@BoW`0%UE$zyJUM delta 942 zcmYk5>2Hit6o;R;ozC^XbA^hDjv$qwRZ9sPTS_vCSR%GWB4TOM(N57)MT;6+)lQAA z_S#DA1}(Mk`|ht0-+YwDIU^Du-rxJ2d(OT0can4C+4r(yZ`$rY0EY72V-OWC%UR*F zl1h(Es+3l#tk%RDm1>o>E-}`5bYZ>LZSV-PF~BBjR5k~wWsAyI!#0mjY}bMvhMgX{ z>@w^&?D5E;CZ@XCr5AN7dp(i37VT5oZ#bamA8f}Vy|LbK*l@(7H%B#pOy#(ipHMof z)Sz-o!_&I;jNz=|oP&RKv@}|g?~t0^ccz0cTvixysB8P^G$uYcqf*Ry@hZ*|9eqV9 zJsjN1$z_Gn1yzx9;i`WuhQvd>+MgM_V3|sj;iBadVasK%SgtBvQ<*}OWror;rW>wX zZji9tC;TsNE`ImV?#E>w2&>4?8*%Kd?#riaznO-zK!Jk zrJNS}HPZe6WdFv0WdkG`a&I&6x>zAqW))@!sHwu|9f2D|!lcWWNNl8+XP->Ejg?veh zQbJlu5*G^kleCD%7(5ynDVAJ$QEDSBD?`LonNUD1PGz2$w2YTMo$0uzsWHy U?QA=^(h72o!x;I>g;QAe2l0Tx*Z=?k 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);