Return-Path: X-Original-To: apmail-pdfbox-commits-archive@www.apache.org Delivered-To: apmail-pdfbox-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E1A3811B45 for ; Mon, 9 Jun 2014 15:58:49 +0000 (UTC) Received: (qmail 98700 invoked by uid 500); 9 Jun 2014 15:58:49 -0000 Delivered-To: apmail-pdfbox-commits-archive@pdfbox.apache.org Received: (qmail 98681 invoked by uid 500); 9 Jun 2014 15:58:49 -0000 Mailing-List: contact commits-help@pdfbox.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pdfbox.apache.org Delivered-To: mailing list commits@pdfbox.apache.org Received: (qmail 98674 invoked by uid 99); 9 Jun 2014 15:58:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Jun 2014 15:58:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Jun 2014 15:58:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B55EC2388906; Mon, 9 Jun 2014 15:58:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1601417 - /pdfbox/branches/1.8/fontbox/src/main/java/org/apache/fontbox/ttf/TTFDataStream.java Date: Mon, 09 Jun 2014 15:58:28 -0000 To: commits@pdfbox.apache.org From: tilman@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140609155828.B55EC2388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tilman Date: Mon Jun 9 15:58:28 2014 New Revision: 1601417 URL: http://svn.apache.org/r1601417 Log: PDFBOX-2122: use UTC timezone for readInternationalDate, as suggested by Tim Allison Modified: pdfbox/branches/1.8/fontbox/src/main/java/org/apache/fontbox/ttf/TTFDataStream.java Modified: pdfbox/branches/1.8/fontbox/src/main/java/org/apache/fontbox/ttf/TTFDataStream.java URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/fontbox/src/main/java/org/apache/fontbox/ttf/TTFDataStream.java?rev=1601417&r1=1601416&r2=1601417&view=diff ============================================================================== --- pdfbox/branches/1.8/fontbox/src/main/java/org/apache/fontbox/ttf/TTFDataStream.java (original) +++ pdfbox/branches/1.8/fontbox/src/main/java/org/apache/fontbox/ttf/TTFDataStream.java Mon Jun 9 15:58:28 2014 @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.Calendar; import java.util.GregorianCalendar; +import java.util.TimeZone; /** * An interface into a data stream. @@ -194,7 +195,9 @@ public abstract class TTFDataStream impl public Calendar readInternationalDate() throws IOException { long secondsSince1904 = readLong(); - GregorianCalendar cal = new GregorianCalendar(1904, 0, 1); + Calendar cal = GregorianCalendar.getInstance(TimeZone.getTimeZone("UTC")); + cal.set(1904, 0, 1, 0, 0, 0); + cal.set(Calendar.MILLISECOND, 0); long millisFor1904 = cal.getTimeInMillis(); millisFor1904 += (secondsSince1904 * 1000); cal.setTimeInMillis(millisFor1904);