svn commit: r1763797 - /pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/function/PDFunction.java

[ti...@apache.org]

Author: tilman
Date: Fri Oct  7 16:23:13 2016
New Revision: 1763797

URL: http://svn.apache.org/viewvc?rev=1763797&view=rev
Log:
PDFBOX-2852: Changed to not alter value of argument and make creation of PDFunction clearer by using a switch statement, as suggested by scotty1024 in github PR 6

Modified:
    pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/function/PDFunction.java

Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/function/PDFunction.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/function/PDFunction.java?rev=1763797&r1=1763796&r2=1763797&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/function/PDFunction.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/function/PDFunction.java Fri Oct  7 16:23:13 2016
@@ -118,34 +118,29 @@ public abstract class PDFunction impleme
             return new PDFunctionTypeIdentity(null);
         }
 
-        PDFunction retval = null;
-        if( function instanceof COSObject )
+        COSDictionary functionDictionary;
+        if (function instanceof COSObject)
         {
-            function = ((COSObject)function).getObject();
+            functionDictionary = (COSDictionary) ((COSObject) function).getObject();
         }
-        COSDictionary functionDictionary = (COSDictionary)function;
-        int functionType = functionDictionary.getInt( COSName.FUNCTION_TYPE );
-        if( functionType == 0 )
-        {
-            retval = new PDFunctionType0(functionDictionary);
-        }
-        else if( functionType == 2 )
-        {
-            retval = new PDFunctionType2(functionDictionary);
-        }
-        else if( functionType == 3 )
-        {
-            retval = new PDFunctionType3(functionDictionary);
-        }
-        else if( functionType == 4 )
+        else
         {
-            retval = new PDFunctionType4(functionDictionary);
+            functionDictionary = (COSDictionary) function;
         }
-        else
+        int functionType = functionDictionary.getInt(COSName.FUNCTION_TYPE);
+        switch (functionType)
         {
-            throw new IOException( "Error: Unknown function type " + functionType );
+            case 0:
+                return new PDFunctionType0(functionDictionary);
+            case 2:
+                return new PDFunctionType2(functionDictionary);
+            case 3:
+                return new PDFunctionType3(functionDictionary);
+            case 4:
+                return new PDFunctionType4(functionDictionary);
+            default:
+                throw new IOException("Error: Unknown function type " + functionType);
         }
-        return retval;
     }
 
     /**