Update of /var/cvs/src/org/mmbase/util/images
In directory james.mmbase.org:/tmp/cvs-serv31562/src/org/mmbase/util/images
Modified Files:
Tag: MMBase-1_8
ImageMagickImageConverter.java
Log Message:
Fix for ImageMagick 5 format detection
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/images
Index: ImageMagickImageConverter.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/util/images/Attic/ImageMagickImageConverter.java,v
retrieving revision 1.4.2.6
retrieving revision 1.4.2.7
diff -u -b -r1.4.2.6 -r1.4.2.7
--- ImageMagickImageConverter.java 29 Sep 2008 16:02:39 -0000 1.4.2.6
+++ ImageMagickImageConverter.java 16 Mar 2009 15:48:02 -0000 1.4.2.7
@@ -27,13 +27,13 @@
* @author Michiel Meeuwissen
* @author Nico Klasens
* @author Jaco de Groot
- * @version $Id: ImageMagickImageConverter.java,v 1.4.2.6 2008/09/29 16:02:39
michiel Exp $
+ * @version $Id: ImageMagickImageConverter.java,v 1.4.2.7 2009/03/16 15:48:02
rico Exp $
*/
public class ImageMagickImageConverter implements ImageConverter {
private static final Logger log =
Logging.getLoggerInstance(ImageMagickImageConverter.class);
private static final Pattern IM_VERSION_PATTERN =
Pattern.compile("(?is).*?\\s(\\d+)\\.(\\d+)\\.(\\d+)\\s.*");
- private static final Pattern IM_FORMAT_PATTERN =
Pattern.compile("(?is)\\s*([A-Z0-9]+)\\*?\\s+[A-Z0-9]+\\s*[r\\-]w[\\+\\-]\\s+.*");
+ private static final Pattern IM_FORMAT_PATTERN =
Pattern.compile("(?is)\\s*([A-Z0-9]+)\\*?\\s+[A-Z0-9]*\\s*[r\\-]w[\\+\\-]\\s+.*");
private int imVersionMajor = 5;
private int imVersionMinor = 5;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
