[Openutils-svn] SF.net SVN: openutils:[3276] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java

[<fg...@us...>]

Revision: 3276
          http://openutils.svn.sourceforge.net/openutils/?rev=3276&view=rev
Author:   fgiust
Date:     2011-01-23 19:59:23 +0000 (Sun, 23 Jan 2011)

Log Message:
-----------
added back support for ico files, lost in recent commits :/

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java	2011-01-23 19:50:05 UTC (rev 3275)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java	2011-01-23 19:59:23 UTC (rev 3276)
@@ -96,7 +96,7 @@
      */
     public static String RESOLUTION_PROPERTY = "resolution";
 
-    private static final String[] extensions = new String[]{"jpg", "gif", "png" };
+    private static final String[] extensions = new String[]{"jpg", "jpeg", "gif", "png" };
 
     static
     {
@@ -960,8 +960,21 @@
     public static BufferedImage createBufferedImage(NodeData image)
     {
         InputStream is = image.getStream();
+
+        String ext = image.getAttribute(FileProperties.EXTENSION);
+
         try
         {
+
+            if (StringUtils.equalsIgnoreCase(ext, "ico") || StringUtils.equalsIgnoreCase(ext, "bmp"))
+            {
+                BufferedImage buffered = IcoUtils.createBufferedImage(image);
+                if (buffered != null)
+                {
+                    return buffered;
+                }
+            }
+
             BufferedImage result = ImageIO.read(is);
 
             // yes, ImageIO can return null without throwing any exception
@@ -971,6 +984,7 @@
             }
 
             return result;
+
         }
         catch (IOException e)
         {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.