Index: trunk/src/org/openstreetmap/josm/data/coor/LatLon.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/coor/LatLon.java	(revision 9383)
+++ trunk/src/org/openstreetmap/josm/data/coor/LatLon.java	(revision 9384)
@@ -435,5 +435,5 @@
     public boolean equals(Object obj) {
         if (this == obj) return true;
-        if (obj == null || getClass() != obj.getClass()) return false;
+        if (!(obj instanceof LatLon)) return false;
         LatLon that = (LatLon) obj;
         return Double.compare(that.x, x) == 0 &&
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 9383)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 9384)
@@ -1146,5 +1146,5 @@
      * @return number of matched points
      */
-    private int matchGpxTrack(List<ImageEntry> images, GpxData selectedGpx, long offset) {
+    static int matchGpxTrack(List<ImageEntry> images, GpxData selectedGpx, long offset) {
         int ret = 0;
 
@@ -1189,5 +1189,5 @@
     }
 
-    private int matchPoints(List<ImageEntry> images, WayPoint prevWp, long prevWpTime,
+    static int matchPoints(List<ImageEntry> images, WayPoint prevWp, long prevWpTime,
             WayPoint curWp, long curWpTime, long offset) {
         // Time between the track point and the previous one, 5 sec if first point, i.e. photos take