rawspeed: update upstream + cytrinox' cr3 branch

LucaZulberti · Nov 27, 2022 · 12f559f · 12f559f
1 parent ca8634e
commit 12f559f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "ext/rawspeed"]
 	path = ext/rawspeed
-	url = https://github.com/darktable-org/rawspeed.git
+	url = https://github.com/hanatos/rawspeed.git
 [submodule "ext/imgui"]
 	path = ext/imgui
 	url = https://github.com/hanatos/imgui.git
diff --git a/ext/rawspeed b/ext/rawspeed
diff --git a/src/pipe/modules/i-raw/main.cc b/src/pipe/modules/i-raw/main.cc
@@ -319,7 +319,7 @@ void modify_roi_out(
     if(mod_data->d->mRaw->metadata.colorMatrix.size() > 0)
     { // get d65 camera matrix from rawspeed
       for(int k=0;k<9;k++)
-        xyz_to_cam[k] = mod_data->d->mRaw->metadata.colorMatrix[k] / 10000.0f;
+        xyz_to_cam[k] = float(mod_data->d->mRaw->metadata.colorMatrix[k]);
       mat3inv(mat, xyz_to_cam);
     }
     else mat[0] = mat[4] = mat[8] = 1.0;
@@ -463,13 +463,17 @@ int read_source(
   const size_t bufsize_rawspeed = (size_t)mod_data->d->mRaw->pitch * dim_uncropped.y;
   if(bufsize_compact == bufsize_rawspeed)
   {
-    memcpy(buf, mod_data->d->mRaw->getDataUncropped(0, 0), bufsize_compact);
+    memcpy(buf,
+        &(mod_data->d->mRaw->getU16DataAsUncroppedArray2DRef()(0,0)),
+        bufsize_compact);
     return 0;
   }
   else
   {
     for(int j=0;j<ht;j++)
-      memcpy(buf + j*wd, mod_data->d->mRaw->getDataUncropped(ox, j+oy), sizeof(uint16_t)*wd);
+      memcpy(buf + j*wd,
+          &(mod_data->d->mRaw->getU16DataAsUncroppedArray2DRef()(ox, j+oy)),
+          sizeof(uint16_t)*wd);
     return 0;
   }
 }