Author: post
Date: 2009-07-06 22:11:14 +0200 (Mon, 06 Jul 2009)
New Revision: 79
Modified:
RawSpeed/TiffParser.cpp
RawSpeed/rawstudio-plugin.makefile
cameras.xml
Log:
- Added Pentax K200D, K-7, K-m (K2000) support.
- Added line numbers to compile.
Modified: RawSpeed/TiffParser.cpp
===================================================================
--- RawSpeed/TiffParser.cpp 2009-07-06 19:14:20 UTC (rev 78)
+++ RawSpeed/TiffParser.cpp 2009-07-06 20:11:14 UTC (rev 79)
@@ -1,22 +1,22 @@
#include "StdAfx.h"
#include "TiffParser.h"
-/*
- RawSpeed - RAW file decoder.
-
- Copyright (C) 2009 Klaus Post
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
+/*
+ RawSpeed - RAW file decoder.
+
+ Copyright (C) 2009 Klaus Post
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
http://www.klauspost.com
@@ -120,6 +120,9 @@
if (!make.compare("PENTAX Corporation ")) {
return new PefDecoder(mRootIFD,mInput);
}
+ if (!make.compare("PENTAX ")) {
+ return new PefDecoder(mRootIFD,mInput);
+ }
if (!make.compare("Panasonic")) {
return new Rw2Decoder(mRootIFD,mInput);
}
Modified: RawSpeed/rawstudio-plugin.makefile
===================================================================
--- RawSpeed/rawstudio-plugin.makefile 2009-07-06 19:14:20 UTC (rev 78)
+++ RawSpeed/rawstudio-plugin.makefile 2009-07-06 20:11:14 UTC (rev 79)
@@ -1,5 +1,5 @@
CC=g++
-CFLAGS=-fPIC -Wall -O4 `pkg-config --cflags rawstudio-1.1 libxml-2.0`
+CFLAGS=-fPIC -Wall -O4 -g `pkg-config --cflags rawstudio-1.1 libxml-2.0`
LDFLAGS=`pkg-config --libs rawstudio-1.1 libxml-2.0`
INSTALLPATH=`pkg-config --variable=plugindir rawstudio-1.1 libxml-2.0`
Modified: cameras.xml
===================================================================
--- cameras.xml 2009-07-06 19:14:20 UTC (rev 78)
+++ cameras.xml 2009-07-06 20:11:14 UTC (rev 79)
@@ -601,6 +601,46 @@
<Crop x="0" y="0" width="4688" height="3124"/>
<Sensor black="0" white="4095"/>
</Camera>
+ <Camera make="PENTAX Corporation" model="PENTAX K200D">
+ <CFA width="2" height="2">
+ <Color x="0" y="0">RED</Color>
+ <Color x="1" y="0">GREEN</Color>
+ <Color x="0" y="1">GREEN</Color>
+ <Color x="1" y="1">BLUE</Color>
+ </CFA>
+ <Crop x="0" y="0" width="3880" height="2604"/>
+ <Sensor black="0" white="4095"/>
+ </Camera>
+ <Camera make="PENTAX" model="PENTAX K-7">
+ <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="4672" height="3104"/>
+ <Sensor black="0" white="4095"/>
+ </Camera>
+ <Camera make="PENTAX" model="PENTAX K-m">
+ <CFA width="2" height="2">
+ <Color x="0" y="0">RED</Color>
+ <Color x="1" y="0">GREEN</Color>
+ <Color x="0" y="1">GREEN</Color>
+ <Color x="1" y="1">BLUE</Color>
+ </CFA>
+ <Crop x="0" y="0" width="3900" height="2616"/>
+ <Sensor black="0" white="4095"/>
+ </Camera>
+ <Camera make="PENTAX" model="PENTAX K2000">
+ <CFA width="2" height="2">
+ <Color x="0" y="0">RED</Color>
+ <Color x="1" y="0">GREEN</Color>
+ <Color x="0" y="1">GREEN</Color>
+ <Color x="1" y="1">BLUE</Color>
+ </CFA>
+ <Crop x="0" y="0" width="3900" height="2616"/>
+ <Sensor black="0" white="4095"/>
+ </Camera>
<Camera make="SONY" model="DSLR-A100">
<CFA width="2" height="2">
<Color x="0" y="0">GREEN</Color>
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
