[Rawstudio-commit] rawspeed r190 - / RawSpeed data

Klaus Post klauspost at gmail.com
Sat Feb 6 15:39:17 CET 2010


Author: post
Date: 2010-02-06 15:39:17 +0100 (Sat, 06 Feb 2010)
New Revision: 190

Added:
   data/
   data/cameras.xml
   data/showcameras.xsl
Removed:
   cameras.xml
   showcameras.xsl
Modified:
   RawSpeed/RawSpeed.cpp
   RawSpeed/rawstudio-plugin.makefile
Log:
Move cameras.xml into separate data directory.

Modified: RawSpeed/RawSpeed.cpp
===================================================================
--- RawSpeed/RawSpeed.cpp	2010-01-26 19:37:14 UTC (rev 189)
+++ RawSpeed/RawSpeed.cpp	2010-02-06 14:39:17 UTC (rev 190)
@@ -29,7 +29,7 @@
 
 using namespace RawSpeed;
 
-//#define _USE_GFL_
+#define _USE_GFL_
 #ifdef _USE_GFL_
 #include "libgfl.h"
 #pragma comment(lib, "libgfl.lib") 
@@ -38,7 +38,7 @@
 int startTime;
 
 // Open file, or test corrupt file
-#if 0
+#if 1
 // Open file and save as tiff
 void OpenFile(FileReader f, CameraMetaData *meta) {
   RawDecoder *d = 0;
@@ -131,7 +131,7 @@
     printf("Could not open image:%s\n", e.what());
     return;
   }
-  srand(0xC0CAC01c);  // Hardcoded seed for re-producability (on the same platform)
+  srand(0xC0CAC018);  // Hardcoded seed for re-producability (on the same platform)
 
   int tests = 100;
   // Try 50 permutations
@@ -170,7 +170,7 @@
       delete d;
     d = 0;
   }
-  srand(0xC0CAC01c);  // Hardcoded seed for re-producability (on the same platform)
+  srand(0xC0CAC018);  // Hardcoded seed for re-producability (on the same platform)
   wprintf(L"Performing truncation tests\n");
   for (int i = 0 ; i < tests; i++) {  
     // Get truncated file
@@ -206,6 +206,7 @@
       delete d;
     d = 0;
   }
+  delete m;
 }
 #endif
 
@@ -220,9 +221,16 @@
     return 1;
   }
 #endif
-  CameraMetaData meta("..\\cameras.xml");  
+  CameraMetaData meta("..\\data\\cameras.xml");  
   //meta.dumpXML();
-/*
+  OpenFile(FileReader(L"..\\testimg\\camera_dngs\\CRW_0740.DNG"),&meta);
+
+  OpenFile(FileReader(L"..\\testimg\\Sony-A500-hMULTII00200.ARW"),&meta);
+  OpenFile(FileReader(L"..\\testimg\\Sony-A500-hSLI00200_NR_1D.ARW"),&meta);
+  OpenFile(FileReader(L"..\\testimg\\Canon-1D-Mk4-A28C0180.CR2"),&meta);
+  OpenFile(FileReader(L"..\\testimg\\Canon-1D-Mk4-DD9C0097.CR2"),&meta);
+  OpenFile(FileReader(L"..\\testimg\\Canon-1D-Mk4-DD9C0069.CR2"),&meta);
+
   OpenFile(FileReader(L"..\\testimg\\Panasonic_FZ35FARI0200.RW2"),&meta);
   OpenFile(FileReader(L"..\\testimg\\Panasonic_FZ35hSLI0200.RW2"),&meta);
   OpenFile(FileReader(L"..\\testimg\\Panasonic_FZ35hVFAWB.RW2"),&meta);
@@ -297,15 +305,13 @@
   OpenFile(FileReader(L"..\\testimg\\Canon_EOS_30D-uga1.cr2"),&meta);
   OpenFile(FileReader(L"..\\testimg\\Canon_EOS_350D-3.cr2"),&meta);
   OpenFile(FileReader(L"..\\testimg\\Canon_EOS_450D-4.cr2"),&meta);
-  OpenFile(FileReader(L"..\\testimg\\Canon_EOS_50D.cr2"),&meta);*/
-  OpenFile(FileReader(L"..\\testimg\\Canon_EOS_7DhMULTII00200.CR2"),&meta);
-  OpenFile(FileReader(L"..\\testimg\\Canon_EOS_Mk2-ISO100_sRAW2.CR2"),&meta);
+  OpenFile(FileReader(L"..\\testimg\\Canon_EOS_50D.cr2"),&meta);
   OpenFile(FileReader(L"..\\testimg\\Canon_Powershot_G9-1.CR2"),&meta);
   OpenFile(FileReader(L"..\\testimg\\Nikon-D3000hMULTII0200.NEF"),&meta);
   OpenFile(FileReader(L"..\\testimg\\Nikon-D3000hSLI0200.NEF"),&meta);
   OpenFile(FileReader(L"..\\testimg\\Nikon-D3x_ISO100.NEF"),&meta);
   OpenFile(FileReader(L"..\\testimg\\Olympus-E620_NF-Std_ISO100.ORF"),&meta);
-  OpenFile(FileReader(L"..\\testimg\\Olympus-E-620-1.ORF"),&meta);
+  
   OpenFile(FileReader(L"..\\testimg\\panasonic_DMC-G1hMULTII0200.RW2"),&meta);
   OpenFile(FileReader(L"..\\testimg\\panasonic_DMC-G1hSLI0400.RW2"),&meta);
   OpenFile(FileReader(L"..\\testimg\\panasonic_lumix_dmc_g1_04_portrait.rw2"),&meta);
@@ -314,8 +320,14 @@
   OpenFile(FileReader(L"..\\testimg\\sony_a330_04.arw"),&meta);
   OpenFile(FileReader(L"..\\testimg\\sony_a330_05.arw"),&meta);
   OpenFile(FileReader(L"..\\testimg\\sony_a330_06.arw"),&meta);
-  
+  OpenFile(FileReader(L"..\\testimg\\Canon_EOS_Mk2-ISO100_sRAW2.CR2"),&meta);
+  OpenFile(FileReader(L"..\\testimg\\Canon_EOS_7DhMULTII00200.CR2"),&meta);
+  OpenFile(FileReader(L"..\\testimg\\Olympus-E-620-1.ORF"),&meta);  
   OpenFile(FileReader(L"..\\testimg\\Pentax_K10D-2.dng"),&meta);
+  OpenFile(FileReader(L"..\\testimg\\camera_dngs\\Leica-X1-L1090229.DNG"),&meta);
+  OpenFile(FileReader(L"..\\testimg\\dng\\CANON-EOS300D.dng"),&meta);
+  OpenFile(FileReader(L"..\\testimg\\dng\\KODAK-DCSPRO-linear.dng"),&meta);
+
   OpenFile(FileReader(L"..\\testimg\\Pentax_K10D.pef"),&meta);
   OpenFile(FileReader(L"..\\testimg\\Pentax_K100D.pef"),&meta);
   OpenFile(FileReader(L"..\\testimg\\Pentax_K10D.pef"),&meta);
@@ -440,7 +452,6 @@
   OpenFile(FileReader(L"..\\testimg\\dng\\CANON-EOS20D-linear.dng"),&meta);
   OpenFile(FileReader(L"..\\testimg\\dng\\CANON-EOS20D.dng"),&meta);
   OpenFile(FileReader(L"..\\testimg\\dng\\CANON-EOS300D-linear.dng"),&meta);
