commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1389200 - in /commons/proper/imaging/trunk: pom.xml src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java
Date Mon, 24 Sep 2012 04:00:57 GMT
Author: damjan
Date: Mon Sep 24 04:00:56 2012
New Revision: 1389200

URL: http://svn.apache.org/viewvc?rev=1389200&view=rev
Log:
Update to commons-parent 26.
Fix false-positive "dead local stores" according to Findbugs.


Modified:
    commons/proper/imaging/trunk/pom.xml
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java

Modified: commons/proper/imaging/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/pom.xml?rev=1389200&r1=1389199&r2=1389200&view=diff
==============================================================================
--- commons/proper/imaging/trunk/pom.xml (original)
+++ commons/proper/imaging/trunk/pom.xml Mon Sep 24 04:00:56 2012
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-parent</artifactId>
-    <version>25</version>
+    <version>26</version>
   </parent>
 
   <groupId>org.apache.commons</groupId>
@@ -129,11 +129,6 @@
 
     <pluginManagement>
       <plugins>
-        <!-- Temporary workaround for MASSEMBLY-553 until commons-parent 26 is released-->
-        <plugin>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.2-beta-5</version>
-        </plugin>
         <!-- This plugin's configuration is used to store Eclipse m2e settings only. It
has no influence on the Maven build itself.-->
         <plugin>
           <groupId>org.eclipse.m2e</groupId>

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java?rev=1389200&r1=1389199&r2=1389200&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java
(original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java
Mon Sep 24 04:00:56 2012
@@ -352,9 +352,10 @@ public class PaletteFactory {
         ColorSpaceSubset all = new ColorSpaceSubset(width * height, precision);
         subsets.add(all);
 
-        int pre_total = getFrequencyTotal(table, all.mins, all.maxs, precision);
-        if (debug)
+        if (debug) {
+            int pre_total = getFrequencyTotal(table, all.mins, all.maxs, precision);
             System.out.println("pre total: " + pre_total);
+        }
 
         { // step 1: count frequency of colors
 
@@ -368,10 +369,9 @@ public class PaletteFactory {
                 }
         }
 
-        int all_total = getFrequencyTotal(table, all.mins, all.maxs, precision);
         if (debug) {
+            int all_total = getFrequencyTotal(table, all.mins, all.maxs, precision);
             System.out.println("all total: " + all_total);
-
             System.out.println("width * height: " + (width * height));
         }
 



Mime
View raw message