Changeset 31410 in osm for applications/editors/josm/plugins/mapillary/src

Timestamp:

2015-07-27T14:52:11+02:00 (9 years ago)

Author:

floscher

Message:

Don't throw an exception in MapillaryImportedImage.getImage() when file==null

File:

• applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryImportedImage.java (modified) (1 diff)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryImportedImage.java

@@ -63 +63 @@
    * Returns the pictures of the file.
    *
-   * @return A BufferedImage object containing the pictures.
+   * @return A BufferedImage object containing the picture,
+   *           or null if the {@link File} given in the constructor was null.
    * @throws IOException
-   * @throws IllegalArgumentException
-   *           if file is currently set to null
    */
   public BufferedImage getImage() throws IOException {
-    return ImageIO.read(file);
+    return file == null ? null : ImageIO.read(file);
   }