Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8A407200C0A for ; Sat, 28 Jan 2017 19:41:20 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 88CCE160B51; Sat, 28 Jan 2017 18:41:20 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D3283160B33 for ; Sat, 28 Jan 2017 19:41:19 +0100 (CET) Received: (qmail 88832 invoked by uid 500); 28 Jan 2017 18:41:19 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 88823 invoked by uid 99); 28 Jan 2017 18:41:19 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 28 Jan 2017 18:41:19 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 4BDC73A05B5 for ; Sat, 28 Jan 2017 18:41:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1780731 - /commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java Date: Sat, 28 Jan 2017 18:41:17 -0000 To: commits@commons.apache.org From: damjan@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170128184118.4BDC73A05B5@svn01-us-west.apache.org> archived-at: Sat, 28 Jan 2017 18:41:20 -0000 Author: damjan Date: Sat Jan 28 18:41:17 2017 New Revision: 1780731 URL: http://svn.apache.org/viewvc?rev=1780731&view=rev Log: Match XPM color names case insensitively. 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=1780731&r1=1780730&r2=1780731&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:41:17 2017 @@ -36,6 +36,7 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; +import java.util.Locale; import java.util.Map; import java.util.Map.Entry; import java.util.Properties; @@ -91,7 +92,7 @@ public class XpmImageParser extends Imag final int green = Integer.parseInt(line.substring(4, 7).trim()); final int blue = Integer.parseInt(line.substring(8, 11).trim()); final String colorName = line.substring(11).trim(); - colors.put(colorName, 0xff000000 | (red << 16) + colors.put(colorName.toLowerCase(Locale.ENGLISH), 0xff000000 | (red << 16) | (green << 8) | blue); } catch (final NumberFormatException nfe) { throw new ImageReadException("Couldn't parse color in rgb.txt", nfe); @@ -353,8 +354,9 @@ public class XpmImageParser extends Imag return 0x00000000; } else { loadColorNames(); - if (colorNames.containsKey(color)) { - return colorNames.get(color); + final String colorLowercase = color.toLowerCase(Locale.ENGLISH); + if (colorNames.containsKey(colorLowercase)) { + return colorNames.get(colorLowercase); } return 0x00000000; }