You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by ds...@apache.org on 2012/08/31 15:22:26 UTC
svn commit: r1379444 - in
/incubator/clerezza/issues/CLEREZZA-716/utils.imagemagick: ./
src/main/java/org/apache/clerezza/utils/imagemagick/ImageMagickProvider.java
Author: dspicar
Date: Fri Aug 31 13:22:25 2012
New Revision: 1379444
URL: http://svn.apache.org/viewvc?rev=1379444&view=rev
Log:
CLEREZZA-716: changed use of ImageIO.read to use of image reader service.
Added:
incubator/clerezza/issues/CLEREZZA-716/utils.imagemagick/
- copied from r1377741, incubator/clerezza/trunk/utils.imagemagick/
Modified:
incubator/clerezza/issues/CLEREZZA-716/utils.imagemagick/src/main/java/org/apache/clerezza/utils/imagemagick/ImageMagickProvider.java
Modified: incubator/clerezza/issues/CLEREZZA-716/utils.imagemagick/src/main/java/org/apache/clerezza/utils/imagemagick/ImageMagickProvider.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-716/utils.imagemagick/src/main/java/org/apache/clerezza/utils/imagemagick/ImageMagickProvider.java?rev=1379444&r1=1377741&r2=1379444&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-716/utils.imagemagick/src/main/java/org/apache/clerezza/utils/imagemagick/ImageMagickProvider.java (original)
+++ incubator/clerezza/issues/CLEREZZA-716/utils.imagemagick/src/main/java/org/apache/clerezza/utils/imagemagick/ImageMagickProvider.java Fri Aug 31 13:22:25 2012
@@ -45,6 +45,7 @@ import org.apache.clerezza.rdf.core.Trip
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.clerezza.utils.imageprocessing.ImageProcessor;
+import org.apache.clerezza.utils.imageprocessing.ImageReaderService;
import org.apache.clerezza.utils.imageprocessing.metadataprocessing.ExifTagDataSet;
import org.apache.clerezza.utils.imageprocessing.metadataprocessing.IptcDataSet;
import org.apache.clerezza.utils.imageprocessing.metadataprocessing.MetaData;
@@ -94,6 +95,9 @@ public class ImageMagickProvider extends
@Reference
private Serializer serializer;
+
+ @Reference
+ private ImageReaderService imageReaderService;
private final Logger logger = LoggerFactory.getLogger(getClass());
@@ -564,8 +568,8 @@ public class ImageMagickProvider extends
return null;
}
- return ImageIO.read(execCommand(command, baos.toByteArray()).
- getInputStream());
+ return imageReaderService.getImageReader().getBufferedImage(
+ execCommand(command, baos.toByteArray()).getInputStream());
} catch (InterruptedException ex) {
logger.warn("ImageMagick has been interrupted");