-  OpenFile(FileReader(L"..\\testimg\\dng\\CANON-EOS300D.dng"),&meta);
   OpenFile(FileReader(L"..\\testimg\\dng\\CANON-POWERSHOTPRO1-linear.dng"),&meta);
   OpenFile(FileReader(L"..\\testimg\\dng\\CANON-POWERSHOTPRO1.dng"),&meta);
   OpenFile(FileReader(L"..\\testimg\\dng\\Canon_EOS_1000D.dng"),&meta);
@@ -477,7 +488,6 @@
   OpenFile(FileReader(L"..\\testimg\\dng\\Canon_PowerShot_G9.dng"),&meta);
   OpenFile(FileReader(L"..\\testimg\\dng\\FUJI-FINEPIXS2PRO-linear.dng"),&meta);
   OpenFile(FileReader(L"..\\testimg\\dng\\FUJI-FINEPIXS2PRO.dng"),&meta);
-  OpenFile(FileReader(L"..\\testimg\\dng\\KODAK-DCSPRO-linear.dng"),&meta);
   OpenFile(FileReader(L"..\\testimg\\dng\\KODAK-DCSPRO.dng"),&meta);
   OpenFile(FileReader(L"..\\testimg\\dng\\M8-1-linear.dng"),&meta);
   OpenFile(FileReader(L"..\\testimg\\dng\\M8-1.dng"),&meta);
@@ -592,7 +602,6 @@
   OpenFile(FileReader(L"..\\testimg\\dng\\uncompressed3.dng"),&meta);
 
   OpenFile(FileReader(L"..\\testimg\\camera_dngs\\Leica-X1-L1090994.DNG"),&meta);
-  OpenFile(FileReader(L"..\\testimg\\camera_dngs\\Leica-X1-L1090229.DNG"),&meta);
   OpenFile(FileReader(L"..\\testimg\\camera_dngs\\Leica-X1-ISO100-L1090324.DNG"),&meta);
   OpenFile(FileReader(L"..\\testimg\\camera_dngs\\Leica_M8.dng"),&meta);
   OpenFile(FileReader(L"..\\testimg\\camera_dngs\\leica_m82_01.dng"),&meta);

Modified: RawSpeed/rawstudio-plugin.makefile
===================================================================
--- RawSpeed/rawstudio-plugin.makefile	2010-01-26 19:37:14 UTC (rev 189)
+++ RawSpeed/rawstudio-plugin.makefile	2010-02-06 14:39:17 UTC (rev 190)
@@ -57,7 +57,7 @@
 
 install: load-rawspeed.so ~/.rawstudio
 	cp -a load-rawspeed.so $(INSTALLPATH)
-	cp -a ../cameras.xml ~/.rawstudio/
+	cp -a ../data/cameras.xml ~/.rawstudio/
 
 ~/.rawstudio:
 	echo Please start Rawstudio once before installing

