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 268E0200B97 for ; Sun, 9 Oct 2016 14:55:02 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2523E160ADA; Sun, 9 Oct 2016 12:55:02 +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 6B312160AC3 for ; Sun, 9 Oct 2016 14:55:01 +0200 (CEST) Received: (qmail 34921 invoked by uid 500); 9 Oct 2016 12:54:56 -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 34912 invoked by uid 99); 9 Oct 2016 12:54:56 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Oct 2016 12:54:56 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id EC300C0221 for ; Sun, 9 Oct 2016 12:56:22 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.999 X-Spam-Level: X-Spam-Status: No, score=-1.999 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id 2oRRNy_pzPIC for ; Sun, 9 Oct 2016 12:56:22 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with ESMTP id 566FD5FB6F for ; Sun, 9 Oct 2016 12:54:55 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 54C6DE00A5 for ; Sun, 9 Oct 2016 12:54:54 +0000 (UTC) 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 00DAB3A0233 for ; Sun, 9 Oct 2016 12:54:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1763968 - /commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkScal.java Date: Sun, 09 Oct 2016 12:54:53 -0000 To: commits@commons.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161009125454.00DAB3A0233@svn01-us-west.apache.org> archived-at: Sun, 09 Oct 2016 12:55:02 -0000 Author: sebb Date: Sun Oct 9 12:54:53 2016 New Revision: 1763968 URL: http://svn.apache.org/viewvc?rev=1763968&view=rev Log: Use same encoding for both x and y axis units Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkScal.java Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkScal.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkScal.java?rev=1763968&r1=1763967&r2=1763968&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkScal.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkScal.java Sun Oct 9 12:54:53 2016 @@ -50,7 +50,7 @@ public class PngChunkScal extends PngChu throw new ImageReadException("PNG sCAL chunk missing the y axis value."); } - final String yStr = new String(bytes, yIndex, length - yIndex); + final String yStr = new String(bytes, yIndex, length - yIndex, "ISO-8859-1"); unitsPerPixelYAxis = toDouble(yStr); }