From 3b991e5413ae395b244e2e008769ba6e6a422ec1 Mon Sep 17 00:00:00 2001
From: Glenn Adams <gadams@apache.org>
Date: Fri, 15 Jun 2012 20:41:44 +0000
Subject: [PATCH] Buzilla #40676: Fix newly introduced findbugs warnings.
 Submitted by Luis Bernardo.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1350790 13f79535-47bb-0310-9956-ffa450edef68
---
 findbugs-exclude.xml                          | 37 +++++++++++++++++++
 .../fop/render/pdf/AbstractImageAdapter.java  |  4 +-
 status.xml                                    |  3 ++
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/findbugs-exclude.xml b/findbugs-exclude.xml
index 46879d1f6..9056ff51d 100644
--- a/findbugs-exclude.xml
+++ b/findbugs-exclude.xml
@@ -5162,4 +5162,41 @@
      <Method name="getNonEmptyLevels"/>
      <Bug pattern="PZLA_PREFER_ZERO_LENGTH_ARRAYS"/>
    </Match>
+   <Match>
+     <Class name="org.apache.fop.render.pdf.AbstractImageAdapter"/>
+     <Method name="populateXObjectDictionaryForIndexColorModel"/>
+     <Bug pattern="OS_OPEN_STREAM"/>
+   </Match>
+   <Match>
+     <Class name="org.apache.fop.render.pdf.ImageRawPNGAdapter"/>
+     <Or>
+       <Method name="outputContents"/>
+       <Method name="setup"/>
+     </Or>
+     <Or>
+       <Bug pattern="OS_OPEN_STREAM"/>
+       <Bug pattern="OS_OPEN_STREAM_EXCEPTION_PATH"/>
+     </Or>
+   </Match>
+   <Match>
+     <Class name="org.apache.fop.render.ps.ImageEncoderPNG"/>
+     <Method name="writeTo"/>
+     <Bug pattern="OS_OPEN_STREAM"/>
+   </Match>
+   <Match>
+     <Or>
+       <Class name="org.apache.fop.render.pdf.PDFImageHandlerRawPNG"/>
+       <Class name="org.apache.fop.render.ps.PSImageHandlerRawPNG"/>
+     </Or>
+     <Method name="getSupportedImageFlavors"/>
+     <Bug pattern="EI_EXPOSE_REP"/>
+   </Match>
+   <Match>
+     <Class name="org.apache.fop.render.ps.PSImageHandlerRawPNG"/>
+     <Or>
+       <Method name="handleImage"/>
+       <Method name="generateForm"/>
+     </Or>
+     <Bug pattern="BC_UNCONFIRMED_CAST"/>
+   </Match>
 </FindBugsFilter>
diff --git a/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java b/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
index ce99b9fef..36d58246f 100644
--- a/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
+++ b/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
@@ -226,7 +226,7 @@ public abstract class AbstractImageAdapter implements PDFImage {
         if (hival > MAX_HIVAL) {
             throw new UnsupportedOperationException("hival must not go beyond " + MAX_HIVAL);
         }
-        indexed.add(new Integer(hival));
+        indexed.add(Integer.valueOf(hival));
         int[] palette = new int[c];
         icm.getRGBs(palette);
         ByteArrayOutputStream baout = new ByteArrayOutputStream();
@@ -263,7 +263,7 @@ public abstract class AbstractImageAdapter implements PDFImage {
         icm.getBlues(blues);
         for (int i = 0; i < icm.getMapSize(); i++) {
             if ((alphas[i] & 0xFF) == 0) {
-                return new Integer(i);
+                return Integer.valueOf(i);
             }
         }
         return null;
diff --git a/status.xml b/status.xml
index f96a9487b..7f684f8b1 100644
--- a/status.xml
+++ b/status.xml
@@ -63,6 +63,9 @@
       documents. Example: the fix of marks layering will be such a case when it's done.
     -->
     <release version="FOP Trunk" date="TBD">
+      <action context="Images" dev="GA" type="update" fixes-bug="40676" due-to="Luis Bernardo">
+        Fix newly introduced findbugs warnings.
+      </action>
       <action context="Images" dev="GA" type="fix" fixes-bug="40676" due-to="Luis Bernardo, Matthias Reischenbacher">
         Support use of ImageLoaderRawPNG decoder in order to prevent re-encoding of PNG images (and unnecssary output file bloat).
       </action>
-- 
2.39.5