You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2016/10/09 11:42:01 UTC

svn commit: r1763961 - in /commons/proper/imaging/trunk/src: changes/changes.xml main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java

Author: sebb
Date: Sun Oct  9 11:42:01 2016
New Revision: 1763961

URL: http://svn.apache.org/viewvc?rev=1763961&view=rev
Log:
IMAGING-189 - parseXpmValuesSection uses && instead of ||

Modified:
    commons/proper/imaging/trunk/src/changes/changes.xml
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java

Modified: commons/proper/imaging/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/changes/changes.xml?rev=1763961&r1=1763960&r2=1763961&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/changes/changes.xml (original)
+++ commons/proper/imaging/trunk/src/changes/changes.xml Sun Oct  9 11:42:01 2016
@@ -46,6 +46,9 @@ The <action> type attribute can be add,u
   <body>
 
     <release version="1.0" date="TBA" description="First major release">
+      <action issue="IMAGING-189" dev="sebb" type="fix">
+        parseXpmValuesSection uses &amp;&amp; instead of ||
+      </action>
       <action issue="IMAGING-181" dev="damjan" type="fix">
         EXIF lens metadata tags missing in Commons Imaging but recognized in exiftool
       </action>

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java?rev=1763961&r1=1763960&r2=1763961&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java Sun Oct  9 11:42:01 2016
@@ -287,7 +287,7 @@ public class XpmImageParser extends Imag
     private XpmHeader parseXpmValuesSection(final String row)
             throws ImageReadException {
         final String[] tokens = BasicCParser.tokenizeRow(row);
-        if (tokens.length < 4 && tokens.length > 7) {
+        if (tokens.length < 4 || tokens.length > 7) {
             throw new ImageReadException("Parsing XPM file failed, "
                     + "<Values> section has incorrect tokens");
         }