svn commit: r995630 - in /commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats: ico/IcoImageParser.java png/chunks/PNGChunkgAMA.java tiff/photometricinterpreters/PhotometricInterpreterLogLUV.java

[sebb]

Author: sebb
Date: Fri Sep 10 01:18:21 2010
New Revision: 995630

URL: http://svn.apache.org/viewvc?rev=995630&view=rev
Log:
Fix various Eclipse warnings

Modified:
    
commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/ico/IcoImageParser.java
    
commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/chunks/PNGChunkgAMA.java
    
commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLUV.java

Modified: 
commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/ico/IcoImageParser.java
URL: 
http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/ico/IcoImageParser.java?rev=995630&r1=995629&r2=995630&view=diff
==============================================================================
--- 
commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/ico/IcoImageParser.java
 (original)
+++ 
commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/ico/IcoImageParser.java
 Fri Sep 10 01:18:21 2010
@@ -510,7 +510,9 @@ public class IcoImageParser extends Imag
                {
                        try
                        {
-                               is.close();
+                           if (is != null) {
+                               is.close();
+                           }
                        }
                        catch (Exception e)
                        {

Modified: 
commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/chunks/PNGChunkgAMA.java
URL: 
http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/chunks/PNGChunkgAMA.java?rev=995630&r1=995629&r2=995630&view=diff
==============================================================================
--- 
commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/chunks/PNGChunkgAMA.java
 (original)
+++ 
commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/chunks/PNGChunkgAMA.java
 Fri Sep 10 01:18:21 2010
@@ -36,7 +36,7 @@ public class PNGChunkgAMA extends PNGChu
 
        public double getGamma()
        {
-               return 1.0 / ((double) Gamma / 100000.0);
+               return 1.0 / (Gamma / 100000.0);
        }
 
 }
\ No newline at end of file

Modified: 
commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLUV.java
URL: 
http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLUV.java?rev=995630&r1=995629&r2=995630&view=diff
==============================================================================
--- 
commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLUV.java
 (original)
+++ 
commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLUV.java
 Fri Sep 10 01:18:21 2010
@@ -56,7 +56,7 @@ public class PhotometricInterpreterLogLU
 
                {
 
-                       float var_Y = (((float) cieL * 100.0f / 255.0f) + 
16.0f) / 116.0f;
+                       float var_Y = ((cieL * 100.0f / 255.0f) + 16.0f) / 
116.0f;
                        float var_X = cieA / 500.0f + var_Y;
                        float var_Z = var_Y - cieB / 200.0f;