svn commit: r1780730 - /commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java

[damjan]

Author: damjan
Date: Sat Jan 28 18:31:34 2017
New Revision: 1780730

URL: http://svn.apache.org/viewvc?rev=1780730&view=rev
Log:
Allow XPM images to have 192 bit color, just like Apache OpenOffice's XPM
parser does.

Patch by: me

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

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=1780730&r1=1780729&r2=1780730&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
 Sat Jan 28 18:31:34 2017
@@ -338,6 +338,11 @@ public class XpmImageParser extends Imag
                 final int green = Integer.parseInt(color.substring(4, 5), 16);
                 final int blue = Integer.parseInt(color.substring(8, 9), 16);
                 return 0xff000000 | (red << 16) | (green << 8) | blue;
+            } else if (color.length() == 24) {
+                final int red = Integer.parseInt(color.substring(0, 1), 16);
+                final int green = Integer.parseInt(color.substring(8, 9), 16);
+                final int blue = Integer.parseInt(color.substring(16, 17), 16);
+                return 0xff000000 | (red << 16) | (green << 8) | blue;
             } else {
                 return 0x00000000;
             }