Return-Path: 
 <commits-return-2070-apmail-pdfbox-commits-archive=pdfbox.apache.org@pdfbox.apache.org>
X-Original-To: apmail-pdfbox-commits-archive@www.apache.org
Delivered-To: apmail-pdfbox-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 3E7231085C
	for <apmail-pdfbox-commits-archive@www.apache.org>;
 Fri, 20 Dec 2013 09:18:21 +0000 (UTC)
Received: (qmail 21857 invoked by uid 500); 20 Dec 2013 09:18:21 -0000
Delivered-To: apmail-pdfbox-commits-archive@pdfbox.apache.org
Received: (qmail 21811 invoked by uid 500); 20 Dec 2013 09:18:20 -0000
Mailing-List: contact commits-help@pdfbox.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@pdfbox.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@pdfbox.apache.org>
List-Post: <mailto:commits@pdfbox.apache.org>
List-Id: <commits.pdfbox.apache.org>
Reply-To: dev@pdfbox.apache.org
Delivered-To: mailing list commits@pdfbox.apache.org
Received: (qmail 21804 invoked by uid 99); 20 Dec 2013 09:18:20 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Dec 2013 09:18:20 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Dec 2013 09:18:19 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id AEC8B2388980;
	Fri, 20 Dec 2013 09:17:59 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1552553 - in /pdfbox/branches/1.8: ./
 pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceGray.java
Date: Fri, 20 Dec 2013 09:17:59 -0000
To: commits@pdfbox.apache.org
From: lehmi@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20131220091759.AEC8B2388980@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: lehmi
Date: Fri Dec 20 09:17:59 2013
New Revision: 1552553

URL: http://svn.apache.org/r1552553
Log:
PDFBOX-1810: fixed the handling of bitsPerComponent when creating a color model for DeviceGray based on a proposal by Tilman Hausherr

Modified:
    pdfbox/branches/1.8/   (props changed)
    pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceGray.java

Propchange: pdfbox/branches/1.8/
------------------------------------------------------------------------------
  Merged /pdfbox/trunk:r1552552

Modified: pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceGray.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceGray.java?rev=1552553&r1=1552552&r2=1552553&view=diff
==============================================================================
--- pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceGray.java (original)
+++ pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceGray.java Fri Dec 20 09:17:59 2013
@@ -17,19 +17,18 @@
 package org.apache.pdfbox.pdmodel.graphics.color;
 
 import java.awt.color.ColorSpace;
-
 import java.awt.image.ColorModel;
 import java.awt.image.ComponentColorModel;
 import java.awt.image.DataBuffer;
+import java.awt.image.IndexColorModel;
 import java.awt.Transparency;
-
 import java.io.IOException;
 
 /**
  * This class represents a Gray color space.
  *
  * @author <a href="mailto:ben@benlitchfield.com">Ben Litchfield</a>
- * @version $Revision: 1.6 $
+ * 
  */
 public class PDDeviceGray extends PDColorSpace
 {
@@ -86,11 +85,24 @@ public class PDDeviceGray extends PDColo
      */
     public ColorModel createColorModel( int bpc ) throws IOException
     {
-        ColorSpace cs = ColorSpace.getInstance(ColorSpace.CS_GRAY);
-        int[] nBits = {bpc};
-        ColorModel colorModel = new ComponentColorModel(cs, nBits, false,false,
-                Transparency.OPAQUE,DataBuffer.TYPE_BYTE);
+    	ColorModel colorModel = null;
+    	if (bpc == 8)
+    	{
+    		ColorSpace cs = ColorSpace.getInstance(ColorSpace.CS_GRAY);
+            int[] nBits = {bpc};
+            colorModel = new ComponentColorModel(cs, nBits, false, false, Transparency.OPAQUE,DataBuffer.TYPE_BYTE);
+    	}
+    	else
+    	{
+        	int numEntries = 1 << bpc;
+            // calculate all possible values
+            byte[] indexedValues = new byte[numEntries];
+            for (int i = 0; i < numEntries; i++) 
+            {
+            	indexedValues[i] = (byte)(i*255/(numEntries - 1));
+            }
+            colorModel = new IndexColorModel(bpc, numEntries, indexedValues, indexedValues, indexedValues);
+    	}
         return colorModel;
-
     }
 }