Changeset 6995 in josm for trunk/src/org/openstreetmap/josm/data/projection/datum

Timestamp:

2014-04-23T02:30:39+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #9906 - fix reliance on default encoding

Location:

trunk/src/org/openstreetmap/josm/data/projection/datum

Files:

• NTV2GridShiftFile.java (modified) (1 diff)
• NTV2SubGrid.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java

@@ -104 +104 @@
         topLevelSubGrid = null;
         in.read(b8);
-        String overviewHeaderCountId = new String(b8);
+        String overviewHeaderCountId = new String(b8, Utils.UTF_8);
         if (!"NUM_OREC".equals(overviewHeaderCountId))
             throw new IllegalArgumentException("Input file is not an NTv2 grid shift file");

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java

@@ -75 +75 @@
         in.read(b8);
         in.read(b8);
-        subGridName = new String(b8).trim();
-        in.read(b8);
-        in.read(b8);
-        parentSubGridName = new String(b8).trim();
-        in.read(b8);
-        in.read(b8);
-        created = new String(b8);
-        in.read(b8);
-        in.read(b8);
-        updated = new String(b8);
+        subGridName = new String(b8, Utils.UTF_8).trim();
+        in.read(b8);
+        in.read(b8);
+        parentSubGridName = new String(b8, Utils.UTF_8).trim();
+        in.read(b8);
+        in.read(b8);
+        created = new String(b8, Utils.UTF_8);
+        in.read(b8);
+        in.read(b8);
+        updated = new String(b8, Utils.UTF_8);
         in.read(b8);
         in.read(b8);