You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jb...@apache.org on 2006/03/02 16:44:39 UTC
svn commit: r382416 -
/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/reading/ImageReader.java
Author: jbq
Date: Thu Mar 2 07:44:38 2006
New Revision: 382416
URL: http://svn.apache.org/viewcvs?rev=382416&view=rev
Log:
Reindent and sync with trunk
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/reading/ImageReader.java
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/reading/ImageReader.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/reading/ImageReader.java?rev=382416&r1=382415&r2=382416&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/reading/ImageReader.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/reading/ImageReader.java Thu Mar 2 07:44:38 2006
@@ -91,10 +91,6 @@
* </dd>
* </dl>
*
- * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @author <a href="mailto:stephan@apache.org">Stephan Michels</a>
- * @author <a href="mailto:tcurdt@apache.org">Torsten Curdt</a>
- * @author <a href="mailto:eric@plauditdesign.com">Eric Caron</a>
* @version $Id$
*/
final public class ImageReader extends ResourceReader {
@@ -248,19 +244,18 @@
}
protected byte[] readFully(InputStream in) throws IOException
- {
- byte tmpbuffer[] = new byte[4096];
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- int i;
- while (-1!=(i = in.read(tmpbuffer)))
- {
- baos.write(tmpbuffer, 0, i);
- }
- baos.flush();
- return baos.toByteArray();
- }
+ {
+ byte tmpbuffer[] = new byte[4096];
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ int i;
+ while (-1!=(i = in.read(tmpbuffer)))
+ {
+ baos.write(tmpbuffer, 0, i);
+ }
+ baos.flush();
+ return baos.toByteArray();
+ }
-
protected void processStream(InputStream inputStream) throws IOException, ProcessingException {
if (hasTransform()) {
if (getLogger().isDebugEnabled()) {
@@ -292,9 +287,9 @@
*/
try {
- byte content[] = readFully(inputStream);
- ImageIcon icon = new ImageIcon(content);
- BufferedImage original = new BufferedImage(icon.getIconWidth(), icon.getIconHeight(), BufferedImage.TYPE_INT_RGB);
+ byte content[] = readFully(inputStream);
+ ImageIcon icon = new ImageIcon(content);
+ BufferedImage original = new BufferedImage(icon.getIconWidth(), icon.getIconHeight(), BufferedImage.TYPE_INT_RGB);
BufferedImage currentImage = original;
currentImage.getGraphics().drawImage(icon.getImage(), 0, 0, null);