see #16472 - Fix coverity FB.FE_FLOATING_POINT_EQUALITY and FB.UG_SYN…

…C_SET_UNSYNC_GET (patch by taylor.smock) git-svn-id: https://josm.openstreetmap.de/svn/trunk@18255 0c6e7542-c601-0410-84e7-c038aed88b3b
JOSM · Oct 6, 2021 · c659390 · c659390
1 parent 294ba51
commit c659390
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/org/openstreetmap/josm/gui/util/imagery/CameraPlane.java b/src/org/openstreetmap/josm/gui/util/imagery/CameraPlane.java
@@ -182,7 +182,7 @@ public void setRotation(Vector3D vec) {
         setRotation(vec.getPolarAngle(), vec.getAzimuthalAngle());
     }
 
-    public Vector3D getRotation() {
+    public synchronized Vector3D getRotation() {
         return this.rotation;
     }
 

diff --git a/src/org/openstreetmap/josm/gui/util/imagery/Vector3D.java b/src/org/openstreetmap/josm/gui/util/imagery/Vector3D.java
@@ -1,6 +1,8 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.util.imagery;
 
+import org.openstreetmap.josm.tools.Utils;
+
 /**
  * A basic 3D vector class (immutable)
  * @author Taylor Smock (documentation, spherical conversions)
@@ -236,7 +238,7 @@ public int hashCode() {
     public boolean equals(Object o) {
         if (o instanceof Vector3D) {
             Vector3D other = (Vector3D) o;
-            return this.x == other.x && this.y == other.y && this.z == other.z;
+            return Utils.equalsEpsilon(this.x, other.x) && Utils.equalsEpsilon(this.y, other.y) && Utils.equalsEpsilon(this.z, other.z);
         }
         return false;
     }