Changeset 32380 in osm for applications/editors/josm/plugins/seachart/src/s57/S57dat.java

Timestamp:

2016-06-23T14:17:55+02:00 (9 years ago)

Author:

malcolmh

Message:

updates

File:

• applications/editors/josm/plugins/seachart/src/s57/S57dat.java (modified) (2 diffs)

applications/editors/josm/plugins/seachart/src/s57/S57dat.java

@@ -224 +224 @@
                 } else {
                         int f = Math.abs(conv.bin);
-                        if (f < 8) {
+                        if (f < 5) {
                                 long val = buffer[offset + --f];
                                 if (conv.bin > 0)
@@ -253 +253 @@
                                 return val;
                         } else {
-                                f /= 8;
-                                long val = 0;
-                                for (int i = 0; i < f; i++) {
+                                if (f == 5) {
+                                        long val = buffer[offset++] & 0xff;
+                                        f--;
+                                        while (f > 0) {
+                                                val = (val << 8) + (buffer[offset + --f] & 0xff);
+                                        }
+                                        offset += 4;
+                                        return val;
+                                } else {
+                                        long val = buffer[offset++] & 0xff;
                                         val = (val << 8) + (buffer[offset++] & 0xff);
-                                }
-                                return val;
+                                        f = 4;
+                                        while (f > 0) {
+                                                val = (val << 8) + (buffer[offset + --f] & 0xff);
+                                        }
+                                        offset += 4;
+                                        f = 2;
+                                        while (f > 0) {
+                                                val = (val << 8) + (buffer[offset + --f] & 0xff);
+                                        }
+                                        offset += 2;
+                                        return val;
+                                }
                         }
                 }