Changeset 10181 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2016-05-11T04:44:00+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S2184 - Math operands should be cast before assignment

Location:

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint

Files:

• AbstractMapRenderer.java (modified) (1 diff)
• LineClip.java (modified) (1 diff)
• StyledMapRenderer.java (modified) (4 diffs)
• WireframeMapRenderer.java (modified) (1 diff)

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(x-virtualNodeSize, y);
-                    path.lineTo(x+virtualNodeSize, y);
-                    path.moveTo(x, y-virtualNodeSize);
-                    path.lineTo(x, y+virtualNodeSize);
+                    path.moveTo((float) x-virtualNodeSize, y);
+                    path.lineTo((float) x+virtualNodeSize, y);
+                    path.moveTo(x, (float) y-virtualNodeSize);
+                    path.lineTo(x, (float) y+virtualNodeSize);
                 }
                 lastP = p;

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

@@ -39 +39 @@
         }
         return cohenSutherland(p1.x, p1.y, p2.x, p2.y, clipBounds.x, clipBounds.y,
-                clipBounds.x + clipBounds.width, clipBounds.y + clipBounds.height);
+                (long) clipBounds.x + clipBounds.width,
+                (long) clipBounds.y + clipBounds.height);
     }
 

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

@@ -144 +144 @@
             int dxNext = next.x - current.x;
             int dyNext = next.y - current.y;
-            double lenNext = Math.sqrt(dxNext*dxNext + dyNext*dyNext);
+            double lenNext = Math.sqrt((double) dxNext*dxNext + (double) dyNext*dyNext);
 
             if (lenNext == 0) {
@@ -814 +814 @@
                 final double segmentLength = thisP.distance(lastP);
 
-                final double dx = thisP.x - lastP.x;
-                final double dy = thisP.y - lastP.y;
+                final double dx = (double) thisP.x - lastP.x;
+                final double dy = (double) thisP.y - lastP.y;
 
                 // pos is the position from the beginning of the current segment
@@ -1263 +1263 @@
 
             if (lastPoint != null) {
-                dx = p.x - lastPoint.x;
-                dy = p.y - lastPoint.y;
+                dx = (long) p.x - lastPoint.x;
+                dy = (long) p.y - lastPoint.y;
                 double segmentLength = Math.sqrt(dx*dx + dy*dy);
                 if (segmentLength > 2*(rec.getWidth()+4)) {
@@ -1756 +1756 @@
         // Can be optimized if it turns out to be slow.
         for (int i = 1; i < poly.npoints; ++i) {
-            dx = poly.xpoints[i] - poly.xpoints[i-1];
-            dy = poly.ypoints[i] - poly.ypoints[i-1];
+            dx = (long) poly.xpoints[i] - poly.xpoints[i-1];
+            dy = (long) poly.ypoints[i] - poly.ypoints[i-1];
             segLen = Math.sqrt(dx*dx + dy*dy);
             if (totalLen > curLen + segLen) {

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 + (int) Math.round(cosPHI * sx - sinPHI * sy), p2.y + (int) Math.round(sinPHI * sx + cosPHI * sy));
-                path.moveTo(p2.x + (int) Math.round(cosPHI * sx + sinPHI * sy), p2.y + (int) Math.round(-sinPHI * sx + cosPHI * sy));
+                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, p2.y);
             }