Sync in changes from darktable. Closes #123. Fixes #152, #153, #155

RawSpeed/CameraMetaData.cpp

@@ -39,7 +39,8 @@ CameraMetaData::CameraMetaData(const char *docname) {
 
   for (xml_node camera = cameras.child("Camera"); camera; camera = camera.next_sibling("Camera")) {
     Camera *cam = new Camera(camera);
-    addCamera(cam);
+
+    if(!addCamera(cam)) continue;
 
     // Create cameras for aliases.
     for (uint32 i = 0; i < cam->aliases.size(); i++) {
@@ -79,13 +80,13 @@ bool CameraMetaData::hasChdkCamera(uint32 filesize) {
   return chdkCameras.end() != chdkCameras.find(filesize);
 }
 
-void CameraMetaData::addCamera( Camera* cam )
+bool CameraMetaData::addCamera( Camera* cam )
 {
   string id = string(cam->make).append(cam->model).append(cam->mode);
   if (cameras.end() != cameras.find(id)) {
     writeLog(DEBUG_PRIO_WARNING, "CameraMetaData: Duplicate entry found for camera: %s %s, Skipping!\n", cam->make.c_str(), cam->model.c_str());
     delete(cam);
-    return;
+    return false;
   } else {
     cameras[id] = cam;
   }
@@ -100,6 +101,7 @@ void CameraMetaData::addCamera( Camera* cam )
       // writeLog(DEBUG_PRIO_WARNING, "CHDK camera: %s %s size:%u\n", cam->make.c_str(), cam->model.c_str(), size);
     }
   }
+  return true;
 }
 
 void CameraMetaData::disableMake( string make )

RawSpeed/CameraMetaData.h

@@ -43,7 +43,7 @@ class CameraMetaData
   void disableMake(string make);
   void disableCamera(string make, string model);
 protected:
-  void addCamera(Camera* cam);
+  bool addCamera(Camera* cam);
 };
 
 } // namespace RawSpeed

RawSpeed/NefDecoder.cpp

@@ -372,10 +372,7 @@ void NefDecoder::checkSupportInternal(CameraMetaData *meta) {
 
   if (meta->hasCamera(make, model, extended_mode))
     this->checkCameraSupported(meta, make, model, extended_mode);
-  else if (meta->hasCamera(make, model, mode))
-    this->checkCameraSupported(meta, make, model, mode);
-  else
-    this->checkCameraSupported(meta, make, model, "");
+  else this->checkCameraSupported(meta, make, model, mode);
 }
 
 string NefDecoder::getMode() {

RawSpeed/OrfDecoder.cpp

@@ -125,7 +125,7 @@ void OrfDecoder::decodeCompressed(ByteStream& s, uint32 w, uint32 h) {
     for (high = 0; high < 12; high++)
       if ((b>>(11-high))&1)
         break;
-      bittable[i] = min(12,high);
+    bittable[i] = min(12,high);
   }
   left0 = nw0 = left1 = nw1 = 0;
 

RawSpeed/RafDecoder.cpp

@@ -215,6 +215,17 @@ void RafDecoder::decodeMetaDataInternal(CameraMetaData *meta) {
 
   const CameraSensorInfo *sensor = cam->getSensorInfo(iso);
   mRaw->blackLevel = sensor->mBlackLevel;
+
+  // at least the (bayer sensor) X100 comes with a tag like this:
+  if (mRootIFD->hasEntryRecursive(FUJI_RGGBLEVELSBLACK))
+  {
+    TiffEntry *sep_black = mRootIFD->getEntryRecursive(FUJI_RGGBLEVELSBLACK);
+    if (sep_black->count == 4)
+    {
+      for(int k=0;k<4;k++)
+        mRaw->blackLevelSeparate[k] = sep_black->getInt(k);
+    }
+  }
   mRaw->whitePoint = sensor->mWhiteLevel;
   mRaw->blackAreas = cam->blackAreas;
   mRaw->cfa = cam->cfa;

RawSpeed/TiffEntry.cpp

@@ -85,7 +85,7 @@ TiffEntry::TiffEntry(TiffTag _tag, TiffDataType _type, uint32 _count, const ucha
   type = _type;
   count = _count;
   data_offset = -1; // Set nonsense value in case someone tries to use it
-  bytesize = _count << datashifts[_type];
+  bytesize = (size_t)_count << (size_t)datashifts[_type];
   if (NULL == _data) {
     own_data = new uchar8[bytesize];
     memset(own_data,0,bytesize);

RawSpeed/TiffTag.h

@@ -201,6 +201,7 @@ typedef enum {
   INTEROPERABILITYIFDPOINTER = 0xA005,
   SAMSUNG_WB_RGGBLEVELSUNCORRECTED = 0xa021,
   SAMSUNG_WB_RGGBLEVELSBLACK = 0xa028,
+  FUJI_RGGBLEVELSBLACK = 0xf00a,
   FLASHENERGY   = 0xA20B,
   SPATIALFREQUENCYRESPONSE = 0xA20C,
   FOCALPLANEXRESOLUTION         = 0xA20E,