Author: post
Date: 2009-08-04 20:49:07 +0200 (Tue, 04 Aug 2009)
New Revision: 94
Modified:
RawSpeed/Cr2Decoder.cpp
cameras.xml
Log:
- Added sRaw support to camera xml, added 5D Mk2 settings.
Modified: RawSpeed/Cr2Decoder.cpp
===================================================================
--- RawSpeed/Cr2Decoder.cpp 2009-08-04 18:38:31 UTC (rev 93)
+++ RawSpeed/Cr2Decoder.cpp 2009-08-04 18:49:07 UTC (rev 94)
@@ -135,6 +135,12 @@
string make = data[0]->getEntry(MAKE)->getString();
string model = data[0]->getEntry(MODEL)->getString();
+ if (mRaw->subsampling.y == 2 && mRaw->subsampling.x == 2)
+ model += "-sRaw1";
+
+ if (mRaw->subsampling.y == 1 && mRaw->subsampling.x == 2)
+ model += "-sRaw2";
+
setMetaData(meta, make, model,"");
}
Modified: cameras.xml
===================================================================
--- cameras.xml 2009-08-04 18:38:31 UTC (rev 93)
+++ cameras.xml 2009-08-04 18:49:07 UTC (rev 94)
@@ -93,6 +93,14 @@
<Crop x="158" y="51" width="5634" height="3753"/>
<Sensor black="1024" white="15600"/>
</Camera>
+ <Camera make="Canon" model="Canon EOS 5D Mark II-sRaw1">
+ <Crop x="0" y="0" width="3872" height="2574"/>
+ <Sensor black="0" white="15600"/>
+ </Camera>
+ <Camera make="Canon" model="Canon EOS 5D Mark II-sRaw2">
+ <Crop x="0" y="0" width="2808" height="1872"/>
+ <Sensor black="0" white="15600"/>
+ </Camera>
<Camera make="Canon" model="Canon EOS DIGITAL REBEL XS">
<CFA width="2" height="2">
<Color x="0" y="0">RED</Color>
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