Deleted: cameras.xml
===================================================================
--- cameras.xml	2010-01-26 19:37:14 UTC (rev 189)
+++ cameras.xml	2010-02-06 14:39:17 UTC (rev 190)
@@ -1,971 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<?xml-stylesheet type="text/xsl" href="showcameras.xsl" ?>
-<!DOCTYPE Cameras SYSTEM "http://rawspeed.klauspost.com/dtd/cameras/1.2/cameras.dtd">
-
-<Cameras>
-  <Camera make="Canon" model="Canon EOS 20D">
-    <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="74" y="12" width="3522" height="2348"/>
-    <Sensor black="126" white="4095"/>
-  </Camera>
-  <Camera make="Canon" model="Canon EOS 30D">
-    <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="74" y="12" width="3522" height="2348"/>
-    <Sensor black="127" white="3398"/>
-  </Camera>
-  <Camera make="Canon" model="Canon EOS 350D DIGITAL">
-    <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="42" y="14" width="3474" height="2314"/>
-    <Sensor black="255" white="4095"/>
-    <Aliases><Alias>Canon EOS DIGITAL REBEL XT</Alias></Aliases>
-  </Camera>
-  <Camera make="Canon" model="Canon EOS 40D">
-    <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="30" y="18" width="3908" height="2602"/>
-    <Sensor black="1021" white="13600"/>
-  </Camera>
-  <Camera make="Canon" model="Canon EOS 40D" mode="sRaw2">
-    <Crop x="0" y="0" width="1944" height="1296"/>
-    <Sensor black="0" white="16383"/>
-  </Camera>
-  <Camera make="Canon" model="Canon EOS 450D">
-    <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="22" y="18" width="4290" height="2856"/>
-    <Sensor black="1020" white="16000"/>
-    <Aliases><Alias>Canon EOS DIGITAL REBEL XSi</Alias></Aliases>
-  </Camera>
-  <Camera make="Canon" model="Canon EOS 50D">
-    <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="64" y="52" width="4752" height="3158"/>
-    <Sensor black="900" white="16383"/>
-  </Camera>
-  <Camera make="Canon" model="Canon EOS 50D" mode="sRaw1">
-    <Crop x="0" y="0" width="3272" height="2178"/>
-    <Sensor black="0" white="16383"/>
-  </Camera>
-  <Camera make="Canon" model="Canon EOS 50D" mode="sRaw2">
-    <Crop x="0" y="0" width="2376" height="1584"/>
-    <Sensor black="0" white="16383"/>
-  </Camera>
-  <Camera make="Canon" model="Canon EOS 500D">
-    <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="62" y="30" width="4722" height="3142"/>
-    <Sensor black="1020" white="16000"/>
-    <Aliases><Alias>Canon EOS REBEL T1i</Alias></Aliases>
-  </Camera>
-  <Camera make="Canon" model="Canon EOS 5D">
-    <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="90" y="34" width="4386" height="2920"/>
-    <Sensor black="127" white="3692"/>
-  </Camera>
-  <Camera make="Canon" model="Canon EOS 5D Mark II">
-    <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="158" y="51" width="5634" height="3753"/>
-    <Sensor black="1024" white="15600"/>
-  </Camera>
-  <Camera make="Canon" model="Canon EOS 5D Mark II" mode="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" mode="sRaw2">
-    <Crop x="0" y="0" width="2808" height="1872"/>
-    <Sensor black="0" white="15600"/>
-  </Camera>
-  <Camera make="Canon" model="Canon EOS 7D">
-    <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="158" y="52" width="5202" height="3464"/>
-    <Sensor black="2000" white="16300"/>
-  </Camera>
-  <Camera make="Canon" model="Canon EOS 1000D">
-    <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="42" y="18" width="3906" height="2602"/>
-    <Sensor black="255" white="4030"/>
-    <Aliases><Alias>Canon EOS DIGITAL REBEL XS</Alias></Aliases>
-  </Camera>
-  <Camera make="Canon" model="Canon EOS 400D DIGITAL">
-    <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="42" y="18" width="3906" height="2602"/>
-    <Sensor black="255" white="3726"/>
-    <Aliases><Alias>Canon EOS DIGITAL REBEL XTi</Alias></Aliases>
-  </Camera>
-  <Camera make="Canon" model="Canon EOS-1D Mark II">
-    <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="74" y="12" width="3522" height="2348"/>
-    <Sensor black="127" white="3700"/>
-  </Camera>
-  <Camera make="Canon" model="Canon EOS-1D Mark II N">
-    <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="74" y="12" width="3522" height="2348"/>
-    <Sensor black="127" white="3700"/>
-  </Camera>
-  <Camera make="Canon" model="Canon EOS-1D Mark III">
-    <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="78" y="20" width="3906" height="2600"/>
-    <Sensor black="1023" white="15100"/>
-  </Camera>
-  <Camera make="Canon" model="Canon EOS-1D Mark IV">
-    <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="144" y="46" width="-64" height="-2"/>
-    <Sensor black="2000" white="15900"/>
-  </Camera>
-  <Camera make="Canon" model="Canon EOS-1Ds Mark II">
-    <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="98" y="13" width="5010" height="3336"/>
-    <Sensor black="126" white="4060"/>
-  </Camera>
-  <Camera make="Canon" model="Canon EOS-1Ds Mark III">
-    <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="62" y="20" width="5640" height="3752"/>
-    <Sensor black="1021" white="15100"/>
-  </Camera>
-  <Camera make="Canon" model="Canon PowerShot G11">
-    <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="10" y="18" width="-56" height="-14"/>
-    <Sensor black="120" white="4095"/>
-  </Camera>
-  <Camera make="Canon" model="Canon PowerShot G10">
-    <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="12" y="13" width="4432" height="3323"/>
-    <Sensor black="128" white="4095"/>
-  </Camera>
-  <Camera make="Canon" model="Canon PowerShot G9">
-    <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="48" y="12" width="4032" height="3024"/>
-    <Sensor black="125" white="4095"/>
-  </Camera>
-  <Camera make="Canon" model="Canon PowerShot SX1 IS">
-    <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="192" y="12" width="3958" height="2760"/>
-    <Sensor black="125" white="4095"/>
-  </Camera>
-  <Camera make="Canon" model="Canon PowerShot S90">
-    <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="10" y="18" width="-54" height="-10"/>
-    <Sensor black="125" white="4095"/>
-  </Camera>
-  <Camera make="NIKON CORPORATION" model="NIKON D100">
-    <CFA width="2" height="2">
-      <Color x="0" y="0">GREEN</Color>
-      <Color x="1" y="0">RED</Color>
-      <Color x="0" y="1">BLUE</Color>
-      <Color x="1" y="1">GREEN</Color>
-    </CFA>
-    <Crop x="0" y="0" width="3032" height="2024"/>
-    <Sensor black="0" white="4095"/>
-  </Camera>
-  <Camera make="NIKON CORPORATION" model="NIKON D1">
-    <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="2000" height="1312"/>
-    <Sensor black="0" white="4095"/>
-  </Camera>
-  <Camera make="NIKON CORPORATION" model="NIKON D1H">
-    <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="2012" height="1324"/>
-    <Sensor black="0" white="4095"/>
-  </Camera>
-  <Camera make="NIKON CORPORATION" model="NIKON D1X" supported="no">
-    <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="4024" height="1324"/>
-    <Sensor black="0" white="4095"/>
-  </Camera>
-  <Camera make="NIKON CORPORATION" model="NIKON D200">
-    <CFA width="2" height="2">
-      <Color x="0" y="0">GREEN</Color>
-      <Color x="1" y="0">RED</Color>
-      <Color x="0" y="1">BLUE</Color>
-      <Color x="1" y="1">GREEN</Color>
-    </CFA>
-    <Crop x="0" y="0" width="3900" height="2616"/>
-    <Sensor black="0" white="3880"/>
-  </Camera>
-  <Camera make="NIKON CORPORATION" model="NIKON D2H">
-    <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="2482" height="1648"/>
-    <Sensor black="0" white="3880"/>
-  </Camera>
-  <Camera make="NIKON CORPORATION" model="NIKON D2X">
-    <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="4312" height="2868"/>
-    <Sensor black="0" white="3880"/>
-  </Camera>
-  <Camera make="NIKON CORPORATION" model="NIKON D3">
-    <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="4284" height="2844"/>
-    <Sensor black="0" white="16384"/>
-  </Camera>
-  <Camera make="NIKON CORPORATION" model="NIKON D3S">
-    <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="0" height="0"/>
-    <Sensor black="0" white="16384"/>
-  </Camera>
-  <Camera make="NIKON CORPORATION" model="NIKON D3X">
-    <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="6080" height="4044"/>
-    <Sensor black="0" white="16384"/>
-  </Camera>
-  <Camera make="NIKON CORPORATION" model="NIKON D300">
-    <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="4320" height="2868"/>
-    <Sensor black="0" white="15236"/>
-  </Camera>
-  <Camera make="NIKON CORPORATION" model="NIKON D300S">
-    <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="4320" height="2868"/>
-    <Sensor black="0" white="15236"/>
-  </Camera>
-  <Camera make="NIKON CORPORATION" model="NIKON D3000">
-    <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="3898" height="2610"/>
-    <Sensor black="0" white="16383"/>
-  </Camera>
-  <Camera make="NIKON CORPORATION" model="NIKON D40">
-    <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="3038" height="2014"/>
-    <Sensor black="0" white="3880"/>
-  </Camera>
-  <Camera make="NIKON CORPORATION" model="NIKON D40X">
-    <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="4" y="0" width="3896" height="2613"/>
-    <Sensor black="0" white="3880"/>
-  </Camera>
-  <Camera make="NIKON CORPORATION" model="NIKON D5000">
-    <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="4310" height="2868"/>
-    <Sensor black="0" white="4096"/>
-  </Camera>
-  <Camera make="NIKON CORPORATION" model="NIKON D60">
-    <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="3900" height="2613"/>
-    <Sensor black="0" white="3880"/>
-  </Camera>
-  <Camera make="NIKON CORPORATION" model="NIKON D70">
-    <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="3038" height="2014"/>
-    <Sensor black="0" white="4095"/>
-  </Camera>
-  <Camera make="NIKON CORPORATION" model="NIKON D700">
-    <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="4284" height="2844"/>
-    <Sensor black="0" white="3972"/>
-  </Camera>
-  <Camera make="NIKON CORPORATION" model="NIKON D70s">
-    <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="3040" height="2014"/>
-    <Sensor black="0" white="4095"/>
-  </Camera>
-  <Camera make="NIKON CORPORATION" model="NIKON D80">
-    <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="3900" height="2611"/>
-    <Sensor black="0" white="3880"/>
-  </Camera>
-  <Camera make="NIKON CORPORATION" model="NIKON D90">
-    <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="4310" height="2868"/>
-    <Sensor black="0" white="3767"/>
-  </Camera>
-  <Camera make="NIKON" model="E5400" supported="no">
-    <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="2608" height="1950"/>
-    <Sensor black="0" white="4095"/>
-  </Camera>
-  <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>
-      <Color x="0" y="1">UNKNOWN</Color>
-      <Color x="1" y="1">UNKNOWN</Color>
-    </CFA>
-    <Crop x="0" y="0" width="2576" height="1924"/>
-    <Sensor black="0" white="65535"/>
-  </Camera>
-  <Camera make="NIKON" model="COOLPIX P6000" supported="no">
-    <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="4224" height="3168"/>
-    <Sensor black="0" white="65535"/>
-  </Camera>
-  <Camera make="NIKON" model="E8800" supported="no">
-    <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="3280" height="2454"/>
-    <Sensor black="0" white="4095"/>
-  </Camera>
-  <Camera make="OLYMPUS CORPORATION" model="C8080WZ">
-    <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="3280" height="2453"/>
-    <Sensor black="0" white="4095"/>
-  </Camera>
-  <Camera make="OLYMPUS CORPORATION" model="E-1">
-    <CFA width="2" height="2">
-      <Color x="0" y="0">GREEN</Color>
-      <Color x="1" y="0">RED</Color>
-      <Color x="0" y="1">BLUE</Color>
-      <Color x="1" y="1">GREEN</Color>
-    </CFA>
-    <Crop x="0" y="0" width="2624" height="1966"/>
-    <Sensor black="65" white="4095"/>
-  </Camera>
-  <Camera make="OLYMPUS IMAGING CORP." model="C7070WZ">
-    <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="3088" height="2309"/>
-    <Sensor black="0" white="4095"/>
-  </Camera>
-  <Camera make="OLYMPUS IMAGING CORP." model="E-3">
-    <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="3720" height="2800"/>
-    <Sensor black="65" white="4015"/>
-  </Camera>
-  <Camera make="OLYMPUS IMAGING CORP." model="E-300">
-    <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="3340" height="2504"/>
-    <Sensor black="63" white="4095"/>
-  </Camera>
-  <Camera make="OLYMPUS IMAGING CORP." model="E-330">
-    <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="3250" height="2450"/>
-    <Sensor black="77" white="4095"/>
-  </Camera>
-  <Camera make="OLYMPUS IMAGING CORP." model="E-400">
-    <CFA width="2" height="2">
-      <Color x="0" y="0">GREEN</Color>
-      <Color x="1" y="0">RED</Color>
-      <Color x="0" y="1">BLUE</Color>
-      <Color x="1" y="1">GREEN</Color>
-    </CFA>
-    <Crop x="0" y="0" width="3768" height="2840"/>
-    <Sensor black="96" white="4095"/>
-  </Camera>
-  <Camera make="OLYMPUS IMAGING CORP." model="E-410">
-    <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="3720" height="2800"/>
-    <Sensor black="72" white="3500"/>
-  </Camera>
-  <Camera make="OLYMPUS IMAGING CORP." model="E-420">
-    <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="3720" height="2800"/>
-    <Sensor black="68" white="4015"/>
-  </Camera>
-  <Camera make="OLYMPUS IMAGING CORP." model="E-500">
-    <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="3340" height="2504"/>
-    <Sensor black="63" white="3967"/>
-  </Camera>
-  <Camera make="OLYMPUS IMAGING CORP." model="E-510">
-    <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="3720" height="2800"/>
-    <Sensor black="72" white="3500"/>
-  </Camera>
-  <Camera make="OLYMPUS IMAGING CORP." model="E-520">
-    <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="3720" height="2800"/>
-    <Sensor black="69" white="4015"/>
-  </Camera>
-  <Camera make="OLYMPUS IMAGING CORP." model="E-620">
-    <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="4096" height="3072"/>
-    <Sensor black="64" white="4095"/>
-  </Camera>
-  <Camera make="OLYMPUS IMAGING CORP." model="SP350">
-    <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="3280" height="2453"/>
-    <Sensor black="0" white="4095"/>
-  </Camera>
-  <Camera make="OLYMPUS IMAGING CORP." model="SP500UZ">
-    <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="2832" height="2117"/>
-    <Sensor black="0" white="4095"/>
-  </Camera>
-  <Camera make="OLYMPUS OPTICAL CO.,LTD" model="E-10">
-    <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="2256" height="1684"/>
-    <Sensor black="32" white="1023"/>
-  </Camera>
-  <Camera make="OLYMPUS OPTICAL CO.,LTD" model="E-20,E-20N,E-20P">
-    <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="2576" height="1924"/>
-    <Sensor black="32" white="1023"/>
-  </Camera>
-  <Camera make="OLYMPUS IMAGING CORP." model="E-P1">
-    <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="4094" height="3082"/>
-    <Sensor black="55" white="4095"/>
-  </Camera>
-  <Camera make="OLYMPUS IMAGING CORP." model="E-P2">
-    <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="0" height="0"/>
-    <Sensor black="55" white="4095"/>
-  </Camera>
-  <Camera make="Panasonic" model = "DMC-FX150" mode = "4:3">
-    <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="4429" height="3324"/>
-    <Sensor black="15" white="3986"/>
-  </Camera>
-  <Camera make="Panasonic" model = "DMC-FZ28" mode = "4:3">
-    <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="3668" height="2754"/>
-    <Sensor black="15" white="3986"/>
-  </Camera>
-  <Camera make="Panasonic" model = "DMC-G1" mode="4:3">
-    <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="4018" height="3016" />
-    <Sensor black="15" white="3986"/>
-  </Camera>
-  <Camera make="Panasonic" model = "DMC-GH1" mode="4:3">
-    <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="-44" height="0"/>
-    <Sensor black="0" white="5111"/>
-  </Camera>
-  <Camera make="Panasonic" model = "DMC-GF1" mode="4:3">
-    <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="-44" height="0"/>
-    <Sensor black="0" white="4096"/>
-  </Camera>
-  <Camera make="Panasonic" model = "DMC-GH1" mode="16:9">
-    <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="-28" height="0"/>
-    <Sensor black="0" white="5111"/>
-  </Camera>
-  <Camera make="Panasonic" model = "DMC-FZ35" mode="4:3">
-    <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="-44" height="0"/>
-    <Sensor black="150" white="4800"/>
-  </Camera>
-  <Camera make="Panasonic" model = "DMC-FZ38" mode = "4:3">
-    <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="4014" height="3018"/>
-    <Sensor black="130" white="4086"/>
-  </Camera>
-  <Camera make="Panasonic" model = "DMC-LX3" mode="16:9">
-    <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" mode="4:3">
-    <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>
-      <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="3040" height="2024"/>
-    <Sensor black="127" white="3950"/>
-  </Camera>
-  <Camera make="PENTAX Corporation" model="PENTAX K10D">
-    <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="3888" height="2608"/>
-    <Sensor black="0" white="4095"/>
-  </Camera>
-  <Camera make="PENTAX Corporation" model="PENTAX K20D">
-    <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="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 K-x">
-    <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="-44" height="-2"/>
-    <Sensor black="41" 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>
-      <Color x="1" y="0">RED</Color>
-      <Color x="0" y="1">BLUE</Color>
-      <Color x="1" y="1">GREEN</Color>
-    </CFA>
-    <Crop x="0" y="0" width="3880" height="2600"/>
-    <Sensor black="0" white="4095"/>
-  </Camera>
-  <Camera make="SONY" model="DSLR-A200">
-    <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="3878" height="2600"/>
-    <Sensor black="0" white="4095"/>
-  </Camera>
-  <Camera make="SONY" model="DSLR-A300">
-    <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="3878" height="2600"/>
-    <Sensor black="0" white="4095"/>
-  </Camera>
-  <Camera make="SONY" model="DSLR-A330">
-    <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="3878" height="2600"/>
-    <Sensor black="0" white="4095"/>
-  </Camera>
-  <Camera make="SONY" model="DSLR-A350">
-    <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="4599" height="3064"/>
-    <Sensor black="0" white="4095"/>
-  </Camera>
-  <Camera make="SONY" model="DSLR-A500">
-    <CFA width="2" height="2">
-      <Color x="1" y="1">BLUE</Color>
-      <Color x="1" y="0">GREEN</Color>
-      <Color x="0" y="1">GREEN</Color>
-      <Color x="0" y="0">RED</Color>
-    </CFA>
-    <Crop x="0" y="0" width="0" height="0"/>
-    <Sensor black="500" white="16600"/>
-  </Camera>
-  <Camera make="SONY" model="DSLR-A550">
-    <CFA width="2" height="2">
-      <Color x="1" y="1">BLUE</Color>
-      <Color x="1" y="0">GREEN</Color>
-      <Color x="0" y="1">GREEN</Color>
-      <Color x="0" y="0">RED</Color>
-    </CFA>
-    <Crop x="0" y="0" width="0" height="0"/>
-    <Sensor black="500" white="15000"/>
-  </Camera>
-  <Camera make="SONY" model="DSLR-A700" supported="yes">
-    <CFA width="2" height="2">
-      <Color x="1" y="1">BLUE</Color>
-      <Color x="1" y="0">GREEN</Color>
-      <Color x="0" y="1">GREEN</Color>
-      <Color x="0" y="0">RED</Color>
-    </CFA>
-    <Crop x="0" y="0" width="4288" height="2856"/>
-    <Sensor black="520" white="16383"/>
-  </Camera>
-  <Camera make="SONY" model="DSLR-A850" supported="yes">
-    <CFA width="2" height="2">
-      <Color x="1" y="1">BLUE</Color>
-      <Color x="1" y="0">GREEN</Color>
-      <Color x="0" y="1">GREEN</Color>
-      <Color x="0" y="0">RED</Color>
-    </CFA>
-    <Crop x="0" y="0" width="6080" height="4048"/>
-    <Sensor black="500" white="15000"/>
-  </Camera>
-  <Camera make="SONY" model="DSLR-A900" supported="yes">
-    <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="6080" height="4048"/>
-    <Sensor black="520" white="16383"/>
-  </Camera>
-</Cameras>

