svn commit: r1436553 - in /pdfbox/trunk: pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceN.java preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java

[leleueri]

Author: leleueri
Date: Mon Jan 21 19:01:54 2013
New Revision: 1436553

URL: http://svn.apache.org/viewvc?rev=1436553&view=rev
Log:
PDFBOX-1497 : if the deviceN array doesn't have Attributes, the getAttributes 
returns null

Modified:
    
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceN.java
    
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceN.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceN.java?rev=1436553&r1=1436552&r2=1436553&view=diff
==============================================================================
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceN.java
 (original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceN.java
 Mon Jan 21 19:01:54 2013
@@ -240,14 +240,8 @@ public class PDDeviceN extends PDColorSp
      */
     public PDDeviceNAttributes getAttributes()
     {
-        if ( deviceNAttributes == null )
-        {
-               if (array.size() > DEVICEN_ATTRIBUTES) { // the DeviceN 
contains an attributes dictionary
+        if ( deviceNAttributes == null  && array.size() > DEVICEN_ATTRIBUTES) 
{ // the DeviceN contains an attributes dictionary
             deviceNAttributes = new 
PDDeviceNAttributes((COSDictionary)array.getObject(DEVICEN_ATTRIBUTES));
-               } else {
-                       // create the Attributes dictionary
-                       setAttributes(new PDDeviceNAttributes());
-               }
         }
         return deviceNAttributes;
     }
@@ -275,15 +269,6 @@ public class PDDeviceN extends PDColorSp
             array.set( DEVICEN_ATTRIBUTES, attributes.getCOSDictionary() );
         }
     }
-
-    /**
-     * Returns true if the DeviceN color space has an attributes dictionary
-     * @return
-     */
-    public boolean  hasAttributes()
-    {
-       return array.size() > DEVICEN_ATTRIBUTES;
-    }
     
     /**
      * Returns the components of the color in the alternate colorspace for the 
given tint value.

Modified: 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java?rev=1436553&r1=1436552&r2=1436553&view=diff
==============================================================================
--- 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java
 (original)
+++ 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java
 Mon Jan 21 19:01:54 2013
@@ -270,8 +270,8 @@ public class StandardColorSpaceHelper im
                        }
 
                        int numberOfColorants = 0;
-                       if ( deviceN.hasAttributes() ) {
-                               PDDeviceNAttributes attr = 
deviceN.getAttributes();
+                       PDDeviceNAttributes attr = deviceN.getAttributes();
+                       if ( attr != null ) {
                                Map colorants = attr.getColorants();
                                if (colorants != null) {
                                        numberOfColorants = colorants.size();