Changeset 10308 in josm for trunk/src/org/openstreetmap/josm/data/projection

Timestamp:

2016-06-01T23:17:40+02:00 (5 years ago)

Author:

Don-vip

Message:

sonar - squid:S1854 - Dead stores should be removed

Location:

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

Files:

• datum/NTV2Util.java (modified) (3 diffs)
• proj/SwissObliqueMercator.java (modified) (2 diffs)

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

@@ -72 +72 @@
      */
     public static float getFloat(byte[] b, boolean bigEndian) {
-        int i = 0;
+        int i;
         if (bigEndian) {
             i = getIntBE(b, 0);
@@ -89 +89 @@
      */
     public static double getDouble(byte[] b, boolean bigEndian) {
-        int i = 0;
-        int j = 0;
+        int i;
+        int j;
         if (bigEndian) {
             i = getIntBE(b, 0);
@@ -98 +98 @@
             j = getIntLE(b, 0);
         }
-        long l = ((long) i << 32) |
-        (j & 0x00000000FFFFFFFFL);
+        long l = ((long) i << 32) | (j & 0x00000000FFFFFFFFL);
         return Double.longBitsToDouble(l);
     }

trunk/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java

@@ -102 +102 @@
         double lambda = l / alpha;
         double phi = b;
-        double s = 0;
 
         double prevPhi = -1000;
@@ -111 +110 @@
                 throw new RuntimeException("Two many iterations");
             prevPhi = phi;
-            s = 1 / alpha * (log(tan(PI / 4 + b / 2)) - k) + ellps.e
+            double s = 1 / alpha * (log(tan(PI / 4 + b / 2)) - k) + ellps.e
             * log(tan(PI / 4 + asin(ellps.e * sin(phi)) / 2));
             phi = 2 * atan(exp(s)) - PI / 2;