Copied: data/cameras.xml (from rev 189, cameras.xml)
===================================================================
--- data/cameras.xml	                        (rev 0)
+++ data/cameras.xml	2010-02-06 14:39:17 UTC (rev 190)
@@ -0,0 +1,971 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<?xml-stylesheet type="text/xsl" href="showcameras.xsl" ?>
+<!DOCTYPE Cameras SYSTEM "http://rawspeed.klauspost.com/dtd/cameras/1.2/cameras.dtd">
+
+<Cameras>
+  <Camera make="Canon" model="Canon EOS 20D">
+    <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="74" y="12" width="3522" height="2348"/>
+    <Sensor black="126" white="4095"/>
+  </Camera>
+  <Camera make="Canon" model="Canon EOS 30D">
+    <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="74" y="12" width="3522" height="2348"/>
+    <Sensor black="127" white="3398"/>
+  </Camera>
+  <Camera make="Canon" model="Canon EOS 350D DIGITAL">
+    <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="42" y="14" width="3474" height="2314"/>
+    <Sensor black="255" white="4095"/>
+    <Aliases><Alias>Canon EOS DIGITAL REBEL XT</Alias></Aliases>
+  </Camera>
+  <Camera make="Canon" model="Canon EOS 40D">
+    <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="30" y="18" width="3908" height="2602"/>
+    <Sensor black="1021" white="13600"/>
+  </Camera>
+  <Camera make="Canon" model="Canon EOS 40D" mode="sRaw2">
+    <Crop x="0" y="0" width="1944" height="1296"/>
+    <Sensor black="0" white="16383"/>
+  </Camera>
+  <Camera make="Canon" model="Canon EOS 450D">
+    <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="22" y="18" width="4290" height="2856"/>
+    <Sensor black="1020" white="16000"/>
+    <Aliases><Alias>Canon EOS DIGITAL REBEL XSi</Alias></Aliases>
+  </Camera>
+  <Camera make="Canon" model="Canon EOS 50D">
+    <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="64" y="52" width="4752" height="3158"/>
+    <Sensor black="900" white="16383"/>
+  </Camera>
+  <Camera make="Canon" model="Canon EOS 50D" mode="sRaw1">
+    <Crop x="0" y="0" width="3272" height="2178"/>
+    <Sensor black="0" white="16383"/>
+  </Camera>
+  <Camera make="Canon" model="Canon EOS 50D" mode="sRaw2">
+    <Crop x="0" y="0" width="2376" height="1584"/>
+    <Sensor black="0" white="16383"/>
+  </Camera>
+  <Camera make="Canon" model="Canon EOS 500D">
+    <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="62" y="30" width="4722" height="3142"/>
+    <Sensor black="1020" white="16000"/>
+    <Aliases><Alias>Canon EOS REBEL T1i</Alias></Aliases>
+  </Camera>
+  <Camera make="Canon" model="Canon EOS 5D">
+    <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="90" y="34" width="4386" height="2920"/>
+    <Sensor black="127" white="3692"/>
+  </Camera>
+  <Camera make="Canon" model="Canon EOS 5D Mark II">
+    <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="158" y="51" width="5634" height="3753"/>
+    <Sensor black="1024" white="15600"/>
+  </Camera>
+  <Camera make="Canon" model="Canon EOS 5D Mark II" mode="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" mode="sRaw2">
+    <Crop x="0" y="0" width="2808" height="1872"/>
+    <Sensor black="0" white="15600"/>
+  </Camera>
+  <Camera make="Canon" model="Canon EOS 7D">
+    <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="158" y="52" width="5202" height="3464"/>
+    <Sensor black="2000" white="16300"/>
+  </Camera>
+  <Camera make="Canon" model="Canon EOS 1000D">
+    <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="42" y="18" width="3906" height="2602"/>
+    <Sensor black="255" white="4030"/>
+    <Aliases><Alias>Canon EOS DIGITAL REBEL XS</Alias></Aliases>
+  </Camera>
+  <Camera make="Canon" model="Canon EOS 400D DIGITAL">
+    <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="42" y="18" width="3906" height="2602"/>
+    <Sensor black="255" white="3726"/>
+    <Aliases><Alias>Canon EOS DIGITAL REBEL XTi</Alias></Aliases>
+  </Camera>
+  <Camera make="Canon" model="Canon EOS-1D Mark II">
+    <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="74" y="12" width="3522" height="2348"/>
+    <Sensor black="127" white="3700"/>
+  </Camera>
+  <Camera make="Canon" model="Canon EOS-1D Mark II N">
+    <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="74" y="12" width="3522" height="2348"/>
+    <Sensor black="127" white="3700"/>
+  </Camera>
+  <Camera make="Canon" model="Canon EOS-1D Mark III">
+    <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="78" y="20" width="3906" height="2600"/>
+    <Sensor black="1023" white="15100"/>
+  </Camera>
+  <Camera make="Canon" model="Canon EOS-1D Mark IV">
+    <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="144" y="46" width="-64" height="-2"/>
+    <Sensor black="2000" white="15900"/>
+  </Camera>
+  <Camera make="Canon" model="Canon EOS-1Ds Mark II">
+    <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="98" y="13" width="5010" height="3336"/>
+    <Sensor black="126" white="4060"/>
+  </Camera>
+  <Camera make="Canon" model="Canon EOS-1Ds Mark III">
+    <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="62" y="20" width="5640" height="3752"/>
+    <Sensor black="1021" white="15100"/>
+  </Camera>
+  <Camera make="Canon" model="Canon PowerShot G11">
+    <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="10" y="18" width="-56" height="-14"/>
+    <Sensor black="120" white="4095"/>
+  </Camera>
+  <Camera make="Canon" model="Canon PowerShot G10">
+    <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="12" y="13" width="4432" height="3323"/>
+    <Sensor black="128" white="4095"/>
+  </Camera>
+  <Camera make="Canon" model="Canon PowerShot G9">
+    <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="48" y="12" width="4032" height="3024"/>
+    <Sensor black="125" white="4095"/>
+  </Camera>
+  <Camera make="Canon" model="Canon PowerShot SX1 IS">
+    <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="192" y="12" width="3958" height="2760"/>
+    <Sensor black="125" white="4095"/>
+  </Camera>
+  <Camera make="Canon" model="Canon PowerShot S90">
+    <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="10" y="18" width="-54" height="-10"/>
+    <Sensor black="125" white="4095"/>
+  </Camera>
+  <Camera make="NIKON CORPORATION" model="NIKON D100">
+    <CFA width="2" height="2">
+      <Color x="0" y="0">GREEN</Color>
+      <Color x="1" y="0">RED</Color>
+      <Color x="0" y="1">BLUE</Color>
+      <Color x="1" y="1">GREEN</Color>
+    </CFA>
+    <Crop x="0" y="0" width="3032" height="2024"/>
+    <Sensor black="0" white="4095"/>
+  </Camera>
+  <Camera make="NIKON CORPORATION" model="NIKON D1">
+    <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="2000" height="1312"/>
+    <Sensor black="0" white="4095"/>
+  </Camera>
+  <Camera make="NIKON CORPORATION" model="NIKON D1H">
+    <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="2012" height="1324"/>
+    <Sensor black="0" white="4095"/>
+  </Camera>
+  <Camera make="NIKON CORPORATION" model="NIKON D1X" supported="no">
+    <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="4024" height="1324"/>
+    <Sensor black="0" white="4095"/>
+  </Camera>
+  <Camera make="NIKON CORPORATION" model="NIKON D200">
+    <CFA width="2" height="2">
+      <Color x="0" y="0">GREEN</Color>
+      <Color x="1" y="0">RED</Color>
+      <Color x="0" y="1">BLUE</Color>
+      <Color x="1" y="1">GREEN</Color>
+    </CFA>
+    <Crop x="0" y="0" width="3900" height="2616"/>
+    <Sensor black="0" white="3880"/>
+  </Camera>
+  <Camera make="NIKON CORPORATION" model="NIKON D2H">
+    <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="2482" height="1648"/>
+    <Sensor black="0" white="3880"/>
+  </Camera>
+  <Camera make="NIKON CORPORATION" model="NIKON D2X">
+    <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="4312" height="2868"/>
+    <Sensor black="0" white="3880"/>
+  </Camera>
+  <Camera make="NIKON CORPORATION" model="NIKON D3">
+    <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="4284" height="2844"/>
+    <Sensor black="0" white="16384"/>
+  </Camera>
+  <Camera make="NIKON CORPORATION" model="NIKON D3S">
+    <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="0" height="0"/>
+    <Sensor black="0" white="16384"/>
+  </Camera>
+  <Camera make="NIKON CORPORATION" model="NIKON D3X">
+    <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="6080" height="4044"/>
+    <Sensor black="0" white="16384"/>
+  </Camera>
+  <Camera make="NIKON CORPORATION" model="NIKON D300">
+    <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="4320" height="2868"/>
+    <Sensor black="0" white="15236"/>
+  </Camera>
+  <Camera make="NIKON CORPORATION" model="NIKON D300S">
+    <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="4320" height="2868"/>
+    <Sensor black="0" white="15236"/>
+  </Camera>
+  <Camera make="NIKON CORPORATION" model="NIKON D3000">
+    <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="3898" height="2610"/>
+    <Sensor black="0" white="16383"/>
+  </Camera>
+  <Camera make="NIKON CORPORATION" model="NIKON D40">
+    <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="3038" height="2014"/>
+    <Sensor black="0" white="3880"/>
+  </Camera>
+  <Camera make="NIKON CORPORATION" model="NIKON D40X">
+    <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="4" y="0" width="3896" height="2613"/>
+    <Sensor black="0" white="3880"/>
+  </Camera>
+  <Camera make="NIKON CORPORATION" model="NIKON D5000">
+    <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="4310" height="2868"/>
+    <Sensor black="0" white="4096"/>
+  </Camera>
+  <Camera make="NIKON CORPORATION" model="NIKON D60">
+    <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="3900" height="2613"/>
+    <Sensor black="0" white="3880"/>
+  </Camera>
+  <Camera make="NIKON CORPORATION" model="NIKON D70">
+    <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="3038" height="2014"/>
+    <Sensor black="0" white="4095"/>
+  </Camera>
+  <Camera make="NIKON CORPORATION" model="NIKON D700">
+    <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="4284" height="2844"/>
+    <Sensor black="0" white="3972"/>
+  </Camera>
+  <Camera make="NIKON CORPORATION" model="NIKON D70s">
+    <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="3040" height="2014"/>
+    <Sensor black="0" white="4095"/>
+  </Camera>
+  <Camera make="NIKON CORPORATION" model="NIKON D80">
+    <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="3900" height="2611"/>
+    <Sensor black="0" white="3880"/>
+  </Camera>
+  <Camera make="NIKON CORPORATION" model="NIKON D90">
+    <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="4310" height="2868"/>
+    <Sensor black="0" white="3767"/>
+  </Camera>
+  <Camera make="NIKON" model="E5400" supported="no">
+    <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="2608" height="1950"/>
+    <Sensor black="0" white="4095"/>
+  </Camera>
+  <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>
+      <Color x="0" y="1">UNKNOWN</Color>
+      <Color x="1" y="1">UNKNOWN</Color>
+    </CFA>
+    <Crop x="0" y="0" width="2576" height="1924"/>
+    <Sensor black="0" white="65535"/>
+  </Camera>
+  <Camera make="NIKON" model="COOLPIX P6000" supported="no">
+    <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="4224" height="3168"/>
+    <Sensor black="0" white="65535"/>
+  </Camera>
+  <Camera make="NIKON" model="E8800" supported="no">
+    <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="3280" height="2454"/>
+    <Sensor black="0" white="4095"/>
+  </Camera>
+  <Camera make="OLYMPUS CORPORATION" model="C8080WZ">
+    <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="3280" height="2453"/>
+    <Sensor black="0" white="4095"/>
+  </Camera>
+  <Camera make="OLYMPUS CORPORATION" model="E-1">
+    <CFA width="2" height="2">
+      <Color x="0" y="0">GREEN</Color>
+      <Color x="1" y="0">RED</Color>
+      <Color x="0" y="1">BLUE</Color>
+      <Color x="1" y="1">GREEN</Color>
+    </CFA>
+    <Crop x="0" y="0" width="2624" height="1966"/>
+    <Sensor black="65" white="4095"/>
+  </Camera>
+  <Camera make="OLYMPUS IMAGING CORP." model="C7070WZ">
+    <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="3088" height="2309"/>
+    <Sensor black="0" white="4095"/>
+  </Camera>
+  <Camera make="OLYMPUS IMAGING CORP." model="E-3">
+    <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="3720" height="2800"/>
+    <Sensor black="65" white="4015"/>
+  </Camera>
+  <Camera make="OLYMPUS IMAGING CORP." model="E-300">
+    <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="3340" height="2504"/>
+    <Sensor black="63" white="4095"/>
+  </Camera>
+  <Camera make="OLYMPUS IMAGING CORP." model="E-330">
+    <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="3250" height="2450"/>
+    <Sensor black="77" white="4095"/>
+  </Camera>
+  <Camera make="OLYMPUS IMAGING CORP." model="E-400">
+    <CFA width="2" height="2">
+      <Color x="0" y="0">GREEN</Color>
+      <Color x="1" y="0">RED</Color>
+      <Color x="0" y="1">BLUE</Color>
+      <Color x="1" y="1">GREEN</Color>
+    </CFA>
+    <Crop x="0" y="0" width="3768" height="2840"/>
+    <Sensor black="96" white="4095"/>
+  </Camera>
+  <Camera make="OLYMPUS IMAGING CORP." model="E-410">
+    <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="3720" height="2800"/>
+    <Sensor black="72" white="3500"/>
+  </Camera>
+  <Camera make="OLYMPUS IMAGING CORP." model="E-420">
+    <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="3720" height="2800"/>
+    <Sensor black="68" white="4015"/>
+  </Camera>
+  <Camera make="OLYMPUS IMAGING CORP." model="E-500">
+    <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="3340" height="2504"/>
+    <Sensor black="63" white="3967"/>
+  </Camera>
+  <Camera make="OLYMPUS IMAGING CORP." model="E-510">
+    <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="3720" height="2800"/>
+    <Sensor black="72" white="3500"/>
+  </Camera>
+  <Camera make="OLYMPUS IMAGING CORP." model="E-520">
+    <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="3720" height="2800"/>
+    <Sensor black="69" white="4015"/>
+  </Camera>
+  <Camera make="OLYMPUS IMAGING CORP." model="E-620">
+    <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="4096" height="3072"/>
+    <Sensor black="64" white="4095"/>
+  </Camera>
+  <Camera make="OLYMPUS IMAGING CORP." model="SP350">
+    <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="3280" height="2453"/>
+    <Sensor black="0" white="4095"/>
+  </Camera>
+  <Camera make="OLYMPUS IMAGING CORP." model="SP500UZ">
+    <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="2832" height="2117"/>
+    <Sensor black="0" white="4095"/>
+  </Camera>
+  <Camera make="OLYMPUS OPTICAL CO.,LTD" model="E-10">
+    <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="2256" height="1684"/>
+    <Sensor black="32" white="1023"/>
+  </Camera>
+  <Camera make="OLYMPUS OPTICAL CO.,LTD" model="E-20,E-20N,E-20P">
+    <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="2576" height="1924"/>
+    <Sensor black="32" white="1023"/>
+  </Camera>
+  <Camera make="OLYMPUS IMAGING CORP." model="E-P1">
+    <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="4094" height="3082"/>
+    <Sensor black="55" white="4095"/>
+  </Camera>
+  <Camera make="OLYMPUS IMAGING CORP." model="E-P2">
+    <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="0" height="0"/>
+    <Sensor black="55" white="4095"/>
+  </Camera>
+  <Camera make="Panasonic" model = "DMC-FX150" mode = "4:3">
+    <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="4429" height="3324"/>
+    <Sensor black="15" white="3986"/>
+  </Camera>
+  <Camera make="Panasonic" model = "DMC-FZ28" mode = "4:3">
+    <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="3668" height="2754"/>
+    <Sensor black="15" white="3986"/>
+  </Camera>
+  <Camera make="Panasonic" model = "DMC-G1" mode="4:3">
+    <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="4018" height="3016" />
+    <Sensor black="15" white="3986"/>
+  </Camera>
+  <Camera make="Panasonic" model = "DMC-GH1" mode="4:3">
+    <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="-44" height="0"/>
+    <Sensor black="0" white="5111"/>
+  </Camera>
+  <Camera make="Panasonic" model = "DMC-GF1" mode="4:3">
+    <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="-44" height="0"/>
+    <Sensor black="0" white="4096"/>
+  </Camera>
+  <Camera make="Panasonic" model = "DMC-GH1" mode="16:9">
+    <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="-28" height="0"/>
+    <Sensor black="0" white="5111"/>
+  </Camera>
+  <Camera make="Panasonic" model = "DMC-FZ35" mode="4:3">
+    <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="-44" height="0"/>
+    <Sensor black="150" white="4800"/>
+  </Camera>
+  <Camera make="Panasonic" model = "DMC-FZ38" mode = "4:3">
+    <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="4014" height="3018"/>
+    <Sensor black="130" white="4086"/>
+  </Camera>
+  <Camera make="Panasonic" model = "DMC-LX3" mode="16:9">
+    <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" mode="4:3">
+    <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>
+      <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="3040" height="2024"/>
+    <Sensor black="127" white="3950"/>
+  </Camera>
+  <Camera make="PENTAX Corporation" model="PENTAX K10D">
+    <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="3888" height="2608"/>
+    <Sensor black="0" white="4095"/>
+  </Camera>
+  <Camera make="PENTAX Corporation" model="PENTAX K20D">
+    <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="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 K-x">
+    <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="-44" height="-2"/>
+    <Sensor black="41" 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>
+      <Color x="1" y="0">RED</Color>
+      <Color x="0" y="1">BLUE</Color>
+      <Color x="1" y="1">GREEN</Color>
+    </CFA>
+    <Crop x="0" y="0" width="3880" height="2600"/>
+    <Sensor black="0" white="4095"/>
+  </Camera>
+  <Camera make="SONY" model="DSLR-A200">
+    <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="3878" height="2600"/>
+    <Sensor black="0" white="4095"/>
+  </Camera>
+  <Camera make="SONY" model="DSLR-A300">
+    <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="3878" height="2600"/>
+    <Sensor black="0" white="4095"/>
+  </Camera>
+  <Camera make="SONY" model="DSLR-A330">
+    <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="3878" height="2600"/>
+    <Sensor black="0" white="4095"/>
+  </Camera>
+  <Camera make="SONY" model="DSLR-A350">
+    <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="4599" height="3064"/>
+    <Sensor black="0" white="4095"/>
+  </Camera>
+  <Camera make="SONY" model="DSLR-A500">
+    <CFA width="2" height="2">
+      <Color x="1" y="1">BLUE</Color>
+      <Color x="1" y="0">GREEN</Color>
+      <Color x="0" y="1">GREEN</Color>
+      <Color x="0" y="0">RED</Color>
+    </CFA>
+    <Crop x="0" y="0" width="0" height="0"/>
+    <Sensor black="500" white="16600"/>
+  </Camera>
+  <Camera make="SONY" model="DSLR-A550">
+    <CFA width="2" height="2">
+      <Color x="1" y="1">BLUE</Color>
+      <Color x="1" y="0">GREEN</Color>
+      <Color x="0" y="1">GREEN</Color>
+      <Color x="0" y="0">RED</Color>
+    </CFA>
+    <Crop x="0" y="0" width="0" height="0"/>
+    <Sensor black="500" white="15000"/>
+  </Camera>
+  <Camera make="SONY" model="DSLR-A700" supported="yes">
+    <CFA width="2" height="2">
+      <Color x="1" y="1">BLUE</Color>
+      <Color x="1" y="0">GREEN</Color>
+      <Color x="0" y="1">GREEN</Color>
+      <Color x="0" y="0">RED</Color>
+    </CFA>
+    <Crop x="0" y="0" width="4288" height="2856"/>
+    <Sensor black="520" white="16383"/>
+  </Camera>
+  <Camera make="SONY" model="DSLR-A850" supported="yes">
+    <CFA width="2" height="2">
+      <Color x="1" y="1">BLUE</Color>
+      <Color x="1" y="0">GREEN</Color>
+      <Color x="0" y="1">GREEN</Color>
+      <Color x="0" y="0">RED</Color>
+    </CFA>
+    <Crop x="0" y="0" width="6080" height="4048"/>
+    <Sensor black="500" white="15000"/>
+  </Camera>
+  <Camera make="SONY" model="DSLR-A900" supported="yes">
+    <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="6080" height="4048"/>
+    <Sensor black="520" white="16383"/>
+  </Camera>
+</Cameras>

