Respect samplesperpixel even if this is a CFA image.

Fixes decoding of Fujifilm FinePix X10 DNG, but note that images are delivered with 2 samples per pixel, which will likely need adjustments to work in your application.

Fixes Issue #45.

RawSpeed/DngDecoder.cpp

@@ -169,13 +169,11 @@ RawImage DngDecoder::decodeRawInternal() {
     // Now load the image
     if (compression == 1) {  // Uncompressed.
       try {
-        if (!mRaw->isCFA)
-        {
-          uint32 cpp = raw->getEntry(SAMPLESPERPIXEL)->getInt();
-          if (cpp > 4)
-            ThrowRDE("DNG Decoder: More than 4 samples per pixel is not supported.");
-          mRaw->setCpp(cpp);
-        }
+        uint32 cpp = raw->getEntry(SAMPLESPERPIXEL)->getInt();
+        if (cpp > 4)
+          ThrowRDE("DNG Decoder: More than 4 samples per pixel is not supported.");
+        mRaw->setCpp(cpp);
+
         uint32 nslices = raw->getEntry(STRIPOFFSETS)->count;
         TiffEntry *TEoffsets = raw->getEntry(STRIPOFFSETS);
         TiffEntry *TEcounts = raw->getEntry(STRIPBYTECOUNTS);
@@ -238,9 +236,7 @@ RawImage DngDecoder::decodeRawInternal() {
       try {
         // Let's try loading it as tiles instead
 
-        if (!mRaw->isCFA) {
-          mRaw->setCpp(raw->getEntry(SAMPLESPERPIXEL)->getInt());
-        }
+        mRaw->setCpp(raw->getEntry(SAMPLESPERPIXEL)->getInt());
         mRaw->createData();
 
         if (sample_format != 1)