Merge pull request #30 from EmbroidePy/0.1.22

Correct HusReader, java9 function

Author: tatarize

core/src/main/java/org/embroideryio/embroideryio/EmbCompress.java

@@ -197,7 +197,7 @@ public ByteBuffer decompress(ByteBuffer input_data_set, int uncompressed_size) {
         ByteBuffer output_data = ByteBuffer.allocate(uncompressed_size);
         block_elements = -1;
         int bits_total = input_data.array().length * 8;
-        while ((bits_total > bit_position) && ((uncompressed_size == -1) || (output_data.array().length <= uncompressed_size))) {
+        while ((bits_total > bit_position) && ((uncompressed_size == -1) || (output_data.position() <= uncompressed_size))) {
             int character = get_token();
             if (character <= 255) {  //# literal.
                 output_data.put((byte) character);
@@ -208,12 +208,11 @@ else if (character == 510) {
             else {
                 int length = character - 253;  //# Min length is 3. 256-253=3.
                 int back = get_position() + 1;
-                int position = output_data.array().length - back;
+                int position = output_data.position() - back;
                 if (back > length){
                     //# Entire lookback is already within output data.
                     output_data.put(Arrays.copyOfRange(output_data.array(), position, position + length));
-                }
-                else {
+                } else {
                     //# Will read & write the same data at some point.
                     for (int i = position, s = position + length; i < s; i++) {
                         output_data.put(output_data.get(i));

core/src/main/java/org/embroideryio/embroideryio/EmbPattern.java

@@ -944,8 +944,8 @@ public static EmbPattern.Reader getReaderByFilename(String filename) {
                 return new BroReader();
             case "col":
                 return new ColReader();
-            case "csd":
-                return new CsdReader();
+//            case "csd":
+//                return new CsdReader();
             case "csv":
                 return new CsvReader();
             case "dat":

core/src/main/java/org/embroideryio/embroideryio/HusReader.java

@@ -52,7 +52,7 @@ public void read() throws IOException {
         ByteBuffer x_decompressed = EmbCompress.expand(ByteBuffer.wrap(x_bytes), number_of_stitches);
 
         seek(y_offset);
-        byte[] y_bytes = this.stream.readAllBytes(); //readfully
+        byte[] y_bytes = readAllBytes(); //readfully
         readFully(y_bytes);
         ByteBuffer y_decompressed = EmbCompress.expand(ByteBuffer.wrap(y_bytes), number_of_stitches);
 

core/src/main/java/org/embroideryio/embroideryio/ReadHelper.java

@@ -1,5 +1,6 @@
 package org.embroideryio.embroideryio;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -109,6 +110,18 @@ public int readFully(byte[] data) throws IOException {
         return (read) ? offset : -1;
     }
 
+    public byte[] readAllBytes() throws IOException {
+        InputStream s = stream;
+        int bufferLength = 1024;
+        byte[] buffer = new byte[bufferLength];
+        int bytesRead;
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        while ((bytesRead = s.read(buffer, 0, bufferLength)) != -1) {
+            outputStream.write(buffer, 0, bytesRead);
+        }
+        return outputStream.toByteArray();
+    }
+
     public static int signed8(int v) {
         v &= 0xFF;
         if (v > 0x7F) {