Copied: data/showcameras.xsl (from rev 189, showcameras.xsl)
===================================================================
--- data/showcameras.xsl	                        (rev 0)
+++ data/showcameras.xsl	2010-02-06 14:39:17 UTC (rev 190)
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+<xsl:output method = "html" indent = "yes" />
+<xsl:template match="/">
+
+<html>
+	<head>
+		<title>Known RawSpeed Cameras</title>
+		<style type="text/css">
+			body {
+				font-family:Verdana;font-size:12pt;background-color:#ffffff;
+			}
+			h1 {
+				font-size:16pt;padding:8px;
+			}
+			h2 {
+				background-color:teal;color:white;padding:8px;font-size:13pt;
+			}
+			span.param {
+				font-style:italic;color:#666;
+			}
+			div.text {
+				margin-left:20px;margin-bottom:15px;font-size:10pt;margin-top:0px;line-height:120%;
+			}
+		</style>
+	</head>
+
+	<body>
+		<h1>The <xsl:value-of select="count(Cameras/Camera)"/> Known RawSpeed Cameras and Modes:</h1>
+		<xsl:for-each select="Cameras/Camera">
+		<xsl:sort data-type = "text" select = "concat(@make, at model)"/>
+			<h2>
+				<span style="font-weight:bold"><xsl:value-of select="@make"/></span>
+				- <xsl:value-of select="@model"/>
+				<xsl:if test="@mode != ''">, Mode: <span style="font-style:italic;"><xsl:value-of select="@mode"/></span></xsl:if>
+			</h2>
+			<div class="text">
+         <xsl:for-each select="Aliases/Alias">
+            <p>Also known as: <span class="param">&quot;<xsl:value-of select="."/>&quot;</span></p>
+         </xsl:for-each>
+
+				<xsl:variable name = "supported" ><xsl:value-of select="@supported"/></xsl:variable>
+				<xsl:if test ="$supported = 'no'">Supported: <span style="color:red;font-style:italic;">No.</span></xsl:if>
+					<xsl:if test ="not($supported = 'no')">Supported: <span style="color:green;font-style:italic;">Yes.</span>
+					<br/>
+					Crop Top,Left: <span class="param"><xsl:value-of select="Crop/@x"/>,<xsl:value-of select="Crop/@y"/> pixels.</span>
+					<br/>
+					<xsl:if test ="Crop/@height &gt; 0">
+					Cropped Image Size: <span class="param"><xsl:value-of select="Crop/@width"/>x<xsl:value-of select="Crop/@height"/></span> pixels.
+					</xsl:if>
+					<xsl:if test ="Crop/@height &lt; 1">
+					Crop Right,Bottom: <span class="param"><xsl:value-of select="-(Crop/@width)"/>,<xsl:value-of select="-(Crop/@height)"/></span> pixels.
+					</xsl:if>
+					<br/>
+					Sensor Black: <span class="param"><xsl:value-of select="Sensor/@black"/></span>, White:
+					<span class="param"><xsl:value-of select="Sensor/@white"/>.</span>
+					<br/>
+					Uncropped Sensor Colors Positions:<br/>
+					<xsl:for-each select="CFA/Color">
+						<xsl:sort data-type = "number" select = "@y*2+ at x"/>
+						<xsl:variable name = "color" ><xsl:value-of select="."/></xsl:variable>
+						<xsl:if test="position()=last()-1"><br/></xsl:if>						
+						<xsl:if test ="$color = 'RED'"><span class="param" style="color:red;">[<xsl:copy-of select="$color" />]</span></xsl:if>
+						<xsl:if test ="$color = 'GREEN'"><span class="param" style="color:green;">[<xsl:copy-of select="$color" />]</span></xsl:if>
+						<xsl:if test ="$color = 'BLUE'"><span class="param" style="color:blue;">[<xsl:copy-of select="$color" />]</span></xsl:if>
+					</xsl:for-each>
+					<xsl:for-each select="Hints/Hint">
+					  <br/>
+            Decoder Hint: <span class="param">&quot;<xsl:value-of select="@name"/>&quot;</span>:<span class="param">&quot;<xsl:value-of select="@value"/>&quot;</span> 
+          </xsl:for-each>
+				 </xsl:if>
+			</div>
+		 <br/>
+		</xsl:for-each>
+
+	</body>
+</html>
+
+</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file

