Changeset 10303 in josm for trunk

Timestamp:

2016-05-30T23:37:51+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S2164 - Math should not be performed on floats

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/DrawAction.java (modified) (1 diff)
• data/osm/visitor/paint/AbstractMapRenderer.java (modified) (1 diff)
• data/osm/visitor/paint/StyledMapRenderer.java (modified) (1 diff)
• data/osm/visitor/paint/WireframeMapRenderer.java (modified) (1 diff)
• gui/layer/ImageryLayer.java (modified) (2 diffs)
• gui/layer/gpx/GpxDrawHelper.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -1483 +1483 @@
                 if (absoluteFix) {
                     b.moveTo(p2.x, p2.y);
-                    b.lineTo(2f*p1.x-p2.x, 2f*p1.y-p2.y); // bi-directional line
+                    b.lineTo(2d*p1.x-p2.x, 2d*p1.y-p2.y); // bi-directional line
                 } else {
                     b.moveTo(p2.x, p2.y);

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java

@@ -221 +221 @@
                     int x = (p.x+lastP.x)/2;
                     int y = (p.y+lastP.y)/2;
-                    path.moveTo((float) x-virtualNodeSize, y);
-                    path.lineTo((float) x+virtualNodeSize, y);
-                    path.moveTo(x, (float) y-virtualNodeSize);
-                    path.lineTo(x, (float) y+virtualNodeSize);
+                    path.moveTo((double) x-virtualNodeSize, y);
+                    path.lineTo((double) x+virtualNodeSize, y);
+                    path.moveTo(x, (double) y-virtualNodeSize);
+                    path.lineTo(x, (double) y+virtualNodeSize);
                 }
                 lastP = p;

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -1503 +1503 @@
                             while (dist < segmentLength) {
                                 for (int i = 0; i < 2; ++i) {
-                                    float onewaySize = i == 0 ? 3f : 2f;
+                                    double onewaySize = i == 0 ? 3d : 2d;
                                     GeneralPath onewayPath = i == 0 ? onewayArrowsCasing : onewayArrows;
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java

@@ -432 +432 @@
                 final double sy = l * (p1.y - p2.y);
 
-                path.lineTo(p2.x + (float) Math.round(cosPHI * sx - sinPHI * sy), p2.y + (float) Math.round(sinPHI * sx + cosPHI * sy));
-                path.moveTo(p2.x + (float) Math.round(cosPHI * sx + sinPHI * sy), p2.y + (float) Math.round(-sinPHI * sx + cosPHI * sy));
+                path.lineTo(p2.x + (double) Math.round(cosPHI * sx - sinPHI * sy), p2.y + (double) Math.round(sinPHI * sx + cosPHI * sy));
+                path.moveTo(p2.x + (double) Math.round(cosPHI * sx + sinPHI * sy), p2.y + (double) Math.round(-sinPHI * sx + cosPHI * sy));
                 path.lineTo(p2.x, p2.y);
             }

trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java

@@ -520 +520 @@
                 int g = srcPixels[i + greenOffset] & 0xff;
                 int b = srcPixels[i + blueOffset] & 0xff;
-                float luminosity = r * .21f + g * .72f + b * .07f;
+                double luminosity = r * .21d + g * .72d + b * .07d;
                 destPixels[i + redOffset] = mix(r, luminosity);
                 destPixels[i + greenOffset] = mix(g, luminosity);
@@ -530 +530 @@
         }
 
-        private byte mix(int color, float luminosity) {
+        private byte mix(int color, double luminosity) {
             int val = (int) (colorfulness * color +  (1 - colorfulness) * luminosity);
             if (val < 0) {

trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java

@@ -484 +484 @@
                         new Color(trkPnt.customColoring.getRGB() & 0x00ffffff | hdopAlpha << 24, true);
                     g.setColor(customColoringTransparent);
-                    // hdop cirles
+                    // hdop circles
                     int hdopp = mv.getPoint(new LatLon(
                             trkPnt.getCoor().lat(),
-                            trkPnt.getCoor().lon() + 2*6*hdop*360/40000000d)).x - screen.x;
+                            trkPnt.getCoor().lon() + 2d*6*hdop*360/40000000d)).x - screen.x;
                     g.drawArc(screen.x-hdopp/2, screen.y-hdopp/2, hdopp, hdopp, 0, 360);
                 }