Adding a new ImageMagickImageProcessor class to replace

[mir.git] / source / mircoders / media / MediaHandlerImagesExtern.java

diff --git a/source/mircoders/media/MediaHandlerImagesExtern.java b/source/mircoders/media/MediaHandlerImagesExtern.java
index 2e001c7..d12f111 100755 (executable)
--- a/source/mircoders/media/MediaHandlerImagesExtern.java
+++ b/source/mircoders/media/MediaHandlerImagesExtern.java
@@ -40,7 +40,9 @@ import mir.log.LoggerWrapper;
 import mir.media.MediaExc;
 import mir.media.MediaFailure;
 import mir.media.image.ImageProcessor;
-import mir.media.image.JAIImageProcessor;
+// FIXME: delete this when finished testing ImageMagickImageProcessor
+//import mir.media.image.JAIImageProcessor;
+import mir.media.image.ImageMagickImageProcessor;
 import mir.misc.StringUtil;
 
 
@@ -84,7 +86,9 @@ public class MediaHandlerImagesExtern extends MediaHandlerGeneric
         throw new MediaExc("error in MediaHandlerImagesExtern.produce(): " + filePath + " does not exist!");
       }
       else {
-        ImageProcessor processor = new JAIImageProcessor(imageFile);
+        // FIXME: delete this when finished testing ImageMagickImageProcessor
+        //        ImageProcessor processor = new JAIImageProcessor(imageFile);
+        ImageProcessor processor = new ImageMagickImageProcessor(imageFile);
 
         processor.descaleImage(maxIconSize, minDescaleRatio, minDescaleReduction);
         File dir = new File(iconFile.getParent());
@@ -99,6 +103,7 @@ public class MediaHandlerImagesExtern extends MediaHandlerGeneric
         anImageEntity.setFieldValue("icon_height", new Integer(processor.getScaledHeight()).toString());
         anImageEntity.setFieldValue("icon_width", new Integer(processor.getScaledWidth()).toString());
 
+        processor.cleanup();
         anImageEntity.setFieldValue("icon_path", iconPath);
         anImageEntity.setFieldValue("publish_path", filePath);