Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 87901 invoked from network); 16 Aug 2010 22:34:11 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 16 Aug 2010 22:34:11 -0000 Received: (qmail 82949 invoked by uid 500); 16 Aug 2010 22:34:10 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 82902 invoked by uid 500); 16 Aug 2010 22:34:10 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 82895 invoked by uid 99); 16 Aug 2010 22:34:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Aug 2010 22:34:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 16 Aug 2010 22:34:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2002423889F7; Mon, 16 Aug 2010 22:32:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r986147 - /harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/java/javax/imageio/stream/ImageInputStreamImpl.java Date: Mon, 16 Aug 2010 22:32:50 -0000 To: commits@harmony.apache.org From: hindessm@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100816223250.2002423889F7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hindessm Date: Mon Aug 16 22:32:49 2010 New Revision: 986147 URL: http://svn.apache.org/viewvc?rev=986147&view=rev Log: Applying patch from "[#HARMONY-6610] reset bitOffset in the ImageInputStreamImpl.reset()". Modified: harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/java/javax/imageio/stream/ImageInputStreamImpl.java Modified: harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/java/javax/imageio/stream/ImageInputStreamImpl.java URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/java/javax/imageio/stream/ImageInputStreamImpl.java?rev=986147&r1=986146&r2=986147&view=diff ============================================================================== --- harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/java/javax/imageio/stream/ImageInputStreamImpl.java (original) +++ harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/java/javax/imageio/stream/ImageInputStreamImpl.java Mon Aug 16 22:32:49 2010 @@ -35,6 +35,7 @@ public abstract class ImageInputStreamIm private boolean closed = false; private final PositionStack posStack = new PositionStack(); + private final PositionStack offsetStack = new PositionStack(); private final byte[] buff = new byte[8]; public ImageInputStreamImpl() { @@ -360,6 +361,7 @@ public abstract class ImageInputStreamIm public void mark() { try { posStack.push(getStreamPosition()); + offsetStack.push(getBitOffset()); } catch (IOException e) { e.printStackTrace(); throw new RuntimeException(Messages.getString("imageio.11")); @@ -367,14 +369,14 @@ public abstract class ImageInputStreamIm } public void reset() throws IOException { - // -- TODO bit pos - if (!posStack.isEmpty()) { + if (!posStack.isEmpty() && !offsetStack.isEmpty()) { long p = posStack.pop(); if (p < flushedPos) { throw new IOException( Messages.getString("imageio.12")); } seek(p); + setBitOffset((int)offsetStack.pop()); } }