[MMBASE SCM] r40914 - mmbase/trunk/applications/resources/src/main/java/org/mmbase/util/images

[michiel]

Author: michiel
Date: 2010-02-08 18:45:14 +0100 (Mon, 08 Feb 2010)
New Revision: 40914

Modified:
   
mmbase/trunk/applications/resources/src/main/java/org/mmbase/util/images/ImageMagickImageConverter.java
Log:
  MMB-1906

Modified: 
mmbase/trunk/applications/resources/src/main/java/org/mmbase/util/images/ImageMagickImageConverter.java
===================================================================
--- 
mmbase/trunk/applications/resources/src/main/java/org/mmbase/util/images/ImageMagickImageConverter.java
     2010-02-08 17:43:37 UTC (rev 40913)
+++ 
mmbase/trunk/applications/resources/src/main/java/org/mmbase/util/images/ImageMagickImageConverter.java
     2010-02-08 17:45:14 UTC (rev 40914)
@@ -219,11 +219,11 @@
             String imOutput = getOutput("-version").toString();
             Matcher m = IM_VERSION_PATTERN.matcher(imOutput);
             if (m.matches()) {
-                String program = m.group(1);
+                String p = m.group(1);
                 imVersionMajor = Integer.parseInt(m.group(2));
                 imVersionMinor = Integer.parseInt(m.group(3));
                 imVersionPatch = Integer.parseInt(m.group(4));
-                if (program.indexOf("GraphicsMagick") >= 0) {
+                if (p.indexOf("GraphicsMagick") >= 0) {
                     log.service("Found GraphicsMagick version " + 
imVersionMajor + "." + imVersionMinor + "." + imVersionPatch);
                     imVersionMajor += 5; // I have no freaking idea
                     log.service("Supposing that that is equivalent to 
ImageMagick version " + imVersionMajor + "." + imVersionMinor + "." + 
imVersionPatch);

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs