You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2015/05/11 20:13:41 UTC

svn commit: r1678786 - /commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java

Author: britter
Date: Mon May 11 18:13:41 2015
New Revision: 1678786

URL: http://svn.apache.org/r1678786
Log:
Fix findbugs warning 'Vacuous ior operation on GifImageParser.java:[line 841]' by simplifing expression

Modified:
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java?rev=1678786&r1=1678785&r2=1678786&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java Mon May 11 18:13:41 2015
@@ -831,17 +831,7 @@ public class GifImageParser extends Imag
         final int colorTableSizeInFormat = 1 << (colorTableScaleLessOne + 1);
         {
             final byte colorResolution = (byte) colorTableScaleLessOne; // TODO:
-
-            final boolean globalColorTableFlag = false;
-            final boolean sortFlag = false;
-            final int globalColorTableFlagMask = 1 << 7;
-            final int sortFlagMask = 8;
-            final int sizeOfGlobalColorTable = 0;
-
-            final int packedFields = ((globalColorTableFlag ? globalColorTableFlagMask
-                    : 0)
-                    | (sortFlag ? sortFlagMask : 0)
-                    | ((7 & colorResolution) << 4) | (7 & sizeOfGlobalColorTable));
+            final int packedFields = (7 & colorResolution) * 16;
             bos.write(packedFields); // one byte
         }
         {