Deleted: showcameras.xsl
===================================================================
--- showcameras.xsl	2010-01-26 19:37:14 UTC (rev 189)
+++ showcameras.xsl	2010-02-06 14:39:17 UTC (rev 190)
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<xsl:output method = "html" indent = "yes" />
-<xsl:template match="/">
-
-<html>
-	<head>
-		<title>Known RawSpeed Cameras</title>
-		<style type="text/css">
-			body {
-				font-family:Verdana;font-size:12pt;background-color:#ffffff;
-			}
-			h1 {
-				font-size:16pt;padding:8px;
-			}
-			h2 {
-				background-color:teal;color:white;padding:8px;font-size:13pt;
-			}
-			span.param {
-				font-style:italic;color:#666;
-			}
-			div.text {
-				margin-left:20px;margin-bottom:15px;font-size:10pt;margin-top:0px;line-height:120%;
-			}
-		</style>
-	</head>
-
-	<body>
-		<h1>The <xsl:value-of select="count(Cameras/Camera)"/> Known RawSpeed Cameras and Modes:</h1>
-		<xsl:for-each select="Cameras/Camera">
-		<xsl:sort data-type = "text" select = "concat(@make, at model)"/>
-			<h2>
-				<span style="font-weight:bold"><xsl:value-of select="@make"/></span>
-				- <xsl:value-of select="@model"/>
-				<xsl:if test="@mode != ''">, Mode: <span style="font-style:italic;"><xsl:value-of select="@mode"/></span></xsl:if>
-			</h2>
-			<div class="text">
-         <xsl:for-each select="Aliases/Alias">
-            <p>Also known as: <span class="param">&quot;<xsl:value-of select="."/>&quot;</span></p>
-         </xsl:for-each>
-
-				<xsl:variable name = "supported" ><xsl:value-of select="@supported"/></xsl:variable>
-				<xsl:if test ="$supported = 'no'">Supported: <span style="color:red;font-style:italic;">No.</span></xsl:if>
-					<xsl:if test ="not($supported = 'no')">Supported: <span style="color:green;font-style:italic;">Yes.</span>
-					<br/>
-					Crop Top,Left: <span class="param"><xsl:value-of select="Crop/@x"/>,<xsl:value-of select="Crop/@y"/> pixels.</span>
-					<br/>
-					<xsl:if test ="Crop/@height &gt; 0">
-					Cropped Image Size: <span class="param"><xsl:value-of select="Crop/@width"/>x<xsl:value-of select="Crop/@height"/></span> pixels.
-					</xsl:if>
-					<xsl:if test ="Crop/@height &lt; 1">
-					Crop Right,Bottom: <span class="param"><xsl:value-of select="-(Crop/@width)"/>,<xsl:value-of select="-(Crop/@height)"/></span> pixels.
-					</xsl:if>
-					<br/>
-					Sensor Black: <span class="param"><xsl:value-of select="Sensor/@black"/></span>, White:
-					<span class="param"><xsl:value-of select="Sensor/@white"/>.</span>
-					<br/>
-					Uncropped Sensor Colors Positions:<br/>
-					<xsl:for-each select="CFA/Color">
-						<xsl:sort data-type = "number" select = "@y*2+ at x"/>
-						<xsl:variable name = "color" ><xsl:value-of select="."/></xsl:variable>
-						<xsl:if test="position()=last()-1"><br/></xsl:if>						
-						<xsl:if test ="$color = 'RED'"><span class="param" style="color:red;">[<xsl:copy-of select="$color" />]</span></xsl:if>
-						<xsl:if test ="$color = 'GREEN'"><span class="param" style="color:green;">[<xsl:copy-of select="$color" />]</span></xsl:if>
-						<xsl:if test ="$color = 'BLUE'"><span class="param" style="color:blue;">[<xsl:copy-of select="$color" />]</span></xsl:if>
-					</xsl:for-each>
-					<xsl:for-each select="Hints/Hint">
-					  <br/>
-            Decoder Hint: <span class="param">&quot;<xsl:value-of select="@name"/>&quot;</span>:<span class="param">&quot;<xsl:value-of select="@value"/>&quot;</span> 
-          </xsl:for-each>
-				 </xsl:if>
-			</div>
-		 <br/>
-		</xsl:for-each>
-
-	</body>
-</html>
-
-</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file




More information about the Rawstudio-commit mailing list