fixed a bug causing nullpointer exceptions in some image files (i.e. the ones

that do not need to be scaled)

diff --git a/source/mir/media/image/ImageMagickImageProcessor.java b/source/mir/media/image/ImageMagickImageProcessor.java
index 74db390..bb9a3dc 100755 (executable)
--- a/source/mir/media/image/ImageMagickImageProcessor.java
+++ b/source/mir/media/image/ImageMagickImageProcessor.java
@@ -285,15 +285,16 @@ public class ImageMagickImageProcessor implements ImageProcessor {
 
       if (1 - scale > aMinDescale) {
         scaleImage(scale);
+
+        return;
       }
-    } else {
-      logger.debug("descaleImage: image size is ok, not scaling image");
-      try {
-        scaledImage = new ImageFile(sourceImage.file);
-      }
-      catch (IOException e) {
-        throw new MediaExc(e.toString());
-      }
+    }
+    logger.debug("descaleImage: image size is ok, not scaling image");
+    try {
+      scaledImage = new ImageFile(sourceImage.file);
+    }
+    catch (IOException e) {
+      throw new MediaExc(e.toString());
     }
   }