Author: post
Date: 2009-09-01 23:14:03 +0200 (Tue, 01 Sep 2009)
New Revision: 138
Modified:
RawSpeed.kdevelop
RawSpeed/Rw2Decoder.cpp
cameras.xml
Log:
Added support for Panasonic FX150, FZ28, FZ38, G1, LX3.
Modified: RawSpeed/Rw2Decoder.cpp
===================================================================
--- RawSpeed/Rw2Decoder.cpp 2009-09-01 20:25:48 UTC (rev 137)
+++ RawSpeed/Rw2Decoder.cpp 2009-09-01 21:14:03 UTC (rev 138)
@@ -136,4 +136,18 @@
void Rw2Decoder::decodeMetaData( CameraMetaData *meta )
{
mRaw->cfa.setCFA(CFA_BLUE, CFA_GREEN, CFA_GREEN2, CFA_RED);
+ vector<TiffIFD*> data = mRootIFD->getIFDsWithTag(MODEL);
+
+ if (data.empty())
+ ThrowRDE("CR2 Meta Decoder: Model name not found");
+
+ string make = data[0]->getEntry(MAKE)->getString();
+ string model = data[0]->getEntry(MODEL)->getString();
+ string mode = "";
+
+ if (!model.compare("DMC-LX3") && (mRaw->dim.x > 4000))
+ mode ="wide";
+
+ setMetaData(meta, make, model, mode);
+
}
\ No newline at end of file
Modified: RawSpeed.kdevelop
===================================================================
--- RawSpeed.kdevelop 2009-09-01 20:25:48 UTC (rev 137)
+++ RawSpeed.kdevelop 2009-09-01 21:14:03 UTC (rev 138)
@@ -10,16 +10,16 @@
<projectname>RawSpeed</projectname>
<projectdirectory>.</projectdirectory>
<absoluteprojectpath>false</absoluteprojectpath>
- <description/>
- <defaultencoding/>
+ <description></description>
+ <defaultencoding></defaultencoding>
<versioncontrol>kdevsubversion</versioncontrol>
</general>
<kdevcustomproject>
<run>
<directoryradio>executable</directoryradio>
<mainprogram>/usr/local/bin/rawstudio</mainprogram>
- <programargs/>
- <globaldebugarguments/>
+ <programargs></programargs>
+ <globaldebugarguments></globaldebugarguments>
<globalcwd>/home/klaus/dev/rawspeed/RawSpeed</globalcwd>
<useglobalprogram>false</useglobalprogram>
<terminal>true</terminal>
@@ -468,9 +468,9 @@
</build>
<other>
<prio>0</prio>
- <otherbin/>
- <defaulttarget/>
- <otheroptions/>
+ <otherbin></otherbin>
+ <defaulttarget></defaulttarget>
+ <otheroptions></otheroptions>
<selectedenvironment>default</selectedenvironment>
<environments>
<default/>
@@ -481,8 +481,8 @@
<numberofjobs>4</numberofjobs>
<prio>0</prio>
<dontact>false</dontact>
- <makebin/>
- <defaulttarget/>
+ <makebin></makebin>
+ <defaulttarget></defaulttarget>
<makeoptions>-f rawstudio-plugin.makefile</makeoptions>
<selectedenvironment>default</selectedenvironment>
<environments>
@@ -492,11 +492,11 @@
</kdevcustomproject>
<kdevdebugger>
<general>
- <dbgshell/>
- <gdbpath/>
- <configGdbScript/>
- <runShellScript/>
- <runGdbScript/>
+ <dbgshell></dbgshell>
+ <gdbpath></gdbpath>
+ <configGdbScript></configGdbScript>
+ <runShellScript></runShellScript>
+ <runGdbScript></runGdbScript>
<breakonloadinglibs>true</breakonloadinglibs>
<separatetty>true</separatetty>
<floatingtoolbar>false</floatingtoolbar>
@@ -588,8 +588,8 @@
<namespaceAliases>std=_GLIBCXX_STD;__gnu_cxx=std</namespaceAliases>
<processPrimaryTypes>true</processPrimaryTypes>
<processFunctionArguments>true</processFunctionArguments>
- <preProcessAllHeaders>true</preProcessAllHeaders>
- <parseMissingHeadersExperimental>true</parseMissingHeadersExperimental>
+ <preProcessAllHeaders>false</preProcessAllHeaders>
+ <parseMissingHeadersExperimental>false</parseMissingHeadersExperimental>
<resolveIncludePathsUsingMakeExperimental>false</resolveIncludePathsUsingMakeExperimental>
<alwaysParseInBackground>true</alwaysParseInBackground>
<usePermanentCaching>true</usePermanentCaching>
@@ -597,7 +597,7 @@
<includePaths>.;</includePaths>
</codecompletion>
<creategettersetter>
- <prefixGet/>
+ <prefixGet></prefixGet>
<prefixSet>set</prefixSet>
<prefixVariable>m_,_</prefixVariable>
<parameterName>theValue</parameterName>
Modified: cameras.xml
===================================================================
--- cameras.xml 2009-09-01 20:25:48 UTC (rev 137)
+++ cameras.xml 2009-09-01 21:14:03 UTC (rev 138)
@@ -473,7 +473,7 @@
<Crop x="0" y="0" width="2608" height="1950"/>
<Sensor black="0" white="4095"/>
</Camera>
- <Camera make="NIKON" model="E5700" supported="no">
+ <Camera make="NIKON" model="E5700" supported="no">
<CFA width="2" height="2">
<Color x="0" y="0">GREEN</Color>
<Color x="1" y="0">UNKNOWN</Color>
@@ -698,7 +698,39 @@
</CFA>
<Crop x="0" y="0" width="3668" height="2754"/>
<Sensor black="15" white="3986"/>
- </Camera>
+ </Camera>
+ <Camera make="Panasonic" model = "DMC-G1">
+ <CFA width="2" height="2">
+ <Color x="0" y="0">GREEN</Color><Color x="1" y="0">BLUE</Color>
+ <Color x="0" y="1">RED</Color><Color x="1" y="1">GREEN</Color>
+ </CFA>
+ <Crop x="0" y="0" width="4034" height="3016"/>
+ <Sensor black="15" white="3986"/>
+ </Camera>
+ <Camera make="Panasonic" model = "DMC-FZ38">
+ <CFA width="2" height="2">
+ <Color x="0" y="0">BLUE</Color><Color x="1" y="0">GREEN</Color>
+ <Color x="0" y="1">GREEN</Color><Color x="1" y="1">RED</Color>
+ </CFA>
+ <Crop x="0" y="0" width="4030" height="3018"/>
+ <Sensor black="130" white="4086"/>
+ </Camera>
+ <Camera make="Panasonic" model = "DMC-LX3" mode="wide">
+ <CFA width="2" height="2">
+ <Color x="0" y="0">BLUE</Color><Color x="1" y="0">GREEN</Color>
+ <Color x="0" y="1">GREEN</Color><Color x="1" y="1">RED</Color>
+ </CFA>
+ <Crop x="0" y="0" width="3990" height="2250"/>
+ <Sensor black="0" white="4095"/>
+ </Camera>
+ <Camera make="Panasonic" model = "DMC-LX3">
+ <CFA width="2" height="2">
+ <Color x="0" y="0">BLUE</Color><Color x="1" y="0">GREEN</Color>
+ <Color x="0" y="1">GREEN</Color><Color x="1" y="1">RED</Color>
+ </CFA>
+ <Crop x="0" y="0" width="3666" height="2754"/>
+ <Sensor black="0" white="4095"/>
+ </Camera>
<Camera make="PENTAX Corporation" model="PENTAX K100D">
<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
