Ignore:
Timestamp:
2014-04-23T02:30:39+02:00 (6 years ago)
Author:
Don-vip
Message:

fix #9906 - fix reliance on default encoding

Location:
trunk/src/org/openstreetmap/josm/data/projection
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/projection/Projections.java

    r6883 r6995  
    135135        try {
    136136            InputStream in = new MirroredInputStream("resource://data/projection/epsg");
    137             r = new BufferedReader(new InputStreamReader(in));
     137            r = new BufferedReader(new InputStreamReader(in, Utils.UTF_8));
    138138            String line, lastline = "";
    139139            while ((line = r.readLine()) != null) {
  • trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java

    r6990 r6995  
    104104        topLevelSubGrid = null;
    105105        in.read(b8);
    106         String overviewHeaderCountId = new String(b8);
     106        String overviewHeaderCountId = new String(b8, Utils.UTF_8);
    107107        if (!"NUM_OREC".equals(overviewHeaderCountId))
    108108            throw new IllegalArgumentException("Input file is not an NTv2 grid shift file");
  • trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java

    r6822 r6995  
    7575        in.read(b8);
    7676        in.read(b8);
    77         subGridName = new String(b8).trim();
    78         in.read(b8);
    79         in.read(b8);
    80         parentSubGridName = new String(b8).trim();
    81         in.read(b8);
    82         in.read(b8);
    83         created = new String(b8);
    84         in.read(b8);
    85         in.read(b8);
    86         updated = new String(b8);
     77        subGridName = new String(b8, Utils.UTF_8).trim();
     78        in.read(b8);
     79        in.read(b8);
     80        parentSubGridName = new String(b8, Utils.UTF_8).trim();
     81        in.read(b8);
     82        in.read(b8);
     83        created = new String(b8, Utils.UTF_8);
     84        in.read(b8);
     85        in.read(b8);
     86        updated = new String(b8, Utils.UTF_8);
    8787        in.read(b8);
    8888        in.read(b8);
Note: See TracChangeset for help on using the changeset viewer.