Skip to content

Instantly share code, notes, and snippets.

@pedrocr

pedrocr/gist:887cdd089bc262a3b2f0

Created July 12, 2015 10:51
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save pedrocr/887cdd089bc262a3b2f0 to your computer and use it in GitHub Desktop.
Save pedrocr/887cdd089bc262a3b2f0 to your computer and use it in GitHub Desktop.
Download ZIP
Current diff between darktable's rawspeed and upstream
Raw
gistfile1.diff
diff -ur RawSpeed/Camera.cpp ../darktable/src/external/rawspeed/RawSpeed/Camera.cpp
--- RawSpeed/Camera.cpp 2015-06-24 12:46:49.670692111 +0100
+++ ../darktable/src/external/rawspeed/RawSpeed/Camera.cpp 2015-07-12 11:49:21.758328129 +0100
@@ -195,7 +195,7 @@
}
const char* key = cur.first_child().value();
if ((int)strlen(key) != cfa.size.x) {
- ThrowCME("Invalid number of colors in definition for row %d in camera %s %s. Expected %d, found %d.", y, make.c_str(), model.c_str(), cfa.size.x, strlen(key));
+ ThrowCME("Invalid number of colors in definition for row %d in camera %s %s. Expected %d, found %zu.", y, make.c_str(), model.c_str(), cfa.size.x, strlen(key));
}
for (int x = 0; x < cfa.size.x; x++) {
char v = (char)tolower((int)key[x]);
diff -ur RawSpeed/CameraMetadataException.h ../darktable/src/external/rawspeed/RawSpeed/CameraMetadataException.h
--- RawSpeed/CameraMetadataException.h 2015-05-01 09:08:05.920600980 +0100
+++ ../darktable/src/external/rawspeed/RawSpeed/CameraMetadataException.h 2015-07-12 11:49:21.758328129 +0100
@@ -25,7 +25,7 @@
namespace RawSpeed {
-void ThrowCME(const char* fmt, ...);
+void ThrowCME(const char* fmt, ...) __attribute__ ((format (printf, 1, 2)));
class CameraMetadataException :
public std::runtime_error
diff -ur RawSpeed/CiffParserException.h ../darktable/src/external/rawspeed/RawSpeed/CiffParserException.h
--- RawSpeed/CiffParserException.h 2015-06-24 12:46:49.742692254 +0100
+++ ../darktable/src/external/rawspeed/RawSpeed/CiffParserException.h 2015-07-12 11:49:21.774328101 +0100
@@ -26,7 +26,7 @@
namespace RawSpeed {
-void ThrowCPE(const char* fmt, ...);
+void ThrowCPE(const char* fmt, ...) __attribute__ ((format (printf, 1, 2)));
class CiffParserException : public std::runtime_error
{
diff -ur RawSpeed/Common.h ../darktable/src/external/rawspeed/RawSpeed/Common.h
--- RawSpeed/Common.h 2015-06-24 12:46:49.762692295 +0100
+++ ../darktable/src/external/rawspeed/RawSpeed/Common.h 2015-07-12 11:49:21.774328101 +0100
@@ -110,7 +110,7 @@
const int DEBUG_PRIO_INFO = 0x1000;
const int DEBUG_PRIO_EXTRA = 0x10000;
-void writeLog(int priority, const char *format, ...);
+void writeLog(int priority, const char *format, ...) __attribute__((format(printf, 2, 3)));
inline void BitBlt(uchar8* dstp, int dst_pitch, const uchar8* srcp, int src_pitch, int row_size, int height) {
if (height == 1 || (dst_pitch == src_pitch && src_pitch == row_size)) {
diff -ur RawSpeed/DngDecoder.cpp ../darktable/src/external/rawspeed/RawSpeed/DngDecoder.cpp
--- RawSpeed/DngDecoder.cpp 2015-06-24 12:46:49.818692408 +0100
+++ ../darktable/src/external/rawspeed/RawSpeed/DngDecoder.cpp 2015-07-12 11:49:21.778328094 +0100
@@ -135,7 +135,7 @@
iPoint2D cfaSize(pDim[1], pDim[0]);
mRaw->cfa.setSize(cfaSize);
if (cfaSize.area() != raw->getEntry(CFAPATTERN)->count)
- ThrowRDE("DNG Decoder: CFA pattern dimension and pattern count does not match: %d.");
+ ThrowRDE("DNG Decoder: CFA pattern dimension and pattern count does not match: %d.", raw->getEntry(CFAPATTERN)->count);
for (int y = 0; y < cfaSize.y; y++) {
for (int x = 0; x < cfaSize.x; x++) {
diff -ur RawSpeed/FileIOException.h ../darktable/src/external/rawspeed/RawSpeed/FileIOException.h
--- RawSpeed/FileIOException.h 2015-03-07 14:27:39.515473469 +0000
+++ ../darktable/src/external/rawspeed/RawSpeed/FileIOException.h 2015-07-12 11:49:21.778328094 +0100
@@ -27,7 +27,7 @@
namespace RawSpeed {
-void ThrowFIE(const char* fmt, ...);
+void ThrowFIE(const char* fmt, ...) __attribute__ ((format (printf, 1, 2)));
class FileIOException: public RawDecoderException
{
diff -ur RawSpeed/IOException.h ../darktable/src/external/rawspeed/RawSpeed/IOException.h
--- RawSpeed/IOException.h 2015-03-07 14:27:39.523473456 +0000
+++ ../darktable/src/external/rawspeed/RawSpeed/IOException.h 2015-07-12 11:49:21.778328094 +0100
@@ -27,7 +27,7 @@
namespace RawSpeed {
-void ThrowIOE(const char* fmt, ...);
+void ThrowIOE(const char* fmt, ...) __attribute__ ((format (printf, 1, 2)));
class IOException : public std::runtime_error
diff -ur RawSpeed/LJpegDecompressor.cpp ../darktable/src/external/rawspeed/RawSpeed/LJpegDecompressor.cpp
--- RawSpeed/LJpegDecompressor.cpp 2015-06-24 12:46:49.854692479 +0100
+++ ../darktable/src/external/rawspeed/RawSpeed/LJpegDecompressor.cpp 2015-07-12 11:49:21.778328094 +0100
@@ -472,7 +472,7 @@
if (!htbl->bigTable)
htbl->bigTable = (int*)_aligned_malloc(size * sizeof(int), 16);
if (!htbl->bigTable)
- ThrowRDE("Out of memory, failed to allocate %d bytes", size*sizeof(int));
+ ThrowRDE("Out of memory, failed to allocate %lu bytes", size*sizeof(int));
for (uint32 i = 0; i < size; i++) {
ushort16 input = i << 2; // Calculate input value
int code = input >> 8; // Get 8 bits
diff -ur RawSpeed/RawDecoderException.h ../darktable/src/external/rawspeed/RawSpeed/RawDecoderException.h
--- RawSpeed/RawDecoderException.h 2015-05-01 09:08:06.504601548 +0100
+++ ../darktable/src/external/rawspeed/RawSpeed/RawDecoderException.h 2015-07-12 11:49:21.778328094 +0100
@@ -25,7 +25,7 @@
namespace RawSpeed {
-void ThrowRDE(const char* fmt, ...);
+void ThrowRDE(const char* fmt, ...) __attribute__ ((format (printf, 1, 2)));
class RawDecoderException : public std::runtime_error
{
Only in RawSpeed: RawSpeed.vcproj
Only in RawSpeed: RawSpeed.vcproj.KLAUSPOST.klaus.user
Only in RawSpeed: RawSpeed.vcxproj
diff -ur RawSpeed/SrwDecoder.cpp ../darktable/src/external/rawspeed/RawSpeed/SrwDecoder.cpp
--- RawSpeed/SrwDecoder.cpp 2015-06-24 12:46:50.106692989 +0100
+++ ../darktable/src/external/rawspeed/RawSpeed/SrwDecoder.cpp 2015-07-12 11:49:21.778328094 +0100
@@ -449,7 +449,7 @@
const uchar8* cPat = data[0]->getEntry(CFAPATTERN)->getData();
if (cfaSize.area() != data[0]->getEntry(CFAPATTERN)->count)
- ThrowRDE("SRW Decoder: CFA pattern dimension and pattern count does not match: %d.");
+ ThrowRDE("SRW Decoder: CFA pattern dimension and pattern count does not match: %d.", data[0]->getEntry(CFAPATTERN)->count);
for (int y = 0; y < cfaSize.y; y++) {
for (int x = 0; x < cfaSize.x; x++) {
diff -ur RawSpeed/TiffParser.cpp ../darktable/src/external/rawspeed/RawSpeed/TiffParser.cpp
--- RawSpeed/TiffParser.cpp 2015-07-12 11:48:32.262414704 +0100
+++ ../darktable/src/external/rawspeed/RawSpeed/TiffParser.cpp 2015-07-04 18:15:55.713425742 +0100
@@ -199,6 +199,11 @@
mRootIFD = NULL;
return new MosDecoder(root, mInput);
}
+ if (!make.compare("Phase One A/S")) {
+ mRootIFD = NULL;
+ return new MosDecoder(root, mInput);
+ }
+
}
}
diff -ur RawSpeed/TiffParserException.h ../darktable/src/external/rawspeed/RawSpeed/TiffParserException.h
--- RawSpeed/TiffParserException.h 2015-03-07 14:27:39.995472589 +0000
+++ ../darktable/src/external/rawspeed/RawSpeed/TiffParserException.h 2015-07-12 11:49:21.778328094 +0100
@@ -25,7 +25,7 @@
namespace RawSpeed {
-void ThrowTPE(const char* fmt, ...);
+void ThrowTPE(const char* fmt, ...) __attribute__ ((format (printf, 1, 2)));
class TiffParserException : public std::runtime_error
{
--- data/cameras.xml 2015-07-12 11:48:32.262414704 +0100
+++ ../darktable/src/external/rawspeed/data/cameras.xml 2015-07-11 13:35:20.488558512 +0100
@@ -4031,6 +4031,9 @@
<Hints>
<Hint name="zero_is_bad" value=""/>
</Hints>
+ <Aliases>
+ <Alias>DMC-G70</Alias>
+ </Aliases>
</Camera>
<Camera make="Panasonic" model="DMC-G7" mode="4:3">
<ID make="Panasonic" model="DMC-G7">Panasonic DMC-G7</ID>
@@ -4045,6 +4048,60 @@
<Hints>
<Hint name="zero_is_bad" value=""/>
</Hints>
+ <Aliases>
+ <Alias>DMC-G70</Alias>
+ </Aliases>
+ </Camera>
+ <Camera make="Panasonic" model="DMC-G7" mode="3:2">
+ <ID make="Panasonic" model="DMC-G7">Panasonic DMC-G7</ID>
+ <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="-208" height="0"/>
+ <Sensor black="143" white="4095"/>
+ <Hints>
+ <Hint name="zero_is_bad" value=""/>
+ </Hints>
+ <Aliases>
+ <Alias>DMC-G70</Alias>
+ </Aliases>
+ </Camera>
+ <Camera make="Panasonic" model="DMC-G7" mode="1:1">
+ <ID make="Panasonic" model="DMC-G7">Panasonic DMC-G7</ID>
+ <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="-32" height="0"/>
+ <Sensor black="143" white="4095"/>
+ <Hints>
+ <Hint name="zero_is_bad" value=""/>
+ </Hints>
+ <Aliases>
+ <Alias>DMC-G70</Alias>
+ </Aliases>
+ </Camera>
+ <Camera make="Panasonic" model="DMC-G7" mode="16:9">
+ <ID make="Panasonic" model="DMC-G7">Panasonic DMC-G7</ID>
+ <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="-208" height="0"/>
+ <Sensor black="143" white="4095"/>
+ <Hints>
+ <Hint name="zero_is_bad" value=""/>
+ </Hints>
+ <Aliases>
+ <Alias>DMC-G70</Alias>
+ </Aliases>
</Camera>
<Camera make="Panasonic" model = "DMC-GF3">
<ID make="Panasonic" model="DMC-GF3">Panasonic DMC-GF3</ID>
@@ -5650,6 +5707,17 @@
<Crop x="4" y="0" width="-36" height="0"/>
<Sensor black="1" white="15868"/>
</Camera>
+ <Camera make="RICOH IMAGING COMPANY, LTD." model="PENTAX K-3 II">
+ <ID make="Pentax" model="K-3 II">PENTAX K-3 II</ID>
+ <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="4" y="0" width="-36" height="0"/>
+ <Sensor black="1" white="15865"/>
+ </Camera>
<Camera make="PENTAX" model="PENTAX K-5" decoder_version="2">
<ID make="Pentax" model="K-5">PENTAX K-5</ID>
<CFA width="2" height="2">
@@ -7324,6 +7392,17 @@
<Crop x="0" y="0" width="0" height="0"/>
<Sensor black="0" white="15000"/>
</Camera>
+ <Camera make="Phase One A/S" model="IQ250">
+ <ID make="Phase One" model="IQ250">Phase One IQ250</ID>
+ <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="92" y="108" width="0" height="0"/>
+ <Sensor black="1024" white="65535"/>
+ </Camera>
<Camera make="Kodak" model="DCS Pro SLR/n">
<CFA width="2" height="2">
<Color x="0" y="0">GREEN</Color>
@@ -7443,7 +7522,7 @@
<ID make="Canon" model="PowerShot A3200 IS">Canon PowerShot A3200 IS</ID>
</Camera>
<!-- CHDK Cameras -->
- <Camera make="AVT" model="F-080C" mode="chdk">
+ <Camera make="AVT" model="F-080C" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -7456,7 +7535,7 @@
<Hint name="full_height" value="768"/>
</Hints>
</Camera>
- <Camera make="AVT" model="F-145C" mode="chdk">
+ <Camera make="AVT" model="F-145C" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -7469,7 +7548,7 @@
<Hint name="full_height" value="1040"/>
</Hints>
</Camera>
- <Camera make="AVT" model="F-201C" mode="chdk">
+ <Camera make="AVT" model="F-201C" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -7482,7 +7561,7 @@
<Hint name="full_height" value="1200"/>
</Hints>
</Camera>
- <Camera make="AVT" model="F-510C" mode="chdk-a">
+ <Camera make="AVT" model="F-510C" supported="no" mode="chdk-a">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -7495,7 +7574,7 @@
<Hint name="full_height" value="1958"/>
</Hints>
</Camera>
- <Camera make="AVT" model="F-510C" mode="chdk-b">
+ <Camera make="AVT" model="F-510C" supported="no" mode="chdk-b">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -7509,7 +7588,7 @@
<Hint name="offset" value="12"/>
</Hints>
</Camera>
- <Camera make="AVT" model="F-510C" mode="chdk-c">
+ <Camera make="AVT" model="F-510C" supported="no" mode="chdk-c">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -7522,7 +7601,7 @@
<Hint name="full_height" value="1958"/>
</Hints>
</Camera>
- <Camera make="AVT" model="F-510C" mode="chdk-d">
+ <Camera make="AVT" model="F-510C" supported="no" mode="chdk-d">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -7536,7 +7615,7 @@
<Hint name="offset" value="12"/>
</Hints>
</Camera>
- <Camera make="AVT" model="F-810C" mode="chdk">
+ <Camera make="AVT" model="F-810C" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -7549,7 +7628,7 @@
<Hint name="full_height" value="2469"/>
</Hints>
</Camera>
- <Camera make="AgfaPhoto" model="DC-833m" mode="chdk">
+ <Camera make="AgfaPhoto" model="DC-833m" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">GB</ColorRow>
<ColorRow y="1">RG</ColorRow>
@@ -7562,7 +7641,7 @@
<Hint name="full_height" value="2448"/>
</Hints>
</Camera>
- <Camera make="Alcatel" model="5035D" mode="chdk">
+ <Camera make="Alcatel" model="5035D" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">GB</ColorRow>
<ColorRow y="1">RG</ColorRow>
@@ -7575,7 +7654,7 @@
<Hint name="full_height" value="1902"/>
</Hints>
</Camera>
- <Camera make="Baumer" model="TXG14" mode="chdk">
+ <Camera make="Baumer" model="TXG14" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">GR</ColorRow>
<ColorRow y="1">BG</ColorRow>
@@ -7589,7 +7668,7 @@
<Hint name="offset" value="1078"/>
</Hints>
</Camera>
- <Camera make="Canon" model="PowerShot SD300" mode="chdk">
+ <Camera make="Canon" model="PowerShot SD300" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -7602,7 +7681,7 @@
<Hint name="full_height" value="1766"/>
</Hints>
</Camera>
- <Camera make="Canon" model="PowerShot A460" mode="chdk">
+ <Camera make="Canon" model="PowerShot A460" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -7632,7 +7711,7 @@
<Vertical x="2632" width="40"/>
</BlackAreas>
</Camera>
- <Camera make="Canon" model="PowerShot A530" mode="chdk">
+ <Camera make="Canon" model="PowerShot A530" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -7679,7 +7758,7 @@
<Vertical x="0" width="30"/>
</BlackAreas>
</Camera>
- <Camera make="Canon" model="PowerShot A470" mode="chdk">
+ <Camera make="Canon" model="PowerShot A470" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">GR</ColorRow>
<ColorRow y="1">BG</ColorRow>
@@ -7777,7 +7856,7 @@
<Vertical x="3690" width="30"/>
</BlackAreas>
</Camera>
- <Camera make="Canon" model="PowerShot SX120 IS" mode="chdk">
+ <Camera make="Canon" model="PowerShot SX120 IS" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -7790,7 +7869,7 @@
<Hint name="full_height" value="2778"/>
</Hints>
</Camera>
- <Camera make="Canon" model="PowerShot SX20 IS" mode="chdk">
+ <Camera make="Canon" model="PowerShot SX20 IS" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -7803,7 +7882,7 @@
<Hint name="full_height" value="3048"/>
</Hints>
</Camera>
- <Camera make="Canon" model="PowerShot SX220 HS" mode="chdk">
+ <Camera make="Canon" model="PowerShot SX220 HS" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -7816,7 +7895,7 @@
<Hint name="full_height" value="3060"/>
</Hints>
</Camera>
- <Camera make="Canon" model="PowerShot SX30 IS" mode="chdk">
+ <Camera make="Canon" model="PowerShot SX30 IS" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">BG</ColorRow>
<ColorRow y="1">GR</ColorRow>
@@ -7829,7 +7908,7 @@
<Hint name="full_height" value="3276"/>
</Hints>
</Camera>
- <Camera make="Canon" model="PowerShot A3300 IS" mode="chdk">
+ <Camera make="Canon" model="PowerShot A3300 IS" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -7842,7 +7921,7 @@
<Hint name="full_height" value="3504"/>
</Hints>
</Camera>
- <Camera make="Casio" model="QV-2000UX" mode="chdk">
+ <Camera make="Casio" model="QV-2000UX" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -7855,7 +7934,7 @@
<Hint name="full_height" value="1211"/>
</Hints>
</Camera>
- <Camera make="Casio" model="QV-3*00EX" mode="chdk">
+ <Camera make="Casio" model="QV-3*00EX" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -7868,7 +7947,7 @@
<Hint name="full_height" value="1547"/>
</Hints>
</Camera>
- <Camera make="Casio" model="QV-5700" mode="chdk">
+ <Camera make="Casio" model="QV-5700" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -7881,7 +7960,7 @@
<Hint name="full_height" value="1924"/>
</Hints>
</Camera>
- <Camera make="Casio" model="EX-Z60" mode="chdk">
+ <Camera make="Casio" model="EX-Z60" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">BG</ColorRow>
<ColorRow y="1">GR</ColorRow>
@@ -7894,7 +7973,7 @@
<Hint name="full_height" value="2181"/>
</Hints>
</Camera>
- <Camera make="Casio" model="EX-S20" mode="chdk">
+ <Camera make="Casio" model="EX-S20" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -7907,7 +7986,7 @@
<Hint name="full_height" value="1208"/>
</Hints>
</Camera>
- <Camera make="Casio" model="EX-S100" mode="chdk">
+ <Camera make="Casio" model="EX-S100" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -7920,7 +7999,7 @@
<Hint name="full_height" value="1578"/>
</Hints>
</Camera>
- <Camera make="Casio" model="QV-R41" mode="chdk">
+ <Camera make="Casio" model="QV-R41" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -7933,7 +8012,7 @@
<Hint name="full_height" value="1720"/>
</Hints>
</Camera>
- <Camera make="Casio" model="EX-P505" mode="chdk">
+ <Camera make="Casio" model="EX-P505" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -7946,7 +8025,7 @@
<Hint name="full_height" value="1928"/>
</Hints>
</Camera>
- <Camera make="Casio" model="QV-R51" mode="chdk">
+ <Camera make="Casio" model="QV-R51" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -7959,7 +8038,7 @@
<Hint name="full_height" value="1929"/>
</Hints>
</Camera>
- <Camera make="Casio" model="EX-Z50" mode="chdk">
+ <Camera make="Casio" model="EX-Z50" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -7972,7 +8051,7 @@
<Hint name="full_height" value="1932"/>
</Hints>
</Camera>
- <Camera make="Casio" model="EX-Z500" mode="chdk">
+ <Camera make="Casio" model="EX-Z500" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">BG</ColorRow>
<ColorRow y="1">GR</ColorRow>
@@ -7985,7 +8064,7 @@
<Hint name="full_height" value="1937"/>
</Hints>
</Camera>
- <Camera make="Casio" model="EX-Z55" mode="chdk">
+ <Camera make="Casio" model="EX-Z55" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -7998,7 +8077,7 @@
<Hint name="full_height" value="1986"/>
</Hints>
</Camera>
- <Camera make="Casio" model="EX-P600" mode="chdk">
+ <Camera make="Casio" model="EX-P600" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8011,7 +8090,7 @@
<Hint name="full_height" value="2172"/>
</Hints>
</Camera>
- <Camera make="Casio" model="EX-Z750" mode="chdk">
+ <Camera make="Casio" model="EX-Z750" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8024,7 +8103,7 @@
<Hint name="full_height" value="2319"/>
</Hints>
</Camera>
- <Camera make="Casio" model="EX-Z75" mode="chdk">
+ <Camera make="Casio" model="EX-Z75" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8037,7 +8116,7 @@
<Hint name="full_height" value="2321"/>
</Hints>
</Camera>
- <Camera make="Casio" model="EX-P700" mode="chdk">
+ <Camera make="Casio" model="EX-P700" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8050,7 +8129,7 @@
<Hint name="full_height" value="2350"/>
</Hints>
</Camera>
- <Camera make="Casio" model="EX-Z850" mode="chdk">
+ <Camera make="Casio" model="EX-Z850" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8063,7 +8142,7 @@
<Hint name="full_height" value="2498"/>
</Hints>
</Camera>
- <Camera make="Casio" model="EX-Z8" mode="chdk">
+ <Camera make="Casio" model="EX-Z8" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8076,7 +8155,7 @@
<Hint name="full_height" value="2502"/>
</Hints>
</Camera>
- <Camera make="Casio" model="EX-Z1050" mode="chdk">
+ <Camera make="Casio" model="EX-Z1050" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8089,7 +8168,7 @@
<Hint name="full_height" value="2752"/>
</Hints>
</Camera>
- <Camera make="Casio" model="EX-ZR100" mode="chdk">
+ <Camera make="Casio" model="EX-ZR100" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8102,7 +8181,7 @@
<Hint name="full_height" value="3044"/>
</Hints>
</Camera>
- <Camera make="Casio" model="QV-4000" mode="chdk">
+ <Camera make="Casio" model="QV-4000" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8115,7 +8194,7 @@
<Hint name="full_height" value="1700"/>
</Hints>
</Camera>
- <Camera make="Creative" model="PC-CAM 600" mode="chdk">
+ <Camera make="Creative" model="PC-CAM 600" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">GR</ColorRow>
<ColorRow y="1">BG</ColorRow>
@@ -8128,7 +8207,7 @@
<Hint name="full_height" value="769"/>
</Hints>
</Camera>
- <Camera make="DJI" model="" mode="chdk">
+ <Camera make="DJI" model="" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">GB</ColorRow>
<ColorRow y="1">RG</ColorRow>
@@ -8141,7 +8220,7 @@
<Hint name="full_height" value="3288"/>
</Hints>
</Camera>
- <Camera make="Matrix" model="" mode="chdk">
+ <Camera make="Matrix" model="" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8154,7 +8233,7 @@
<Hint name="full_height" value="3288"/>
</Hints>
</Camera>
- <Camera make="Foculus" model="531C" mode="chdk">
+ <Camera make="Foculus" model="531C" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">GR</ColorRow>
<ColorRow y="1">BG</ColorRow>
@@ -8167,7 +8246,7 @@
<Hint name="full_height" value="1200"/>
</Hints>
</Camera>
- <Camera make="Generic" model="" mode="chdk">
+ <Camera make="Generic" model="" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8180,7 +8259,7 @@
<Hint name="full_height" value="480"/>
</Hints>
</Camera>
- <Camera make="Kodak" model="DC20" mode="chdk-a">
+ <Camera make="Kodak" model="DC20" supported="no" mode="chdk-a">
<CFA2 width="2" height="2">
<ColorRow y="0">GR</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8193,7 +8272,7 @@
<Hint name="full_height" value="244"/>
</Hints>
</Camera>
- <Camera make="Kodak" model="DC20" mode="chdk-b">
+ <Camera make="Kodak" model="DC20" supported="no" mode="chdk-b">
<CFA2 width="2" height="2">
<ColorRow y="0">GR</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8206,7 +8285,7 @@
<Hint name="full_height" value="244"/>
</Hints>
</Camera>
- <Camera make="Kodak" model="DCS200" mode="chdk">
+ <Camera make="Kodak" model="DCS200" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">GB</ColorRow>
<ColorRow y="1">RG</ColorRow>
@@ -8219,7 +8298,7 @@
<Hint name="full_height" value="1076"/>
</Hints>
</Camera>
- <Camera make="Kodak" model="C330" mode="chdk-a">
+ <Camera make="Kodak" model="C330" supported="no" mode="chdk-a">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8232,7 +8311,7 @@
<Hint name="full_height" value="1779"/>
</Hints>
</Camera>
- <Camera make="Kodak" model="C330" mode="chdk-b">
+ <Camera make="Kodak" model="C330" supported="no" mode="chdk-b">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8246,7 +8325,7 @@
<Hint name="offset" value="3160"/>
</Hints>
</Camera>
- <Camera make="Kodak" model="C603" mode="chdk-a">
+ <Camera make="Kodak" model="C603" supported="no" mode="chdk-a">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8259,7 +8338,7 @@
<Hint name="full_height" value="2152"/>
</Hints>
</Camera>
- <Camera make="Kodak" model="C603" mode="chdk-b">
+ <Camera make="Kodak" model="C603" supported="no" mode="chdk-b">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8273,7 +8352,7 @@
<Hint name="offset" value="3160"/>
</Hints>
</Camera>
- <Camera make="Kodak" model="C603" mode="chdk-c">
+ <Camera make="Kodak" model="C603" supported="no" mode="chdk-c">
<Crop x="0" y="0" width="0" height="0"/>
<Sensor black="0" white="4095"/>
<Hints>
@@ -8282,7 +8361,7 @@
<Hint name="full_height" value="480"/>
</Hints>
</Camera>
- <Camera make="Kodak" model="C603" mode="chdk-d">
+ <Camera make="Kodak" model="C603" supported="no" mode="chdk-d">
<Crop x="0" y="0" width="0" height="0"/>
<Sensor black="0" white="4095"/>
<Hints>
@@ -8291,7 +8370,7 @@
<Hint name="full_height" value="2134"/>
</Hints>
</Camera>
- <Camera make="Kodak" model="12MP" mode="chdk-a">
+ <Camera make="Kodak" model="12MP" supported="no" mode="chdk-a">
<CFA2 width="2" height="2">
<ColorRow y="0">GR</ColorRow>
<ColorRow y="1">BG</ColorRow>
@@ -8304,7 +8383,7 @@
<Hint name="full_height" value="3030"/>
</Hints>
</Camera>
- <Camera make="Kodak" model="12MP" mode="chdk-b">
+ <Camera make="Kodak" model="12MP" supported="no" mode="chdk-b">
<CFA2 width="2" height="2">
<ColorRow y="0">GR</ColorRow>
<ColorRow y="1">BG</ColorRow>
@@ -8318,7 +8397,7 @@
<Hint name="offset" value="31556"/>
</Hints>
</Camera>
- <Camera make="Kodak" model="12MP" mode="chdk-c">
+ <Camera make="Kodak" model="12MP" supported="no" mode="chdk-c">
<Crop x="0" y="0" width="0" height="0"/>
<Sensor black="0" white="4095"/>
<Hints>
@@ -8327,7 +8406,7 @@
<Hint name="full_height" value="3000"/>
</Hints>
</Camera>
- <Camera make="Kodak" model="KAI-0340" mode="chdk">
+ <Camera make="Kodak" model="KAI-0340" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8340,7 +8419,7 @@
<Hint name="full_height" value="480"/>
</Hints>
</Camera>
- <Camera make="Micron" model="2010" mode="chdk">
+ <Camera make="Micron" model="2010" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">BG</ColorRow>
<ColorRow y="1">GR</ColorRow>
@@ -8354,7 +8433,7 @@
<Hint name="offset" value="3212"/>
</Hints>
</Camera>
- <Camera make="Minolta" model="RD175" mode="chdk">
+ <Camera make="Minolta" model="RD175" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">GB</ColorRow>
<ColorRow y="1">RG</ColorRow>
@@ -8368,7 +8447,7 @@
<Hint name="offset" value="513"/>
</Hints>
</Camera>
- <Camera make="Nikon" model="E900" mode="chdk">
+ <Camera make="Nikon" model="E900" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">BG</ColorRow>
<ColorRow y="1">GR</ColorRow>
@@ -8381,7 +8460,7 @@
<Hint name="full_height" value="969"/>
</Hints>
</Camera>
- <Camera make="Nikon" model="E950" mode="chdk">
+ <Camera make="Nikon" model="E950" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">GR</ColorRow>
<ColorRow y="1">BG</ColorRow>
@@ -8394,7 +8473,7 @@
<Hint name="full_height" value="1204"/>
</Hints>
</Camera>
- <Camera make="Nikon" model="E2100" mode="chdk">
+ <Camera make="Nikon" model="E2100" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8407,7 +8486,7 @@
<Hint name="full_height" value="1213"/>
</Hints>
</Camera>
- <Camera make="Nikon" model="E990" mode="chdk">
+ <Camera make="Nikon" model="E990" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">GB</ColorRow>
<ColorRow y="1">RG</ColorRow>
@@ -8420,7 +8499,7 @@
<Hint name="full_height" value="1541"/>
</Hints>
</Camera>
- <Camera make="Nikon" model="E3700" mode="chdk">
+ <Camera make="Nikon" model="E3700" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8433,7 +8512,7 @@
<Hint name="full_height" value="1542"/>
</Hints>
</Camera>
- <Camera make="Nikon" model="E4500" mode="chdk">
+ <Camera make="Nikon" model="E4500" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8446,7 +8525,7 @@
<Hint name="full_height" value="1709"/>
</Hints>
</Camera>
- <Camera make="Nikon" model="E4300" mode="chdk">
+ <Camera make="Nikon" model="E4300" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">BG</ColorRow>
<ColorRow y="1">GR</ColorRow>
@@ -8459,7 +8538,7 @@
<Hint name="full_height" value="1710"/>
</Hints>
</Camera>
- <Camera make="Nikon" model="E5000" mode="chdk">
+ <Camera make="Nikon" model="E5000" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8472,7 +8551,7 @@
<Hint name="full_height" value="1925"/>
</Hints>
</Camera>
- <Camera make="Nikon" model="COOLPIX S6" mode="chdk">
+ <Camera make="Nikon" model="COOLPIX S6" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8485,7 +8564,7 @@
<Hint name="full_height" value="2118"/>
</Hints>
</Camera>
- <Camera make="Olympus" model="C770UZ" mode="chdk">
+ <Camera make="Olympus" model="C770UZ" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">BG</ColorRow>
<ColorRow y="1">GR</ColorRow>
@@ -8498,7 +8577,7 @@
<Hint name="full_height" value="1718"/>
</Hints>
</Camera>
- <Camera make="Pentax" model="Optio S" mode="chdk-a">
+ <Camera make="Pentax" model="Optio S" supported="no" mode="chdk-a">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8511,7 +8590,7 @@
<Hint name="full_height" value="1540"/>
</Hints>
</Camera>
- <Camera make="Pentax" model="Optio S" mode="chdk-b">
+ <Camera make="Pentax" model="Optio S" supported="no" mode="chdk-b">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8524,7 +8603,7 @@
<Hint name="full_height" value="1544"/>
</Hints>
</Camera>
- <Camera make="Pentax" model="Optio S4" mode="chdk">
+ <Camera make="Pentax" model="Optio S4" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8537,7 +8616,7 @@
<Hint name="full_height" value="1737"/>
</Hints>
</Camera>
- <Camera make="Pentax" model="Optio 750Z" mode="chdk">
+ <Camera make="Pentax" model="Optio 750Z" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8550,7 +8629,7 @@
<Hint name="full_height" value="2322"/>
</Hints>
</Camera>
- <Camera make="Pixelink" model="A782" mode="chdk">
+ <Camera make="Pixelink" model="A782" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">GB</ColorRow>
<ColorRow y="1">RG</ColorRow>
@@ -8563,7 +8642,7 @@
<Hint name="full_height" value="3000"/>
</Hints>
</Camera>
- <Camera make="RoverShot" model="3320AF" mode="chdk">
+ <Camera make="RoverShot" model="3320AF" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">GB</ColorRow>
<ColorRow y="1">RG</ColorRow>
@@ -8576,7 +8655,7 @@
<Hint name="full_height" value="1536"/>
</Hints>
</Camera>
- <Camera make="ST Micro" model="STV680 VGA" mode="chdk">
+ <Camera make="ST Micro" model="STV680 VGA" supported="no" mode="chdk">
<CFA2 width="2" height="2">
<ColorRow y="0">BG</ColorRow>
<ColorRow y="1">GR</ColorRow>
@@ -8589,7 +8668,7 @@
<Hint name="full_height" value="484"/>
</Hints>
</Camera>
- <Camera make="Samsung" model="S85" mode="chdk-a">
+ <Camera make="Samsung" model="S85" supported="no" mode="chdk-a">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8602,7 +8681,7 @@
<Hint name="full_height" value="2448"/>
</Hints>
</Camera>
- <Camera make="Samsung" model="S85" mode="chdk-b">
+ <Camera make="Samsung" model="S85" supported="no" mode="chdk-b">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8615,7 +8694,7 @@
<Hint name="full_height" value="2448"/>
</Hints>
</Camera>
- <Camera make="Samsung" model="WB550" mode="chdk-a">
+ <Camera make="Samsung" model="WB550" supported="no" mode="chdk-a">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8628,7 +8707,7 @@
<Hint name="full_height" value="2808"/>
</Hints>
</Camera>
- <Camera make="Samsung" model="WB550" mode="chdk-b">
+ <Camera make="Samsung" model="WB550" supported="no" mode="chdk-b">
<CFA2 width="2" height="2">
<ColorRow y="0">RG</ColorRow>
<ColorRow y="1">GB</ColorRow>
@@ -8641,7 +8720,7 @@
<Hint name="full_height" value="3000"/>
</Hints>
</Camera>
- <Camera make="Sinar" model="" mode="chdk-a">
+ <Camera make="Sinar" model="" supported="no" mode="chdk-a">
<CFA2 width="2" height="2">
<ColorRow y="0">GB</ColorRow>
<ColorRow y="1">RG</ColorRow>
@@ -8655,7 +8734,7 @@
<Hint name="offset" value="68"/>
</Hints>
</Camera>
- <Camera make="Sinar" model="" mode="chdk-b">
+ <Camera make="Sinar" model="" supported="no" mode="chdk-b">
<CFA2 width="2" height="2">
<ColorRow y="0">GB</ColorRow>
<ColorRow y="1">RG</ColorRow>
@@ -8669,7 +8748,7 @@
<Hint name="offset" value="68"/>
</Hints>
</Camera>
- <Camera make="Sinar" model="" mode="chdk-c">
+ <Camera make="Sinar" model="" supported="no" mode="chdk-c">
<CFA2 width="2" height="2">
<ColorRow y="0">GB</ColorRow>
<ColorRow y="1">RG</ColorRow>
@@ -8683,7 +8762,7 @@
<Hint name="offset" value="68"/>
</Hints>
</Camera>
- <Camera make="Sony" model="XCD-SX910CR" mode="chdk-a">
+ <Camera make="Sony" model="XCD-SX910CR" supported="no" mode="chdk-a">
<CFA2 width="2" height="2">
<ColorRow y="0">GR</ColorRow>
<ColorRow y="1">BG</ColorRow>
@@ -8696,7 +8775,7 @@
<Hint name="full_height" value="1024"/>
</Hints>
</Camera>
- <Camera make="Sony" model="XCD-SX910CR" mode="chdk-b">
+ <Camera make="Sony" model="XCD-SX910CR" supported="no" mode="chdk-b">
<CFA2 width="2" height="2">
<ColorRow y="0">GR</ColorRow>
<ColorRow y="1">BG</ColorRow>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment