From a3e9b996383dd9c9cd9f8007bbeaaaaf19f30f05 Mon Sep 17 00:00:00 2001 From: Matt Tucker Date: Thu, 10 May 2007 22:55:21 +0000 Subject: [PATCH] Fixing dependencies. git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@8276 b35dd754-fafc-0310-a699-88a17e54d16e --- build/projects/Smack.iml | 4 +- .../extension/build/merge/javapng-2.0-rc6.jar | Bin 29128 -> 0 bytes .../build/projects/JingleExtension.iml | 46 ++++++++++++++---- .../mediaimpl/sshare/api/DefaultDecoder.java | 21 ++------ .../mediaimpl/sshare/api/ImageDecoder.java | 4 +- 5 files changed, 45 insertions(+), 30 deletions(-) delete mode 100644 jingle/extension/build/merge/javapng-2.0-rc6.jar diff --git a/build/projects/Smack.iml b/build/projects/Smack.iml index 41776e4f0..ed746d8a8 100644 --- a/build/projects/Smack.iml +++ b/build/projects/Smack.iml @@ -47,9 +47,7 @@ - - - + diff --git a/jingle/extension/build/merge/javapng-2.0-rc6.jar b/jingle/extension/build/merge/javapng-2.0-rc6.jar deleted file mode 100644 index f622b37c9d15ffcf633dd148cb48b099c2bdb295..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29128 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 F{|7 - - - - - - - - - @@ -41,7 +32,42 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java index 517e9cfa4..421f2278e 100644 --- a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java +++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java @@ -1,27 +1,16 @@ package org.jivesoftware.smackx.jingle.mediaimpl.sshare.api; -import com.sixlegs.png.PngImage; - +import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.IOException; /** - * Implements a default PNG Decoder + * Implements a default PNG decoder. */ -public class DefaultDecoder implements ImageDecoder{ +public class DefaultDecoder implements ImageDecoder { - PngImage decoder = new PngImage(); - - public BufferedImage decode(ByteArrayInputStream stream) { - BufferedImage image = null; - try { - image = decoder.read(stream,true); - } - catch (IOException e) { - e.printStackTrace(); - // Do nothing - } - return image; + public BufferedImage decode(ByteArrayInputStream stream) throws IOException { + return ImageIO.read(stream); } } diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java index 1d71c02e4..6181d1346 100644 --- a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java +++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java @@ -2,6 +2,7 @@ package org.jivesoftware.smackx.jingle.mediaimpl.sshare.api; import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; +import java.io.IOException; /** * Image Decoder Interface use this interface if you want to change the default decoder @@ -9,5 +10,6 @@ import java.io.ByteArrayInputStream; * @author Thiago Rocha Camargo */ public interface ImageDecoder { - public BufferedImage decode(ByteArrayInputStream stream); + + public BufferedImage decode(ByteArrayInputStream stream) throws IOException; }