API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Jul 11th, 2015
52
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 271.41 KB | None | 0 0
raw download clone embed print report
  1. diff -urNr "darktable rawspeed/data/cameras.xml" rawspeed-develop/data/cameras.xml
  2. --- "darktable rawspeed/data/cameras.xml"   2015-06-07 11:40:16.000000000 +0200
  3. +++ rawspeed-develop/data/cameras.xml   2015-06-24 14:24:33.000000000 +0200
  4. @@ -13,7 +13,7 @@
  5.  <!DOCTYPE Cameras [
  6.  <!ELEMENT BlackAreas ( Vertical*, Horizontal* ) >
  7.  
  8. -<!ELEMENT Camera ( CFA?, CFA2?, Crop, Sensor+, BlackAreas?, Aliases?, Hints? ) >
  9. +<!ELEMENT Camera ( CFA?, CFA2?, Crop, Sensor+, BlackAreas?, Aliases?, Hints?, ID? ) >
  10.  <!ATTLIST Camera make CDATA #REQUIRED >
  11.  <!ATTLIST Camera model CDATA #REQUIRED >
  12.  <!ATTLIST Camera supported CDATA #IMPLIED >
  13. @@ -66,11 +66,27 @@
  14.  <!ATTLIST Hint value CDATA #REQUIRED >
  15.  
  16.  <!ELEMENT Aliases ( Alias+ ) >
  17. +<!ATTLIST Alias id CDATA #IMPLIED >
  18.  <!ELEMENT Alias (#PCDATA) >
  19. +
  20. +<!ELEMENT ID (#PCDATA) >
  21. +<!ATTLIST Camera make CDATA #REQUIRED >
  22. +<!ATTLIST Camera model CDATA #REQUIRED >
  23.  ]>
  24.  
  25.  <Cameras>
  26. +   <Camera make="ARRI" model="ALEXA">
  27. +       <CFA width="2" height="2">
  28. +           <Color x="0" y="0">GREEN</Color>
  29. +           <Color x="1" y="0">RED</Color>
  30. +           <Color x="0" y="1">BLUE</Color>
  31. +           <Color x="1" y="1">GREEN</Color>
  32. +       </CFA>
  33. +       <Crop x="0" y="0" width="0" height="0"/>
  34. +       <Sensor black="0" white="4095"/>
  35. +   </Camera>
  36.     <Camera make="Canon" model="Canon EOS 100D">
  37. +       <ID make="Canon" model="EOS 100D">Canon EOS 100D</ID>
  38.         <CFA width="2" height="2">
  39.             <Color x="0" y="0">RED</Color>
  40.             <Color x="1" y="0">GREEN</Color>
  41. @@ -84,11 +100,12 @@
  42.             <Horizontal y="8" height="44"/>
  43.         </BlackAreas>
  44.         <Aliases>
  45. -           <Alias>Canon EOS REBEL SL1</Alias>
  46. -           <Alias>Canon EOS Kiss X7</Alias>
  47. +           <Alias id="EOS Rebel SL1">Canon EOS REBEL SL1</Alias>
  48. +           <Alias id="EOS Kiss X7">Canon EOS Kiss X7</Alias>
  49.         </Aliases>
  50.     </Camera>
  51.     <Camera make="Canon" model="Canon EOS 300D DIGITAL">
  52. +       <ID make="Canon" model="EOS 300D">Canon EOS 300D</ID>
  53.         <CFA width="2" height="2">
  54.             <Color x="0" y="0">RED</Color>
  55.             <Color x="1" y="0">GREEN</Color>
  56. @@ -102,11 +119,12 @@
  57.             <Horizontal y="0" height="10"/>
  58.         </BlackAreas>
  59.         <Aliases>
  60. -           <Alias>Canon EOS DIGITAL REBEL</Alias>
  61. -           <Alias>Canon EOS Kiss Digital</Alias>
  62. +           <Alias id="EOS Digital Rebel">Canon EOS DIGITAL REBEL</Alias>
  63. +           <Alias id="EOS Kiss Digital">Canon EOS Kiss Digital</Alias>
  64.         </Aliases>
  65.     </Camera>
  66.     <Camera make="Canon" model="Canon EOS D30">
  67. +       <ID make="Canon" model="EOS D30">Canon EOS D30</ID>
  68.         <CFA width="2" height="2">
  69.             <Color x="0" y="0">RED</Color>
  70.             <Color x="1" y="0">GREEN</Color>
  71. @@ -123,6 +141,7 @@
  72.         </BlackAreas>
  73.     </Camera>
  74.     <Camera make="Canon" model="Canon EOS D60">
  75. +       <ID make="Canon" model="EOS D60">Canon EOS D60</ID>
  76.         <CFA width="2" height="2">
  77.             <Color x="0" y="0">RED</Color>
  78.             <Color x="1" y="0">GREEN</Color>
  79. @@ -137,6 +156,7 @@
  80.         </BlackAreas>
  81.     </Camera>
  82.     <Camera make="Canon" model="Canon EOS 10D">
  83. +       <ID make="Canon" model="EOS 10D">Canon EOS 10D</ID>
  84.         <CFA width="2" height="2">
  85.             <Color x="0" y="0">RED</Color>
  86.             <Color x="1" y="0">GREEN</Color>
  87. @@ -147,6 +167,7 @@
  88.         <Sensor black="127" white="4000"/>
  89.     </Camera>
  90.     <Camera make="Canon" model="Canon EOS 20D">
  91. +       <ID make="Canon" model="EOS 20D">Canon EOS 20D</ID>
  92.         <CFA width="2" height="2">
  93.             <Color x="0" y="0">RED</Color>
  94.             <Color x="1" y="0">GREEN</Color>
  95. @@ -164,6 +185,7 @@
  96.         </BlackAreas>
  97.     </Camera>
  98.     <Camera make="Canon" model="Canon EOS 30D">
  99. +       <ID make="Canon" model="EOS 30D">Canon EOS 30D</ID>
  100.         <CFA width="2" height="2">
  101.             <Color x="0" y="0">RED</Color>
  102.             <Color x="1" y="0">GREEN</Color>
  103. @@ -178,6 +200,7 @@
  104.         </BlackAreas>
  105.     </Camera>
  106.     <Camera make="Canon" model="Canon EOS 350D DIGITAL">
  107. +       <ID make="Canon" model="EOS 350D">Canon EOS 350D</ID>
  108.         <CFA width="2" height="2">
  109.             <Color x="0" y="0">RED</Color>
  110.             <Color x="1" y="0">GREEN</Color>
  111. @@ -194,12 +217,13 @@
  112.             <Horizontal y="0" height="12"/>
  113.         </BlackAreas>
  114.         <Aliases>
  115. -           <Alias>Canon EOS DIGITAL REBEL XT</Alias>
  116. -           <Alias>Canon EOS Kiss Digital N</Alias>
  117. -           <Alias>Canon EOS 350D</Alias>
  118. +           <Alias id="Digital Rebel XT">Canon EOS DIGITAL REBEL XT</Alias>
  119. +           <Alias id="Kiss Digital N">Canon EOS Kiss Digital N</Alias>
  120. +           <Alias id="EOS 350D">Canon EOS 350D</Alias>
  121.         </Aliases>
  122.     </Camera>
  123.     <Camera make="Canon" model="Canon EOS 40D" decoder_version="2">
  124. +       <ID make="Canon" model="EOS 40D">Canon EOS 40D</ID>
  125.         <CFA width="2" height="2">
  126.             <Color x="0" y="0">RED</Color>
  127.             <Color x="1" y="0">GREEN</Color>
  128. @@ -214,6 +238,7 @@
  129.         </BlackAreas>
  130.     </Camera>
  131.     <Camera make="Canon" model="Canon EOS 40D" mode="sRaw1">
  132. +       <ID make="Canon" model="EOS 40D">Canon EOS 40D</ID>
  133.         <Crop x="0" y="0" width="0" height="0"/>
  134.         <Sensor black="0" white="65535"/>
  135.         <Hints>
  136. @@ -221,6 +246,7 @@
  137.         </Hints>
  138.     </Camera>
  139.     <Camera make="Canon" model="Canon EOS 40D" mode="sRaw2">
  140. +       <ID make="Canon" model="EOS 40D">Canon EOS 40D</ID>
  141.         <Crop x="0" y="0" width="1944" height="1296"/>
  142.         <Sensor black="0" white="65535"/>
  143.         <Hints>
  144. @@ -228,6 +254,7 @@
  145.         </Hints>
  146.     </Camera>
  147.     <Camera make="Canon" model="Canon EOS 450D">
  148. +       <ID make="Canon" model="EOS 450D">Canon EOS 450D</ID>
  149.         <CFA width="2" height="2">
  150.             <Color x="0" y="0">RED</Color>
  151.             <Color x="1" y="0">GREEN</Color>
  152. @@ -237,12 +264,13 @@
  153.         <Crop x="22" y="18" width="4290" height="2856"/>
  154.         <Sensor black="1020" white="14500"/>
  155.         <Aliases>
  156. -           <Alias>Canon EOS DIGITAL REBEL XSi</Alias>
  157. -           <Alias>Canon EOS Kiss Digital X2</Alias>
  158. -           <Alias>Canon EOS Kiss X2</Alias>
  159. +           <Alias id="Digital Rebel XSi">Canon EOS DIGITAL REBEL XSi</Alias>
  160. +           <Alias id="Kiss Digital X2">Canon EOS Kiss Digital X2</Alias>
  161. +           <Alias id="Kiss X2">Canon EOS Kiss X2</Alias>
  162.         </Aliases>
  163.     </Camera>
  164.     <Camera make="Canon" model="Canon EOS 50D" decoder_version="1">
  165. +       <ID make="Canon" model="EOS 50D">Canon EOS 50D</ID>
  166.         <CFA width="2" height="2">
  167.             <Color x="0" y="0">GREEN</Color>
  168.             <Color x="1" y="0">BLUE</Color>
  169. @@ -257,14 +285,17 @@
  170.         </BlackAreas>
  171.     </Camera>
  172.     <Camera make="Canon" model="Canon EOS 50D" mode="sRaw1">
  173. +       <ID make="Canon" model="EOS 50D">Canon EOS 50D</ID>
  174.         <Crop x="0" y="0" width="3272" height="2178"/>
  175.         <Sensor black="0" white="53000"/>
  176.     </Camera>
  177.     <Camera make="Canon" model="Canon EOS 50D" mode="sRaw2">
  178. +       <ID make="Canon" model="EOS 50D">Canon EOS 50D</ID>
  179.         <Crop x="0" y="0" width="2376" height="1584"/>
  180.         <Sensor black="0" white="53000"/>
  181.     </Camera>
  182.     <Camera make="Canon" model="Canon EOS 60D" decoder_version="1">
  183. +       <ID make="Canon" model="EOS 60D">Canon EOS 60D</ID>
  184.         <CFA width="2" height="2">
  185.             <Color x="0" y="0">GREEN</Color>
  186.             <Color x="1" y="0">BLUE</Color>
  187. @@ -279,14 +310,17 @@
  188.         </BlackAreas>
  189.     </Camera>
  190.     <Camera make="Canon" model="Canon EOS 60D" mode="sRaw1">
  191. +       <ID make="Canon" model="EOS 60D">Canon EOS 60D</ID>
  192.         <Crop x="0" y="0" width="0" height="0"/>
  193.         <Sensor black="0" white="65535"/>
  194.     </Camera>
  195.     <Camera make="Canon" model="Canon EOS 60D" mode="sRaw2">
  196. +       <ID make="Canon" model="EOS 60D">Canon EOS 60D</ID>
  197.         <Crop x="0" y="0" width="0" height="0"/>
  198.         <Sensor black="0" white="65535"/>
  199.     </Camera>
  200.     <Camera make="Canon" model="Canon EOS 70D" decoder_version="1">
  201. +       <ID make="Canon" model="EOS 70D">Canon EOS 70D</ID>
  202.         <CFA width="2" height="2">
  203.             <Color x="0" y="0">RED</Color>
  204.             <Color x="1" y="0">GREEN</Color>
  205. @@ -303,6 +337,7 @@
  206.         </BlackAreas>
  207.     </Camera>
  208.     <Camera make="Canon" model="Canon EOS 70D" mode="sRaw1">
  209. +       <ID make="Canon" model="EOS 70D">Canon EOS 70D</ID>
  210.         <Crop x="0" y="0" width="0" height="0"/>
  211.         <Sensor black="0" white="53000"/>
  212.         <Hints>
  213. @@ -311,6 +346,7 @@
  214.         </Hints>
  215.     </Camera>
  216.     <Camera make="Canon" model="Canon EOS 70D" mode="sRaw2">
  217. +       <ID make="Canon" model="EOS 70D">Canon EOS 70D</ID>
  218.         <Crop x="0" y="0" width="0" height="0"/>
  219.         <Sensor black="0" white="53000"/>
  220.         <Hints>
  221. @@ -319,6 +355,7 @@
  222.         </Hints>
  223.     </Camera>
  224.     <Camera make="Canon" model="Canon EOS 700D">
  225. +       <ID make="Canon" model="EOS 700D">Canon EOS 700D</ID>
  226.         <CFA width="2" height="2">
  227.             <Color x="0" y="0">RED</Color>
  228.             <Color x="1" y="0">GREEN</Color>
  229. @@ -334,11 +371,12 @@
  230.             <Horizontal y="4" height="50"/>
  231.         </BlackAreas>
  232.         <Aliases>
  233. -           <Alias>Canon EOS REBEL T5i</Alias>
  234. -           <Alias>Canon EOS Kiss X7i</Alias>
  235. +           <Alias id="EOS Rebel T5i">Canon EOS REBEL T5i</Alias>
  236. +           <Alias id="EOS Kiss X7i">Canon EOS Kiss X7i</Alias>
  237.         </Aliases>
  238.     </Camera>
  239.     <Camera make="Canon" model="Canon EOS 750D">
  240. +       <ID make="Canon" model="EOS 750D">Canon EOS 750D</ID>
  241.         <CFA width="2" height="2">
  242.             <Color x="0" y="0">RED</Color>
  243.             <Color x="1" y="0">GREEN</Color>
  244. @@ -349,11 +387,12 @@
  245.         <Sensor black="2047" white="11765" iso_min="0" iso_max = "199"/>
  246.         <Sensor black="2047" white="14580"/>
  247.         <Aliases>
  248. -           <Alias>Canon EOS Rebel T6i</Alias>
  249. -           <Alias>Canon EOS Kiss X8i</Alias>
  250. +           <Alias id="EOS Rebel T6i">Canon EOS Rebel T6i</Alias>
  251. +           <Alias id="EOS Kiss X8i">Canon EOS Kiss X8i</Alias>
  252.         </Aliases>
  253.     </Camera>
  254.     <Camera make="Canon" model="Canon EOS 760D">
  255. +       <ID make="Canon" model="EOS 760D">Canon EOS 760D</ID>
  256.         <CFA width="2" height="2">
  257.             <Color x="0" y="0">RED</Color>
  258.             <Color x="1" y="0">GREEN</Color>
  259. @@ -364,11 +403,12 @@
  260.         <Sensor black="2047" white="11765" iso_min="0" iso_max = "199"/>
  261.         <Sensor black="2047" white="14580"/>
  262.         <Aliases>
  263. -           <Alias>Canon EOS Rebel T6s</Alias>
  264. -           <Alias>Canon EOS 8000D</Alias>
  265. +           <Alias id="EOS Rebel T6s">Canon EOS Rebel T6s</Alias>
  266. +           <Alias id="EOS 8000D">Canon EOS 8000D</Alias>
  267.         </Aliases>
  268.     </Camera>
  269.     <Camera make="Canon" model="Canon EOS 500D">
  270. +       <ID make="Canon" model="EOS 500D">Canon EOS 500D</ID>
  271.         <CFA width="2" height="2">
  272.             <Color x="0" y="0">RED</Color>
  273.             <Color x="1" y="0">GREEN</Color>
  274. @@ -382,11 +422,12 @@
  275.             <Horizontal y="2" height="22"/>
  276.         </BlackAreas>
  277.         <Aliases>
  278. -           <Alias>Canon EOS REBEL T1i</Alias>
  279. -           <Alias>Canon EOS Kiss X3</Alias>
  280. +           <Alias id="EOS Rebel T1i">Canon EOS REBEL T1i</Alias>
  281. +           <Alias id="EOS Kiss X3">Canon EOS Kiss X3</Alias>
  282.         </Aliases>
  283.     </Camera>
  284.     <Camera make="Canon" model="Canon EOS 550D">
  285. +       <ID make="Canon" model="EOS 550D">Canon EOS 550D</ID>
  286.         <CFA width="2" height="2">
  287.             <Color x="1" y="0">BLUE</Color>
  288.             <Color x="0" y="0">GREEN</Color>
  289. @@ -400,11 +441,12 @@
  290.             <Horizontal y="4" height="44"/>
  291.         </BlackAreas>
  292.         <Aliases>
  293. -           <Alias>Canon EOS REBEL T2i</Alias>
  294. -           <Alias>Canon EOS Kiss X4</Alias>
  295. +           <Alias id="EOS Rebel T2i">Canon EOS REBEL T2i</Alias>
  296. +           <Alias id="EOS Kiss X4">Canon EOS Kiss X4</Alias>
  297.         </Aliases>
  298.     </Camera>
  299.     <Camera make="Canon" model="Canon EOS 600D">
  300. +       <ID make="Canon" model="EOS 600D">Canon EOS 600D</ID>
  301.         <CFA width="2" height="2">
  302.             <Color x="0" y="0">GREEN</Color>
  303.             <Color x="1" y="0">BLUE</Color>
  304. @@ -419,11 +461,12 @@
  305.             <Horizontal y="4" height="44"/>
  306.         </BlackAreas>
  307.         <Aliases>
  308. -           <Alias>Canon EOS REBEL T3i</Alias>
  309. -           <Alias>Canon EOS Kiss X5</Alias>
  310. +           <Alias id="EOS Rebel T3i">Canon EOS REBEL T3i</Alias>
  311. +           <Alias id="EOS Kiss X5">Canon EOS Kiss X5</Alias>
  312.         </Aliases>
  313.     </Camera>
  314.     <Camera make="Canon" model="Canon EOS 650D">
  315. +       <ID make="Canon" model="EOS 650D">Canon EOS 650D</ID>
  316.         <CFA width="2" height="2">
  317.             <Color x="0" y="0">RED</Color>
  318.             <Color x="1" y="0">GREEN</Color>
  319. @@ -438,11 +481,12 @@
  320.             <Horizontal y="4" height="44"/>
  321.         </BlackAreas>
  322.         <Aliases>
  323. -           <Alias>Canon EOS REBEL T4i</Alias>
  324. -           <Alias>Canon EOS Kiss X6i</Alias>
  325. +           <Alias id="EOS Rebel T4i">Canon EOS REBEL T4i</Alias>
  326. +           <Alias id="EOS Kiss X6i">Canon EOS Kiss X6i</Alias>
  327.         </Aliases>
  328.     </Camera>
  329.     <Camera make="Canon" model="Canon EOS 5D">
  330. +       <ID make="Canon" model="EOS 5D">Canon EOS 5D</ID>
  331.         <CFA width="2" height="2">
  332.             <Color x="0" y="0">RED</Color>
  333.             <Color x="1" y="0">GREEN</Color>
  334. @@ -457,6 +501,7 @@
  335.         </BlackAreas>
  336.     </Camera>
  337.     <Camera make="Canon" model="Canon EOS 5D Mark II" decoder_version="1">
  338. +       <ID make="Canon" model="EOS 5D Mark II">Canon EOS 5D Mark II</ID>
  339.         <CFA width="2" height="2">
  340.             <Color x="0" y="0">GREEN</Color>
  341.             <Color x="1" y="0">BLUE</Color>
  342. @@ -472,16 +517,19 @@
  343.         </BlackAreas>
  344.     </Camera>
  345.     <Camera make="Canon" model="Canon EOS 5D Mark II" mode="sRaw1">
  346. +       <ID make="Canon" model="EOS 5D Mark II">Canon EOS 5D Mark II</ID>
  347.         <Crop x="0" y="0" width="3872" height="2574"/>
  348.         <Sensor black="0" white="57200" iso_list="160 320 640 1250"/>
  349.         <Sensor black="0" white="64948"/>
  350.     </Camera>
  351.     <Camera make="Canon" model="Canon EOS 5D Mark II" mode="sRaw2">
  352. +       <ID make="Canon" model="EOS 5D Mark II">Canon EOS 5D Mark II</ID>
  353.         <Crop x="0" y="0" width="2808" height="1872"/>
  354.         <Sensor black="0" white="57200" iso_list="160 320 640 1250"/>
  355.         <Sensor black="0" white="64948"/>
  356.     </Camera>
  357.     <Camera make="Canon" model="Canon EOS 5D Mark III" decoder_version="2">
  358. +       <ID make="Canon" model="EOS 5D Mark III">Canon EOS 5D Mark III</ID>
  359.         <CFA width="2" height="2">
  360.             <Color x="0" y="0">RED</Color>
  361.             <Color x="1" y="0">GREEN</Color>
  362. @@ -501,6 +549,7 @@
  363.         </BlackAreas>
  364.     </Camera>
  365.     <Camera make="Canon" model="Canon EOS 5D Mark III" mode="sRaw1">
  366. +       <ID make="Canon" model="EOS 5D Mark III">Canon EOS 5D Mark III</ID>
  367.         <Crop x="0" y="0" width="0" height="0"/>
  368.         <Sensor black="0" white="44112" iso_list="160 320 640 1250 2500 5000 10000"/>
  369.         <Sensor black="0" white="50300" iso_list="100 20000"/>
  370. @@ -512,6 +561,7 @@
  371.         </Hints>
  372.     </Camera>
  373.     <Camera make="Canon" model="Canon EOS 5D Mark III" mode="sRaw2">
  374. +       <ID make="Canon" model="EOS 5D Mark III">Canon EOS 5D Mark III</ID>
  375.         <Crop x="0" y="0" width="0" height="0"/>
  376.         <Sensor black="0" white="44112" iso_list="160 320 640 1250 2500 5000 10000"/>
  377.         <Sensor black="0" white="51300" iso_list="250"/>
  378. @@ -522,7 +572,8 @@
  379.             <Hint name="invert_sraw_wb" value=""/>
  380.         </Hints>
  381.     </Camera>
  382. -   <Camera make="Canon" model="Canon EOS 5DS R" decoder_version="6" supported="no">
  383. +   <Camera make="Canon" model="Canon EOS 5DS" decoder_version="6">
  384. +       <ID make="Canon" model="EOS 5DS">Canon EOS 5DS</ID>
  385.         <CFA width="2" height="2">
  386.             <Color x="0" y="0">RED</Color>
  387.             <Color x="1" y="0">GREEN</Color>
  388. @@ -530,13 +581,18 @@
  389.             <Color x="1" y="1">BLUE</Color>
  390.         </CFA>
  391.         <Crop x="160" y="64" width="-2" height="0"/>
  392. -       <Sensor black="2060" white="16383"/>
  393. +       <Sensor black="2048" white="15181"/>
  394. +       <Sensor black="2048" white="14466" iso_list="50 100"/>
  395.         <BlackAreas>
  396.             <Vertical x="0" width="150"/>
  397.             <Horizontal y="2" height="60"/>
  398.         </BlackAreas>
  399. +       <Aliases>
  400. +           <Alias>Canon EOS 5DS R</Alias>
  401. +       </Aliases>
  402.     </Camera>
  403.     <Camera make="Canon" model="Canon EOS 6D" decoder_version="2">
  404. +       <ID make="Canon" model="EOS 6D">Canon EOS 6D</ID>
  405.         <CFA width="2" height="2">
  406.             <Color x="0" y="0">RED</Color>
  407.             <Color x="1" y="0">GREEN</Color>
  408. @@ -552,6 +608,7 @@
  409.     </Camera>
  410.     <!---Guess -->
  411.     <Camera make="Canon" model="Canon EOS 6D" mode="sRaw1" decoder_version="3">
  412. +       <ID make="Canon" model="EOS 6D">Canon EOS 6D</ID>
  413.         <Crop x="0" y="0" width="0" height="0"/>
  414.         <Sensor black="0" white="48664"/>
  415.         <Hints>
  416. @@ -561,6 +618,7 @@
  417.     </Camera>
  418.     <!---Guess -->
  419.     <Camera make="Canon" model="Canon EOS 6D" mode="sRaw2">
  420. +       <ID make="Canon" model="EOS 6D">Canon EOS 6D</ID>
  421.         <Crop x="0" y="0" width="0" height="0"/>
  422.         <Sensor black="0" white="48664"/>
  423.         <Hints>
  424. @@ -569,6 +627,7 @@
  425.         </Hints>
  426.     </Camera>
  427.     <Camera make="Canon" model="Canon EOS 7D" decoder_version="1">
  428. +       <ID make="Canon" model="EOS 7D">Canon EOS 7D</ID>
  429.         <CFA width="2" height="2">
  430.             <Color x="0" y="0">GREEN</Color>
  431.             <Color x="1" y="0">BLUE</Color>
  432. @@ -584,16 +643,19 @@
  433.         </BlackAreas>
  434.     </Camera>
  435.     <Camera make="Canon" model="Canon EOS 7D" mode="sRaw1">
  436. +       <ID make="Canon" model="EOS 7D">Canon EOS 7D</ID>
  437.         <Crop x="0" y="0" width="0" height="0"/>
  438.         <Sensor black="0" white="44200" iso_list="100 125 160 320 640 1250"/>
  439.         <Sensor black="0" white="54000"/>
  440.     </Camera>
  441.     <Camera make="Canon" model="Canon EOS 7D" mode="sRaw2">
  442. +       <ID make="Canon" model="EOS 7D">Canon EOS 7D</ID>
  443.         <Crop x="0" y="0" width="0" height="0"/>
  444.         <Sensor black="0" white="44200" iso_list="100 125 160 320 640 1250"/>
  445.         <Sensor black="0" white="54000"/>
  446.     </Camera>
  447.     <Camera make="Canon" model="Canon EOS 7D Mark II">
  448. +       <ID make="Canon" model="EOS 7D Mark II">Canon EOS 7D Mark II</ID>
  449.         <CFA width="2" height="2">
  450.             <Color x="0" y="0">RED</Color>
  451.             <Color x="1" y="0">GREEN</Color>
  452. @@ -609,6 +671,7 @@
  453.         </BlackAreas>
  454.     </Camera>
  455.     <Camera make="Canon" model="Canon EOS 7D Mark II" mode="sRaw1">
  456. +       <ID make="Canon" model="EOS 7D Mark II">Canon EOS 7D Mark II</ID>
  457.         <Crop x="0" y="0" width="0" height="0"/>
  458.         <Sensor black="0" white="65535"/>
  459.         <Hints>
  460. @@ -617,6 +680,7 @@
  461.         </Hints>
  462.     </Camera>
  463.     <Camera make="Canon" model="Canon EOS 7D Mark II" mode="sRaw2">
  464. +       <ID make="Canon" model="EOS 7D Mark II">Canon EOS 7D Mark II</ID>
  465.         <Crop x="0" y="0" width="0" height="0"/>
  466.         <Sensor black="0" white="65535"/>
  467.         <Hints>
  468. @@ -625,6 +689,7 @@
  469.         </Hints>
  470.     </Camera>
  471.     <Camera make="Canon" model="Canon EOS 1000D">
  472. +       <ID make="Canon" model="EOS 1000D">Canon EOS 1000D</ID>
  473.         <CFA width="2" height="2">
  474.             <Color x="0" y="0">RED</Color>
  475.             <Color x="1" y="0">GREEN</Color>
  476. @@ -639,11 +704,12 @@
  477.             <Horizontal y="2" height="14"/>
  478.         </BlackAreas>
  479.         <Aliases>
  480. -           <Alias>Canon EOS DIGITAL REBEL XS</Alias>
  481. -           <Alias>Canon EOS Kiss Digital F</Alias>
  482. +           <Alias id="EOS Digital Rebel XS">Canon EOS DIGITAL REBEL XS</Alias>
  483. +           <Alias id="EOS Kiss Digital F">Canon EOS Kiss Digital F</Alias>
  484.         </Aliases>
  485.     </Camera>
  486.     <Camera make="Canon" model="Canon EOS 1100D">
  487. +       <ID make="Canon" model="EOS 1100D">Canon EOS 1100D</ID>
  488.         <CFA width="2" height="2">
  489.             <Color x="0" y="0">RED</Color>
  490.             <Color x="1" y="0">GREEN</Color>
  491. @@ -657,10 +723,11 @@
  492.             <Horizontal y="4" height="12"/>
  493.         </BlackAreas>
  494.         <Aliases>
  495. -           <Alias>Canon EOS REBEL T3</Alias>
  496. +           <Alias id="EOS Rebel T3">Canon EOS REBEL T3</Alias>
  497.         </Aliases>
  498.     </Camera>
  499.     <Camera make="Canon" model="Canon EOS 1200D">
  500. +       <ID make="Canon" model="EOS 1200D">Canon EOS 1200D</ID>
  501.         <CFA width="2" height="2">
  502.             <Color x="0" y="0">GREEN</Color>
  503.             <Color x="1" y="0">BLUE</Color>
  504. @@ -675,11 +742,12 @@
  505.             <Horizontal y="4" height="44"/>
  506.         </BlackAreas>
  507.         <Aliases>
  508. -           <Alias>Canon EOS REBEL T5</Alias>
  509. -           <Alias>Canon EOS Kiss X70</Alias>
  510. +           <Alias id="EOS Rebel T5">Canon EOS REBEL T5</Alias>
  511. +           <Alias id="EOS Kiss X70">Canon EOS Kiss X70</Alias>
  512.         </Aliases>
  513.     </Camera>
  514.     <Camera make="Canon" model="Canon EOS 400D DIGITAL">
  515. +       <ID make="Canon" model="EOS 400D">Canon EOS 400D</ID>
  516.         <CFA width="2" height="2">
  517.             <Color x="0" y="0">RED</Color>
  518.             <Color x="1" y="0">GREEN</Color>
  519. @@ -693,11 +761,12 @@
  520.             <Horizontal y="4" height="12"/>
  521.         </BlackAreas>
  522.         <Aliases>
  523. -           <Alias>Canon EOS DIGITAL REBEL XTi</Alias>
  524. -           <Alias>Canon EOS Kiss Digital X</Alias>
  525. +           <Alias id="EOS Digital Rebel XTi">Canon EOS DIGITAL REBEL XTi</Alias>
  526. +           <Alias id="EOS Kiss Digital X">Canon EOS Kiss Digital X</Alias>
  527.         </Aliases>
  528.     </Camera>
  529.     <Camera make="Canon" model="Canon EOS M">
  530. +       <ID make="Canon" model="EOS M">Canon EOS M</ID>
  531.         <CFA width="2" height="2">
  532.             <Color x="0" y="0">RED</Color>
  533.             <Color x="1" y="0">GREEN</Color>
  534. @@ -713,6 +782,7 @@
  535.         </BlackAreas>
  536.     </Camera>
  537.     <Camera make="Canon" model="Canon EOS M2">
  538. +       <ID make="Canon" model="EOS M2">Canon EOS M2</ID>
  539.         <CFA width="2" height="2">
  540.             <Color x="0" y="0">RED</Color>
  541.             <Color x="1" y="0">GREEN</Color>
  542. @@ -727,7 +797,23 @@
  543.             <Horizontal y="4" height="44"/>
  544.         </BlackAreas>
  545.     </Camera>
  546. +   <Camera make="Canon" model="Canon EOS M3">
  547. +       <ID make="Canon" model="EOS M3">Canon EOS M3</ID>
  548. +       <CFA width="2" height="2">
  549. +           <Color x="0" y="0">RED</Color>
  550. +           <Color x="1" y="0">GREEN</Color>
  551. +           <Color x="0" y="1">GREEN</Color>
  552. +           <Color x="1" y="1">BLUE</Color>
  553. +       </CFA>
  554. +       <Crop x="72" y="34" width="0" height="0"/>
  555. +       <Sensor black="2048" white="16000"/>
  556. +       <BlackAreas>
  557. +           <Vertical x="2" width="68"/>
  558. +           <Horizontal y="2" height="30"/>
  559. +       </BlackAreas>
  560. +   </Camera>
  561.     <Camera make="Canon" model="Canon EOS-1D" decoder_version="5">
  562. +       <ID make="Canon" model="EOS-1D">Canon EOS-1D</ID>
  563.         <CFA width="2" height="2">
  564.             <Color x="0" y="0">GREEN</Color>
  565.             <Color x="1" y="0">RED</Color>
  566. @@ -742,6 +828,7 @@
  567.         </Hints>
  568.     </Camera>
  569.     <Camera make="Canon" model="Canon EOS-1DS" decoder_version="5">
  570. +       <ID make="Canon" model="EOS-1Ds">Canon EOS-1Ds</ID>
  571.         <CFA width="2" height="2">
  572.             <Color x="0" y="0">GREEN</Color>
  573.             <Color x="1" y="0">RED</Color>
  574. @@ -770,6 +857,7 @@
  575.         </Hints>
  576.     </Camera>
  577.     <Camera make="Canon" model="Canon EOS-1D Mark II">
  578. +       <ID make="Canon" model="EOS-1D Mark II">Canon EOS-1D Mark II</ID>
  579.         <CFA width="2" height="2">
  580.             <Color x="0" y="0">RED</Color>
  581.             <Color x="1" y="0">GREEN</Color>
  582. @@ -787,6 +875,7 @@
  583.         </BlackAreas>
  584.     </Camera>
  585.     <Camera make="Canon" model="Canon EOS-1D Mark II N">
  586. +       <ID make="Canon" model="EOS-1D Mark II N">Canon EOS-1D Mark II N</ID>
  587.         <CFA width="2" height="2">
  588.             <Color x="0" y="0">RED</Color>
  589.             <Color x="1" y="0">GREEN</Color>
  590. @@ -801,6 +890,7 @@
  591.         </BlackAreas>
  592.     </Camera>
  593.     <Camera make="Canon" model="Canon EOS-1D Mark III" decoder_version="1">
  594. +       <ID make="Canon" model="EOS-1D Mark III">Canon EOS-1D Mark III</ID>
  595.         <CFA width="2" height="2">
  596.             <Color x="0" y="0">RED</Color>
  597.             <Color x="1" y="0">GREEN</Color>
  598. @@ -815,14 +905,17 @@
  599.         </BlackAreas>
  600.     </Camera>
  601.     <Camera make="Canon" model="Canon EOS-1D Mark III" mode="sRaw1">
  602. +       <ID make="Canon" model="EOS-1D Mark III">Canon EOS-1D Mark III</ID>
  603.         <Crop x="0" y="0" width="0" height="0"/>
  604.         <Sensor black="0" white="65535"/>
  605.     </Camera>
  606.     <Camera make="Canon" model="Canon EOS-1D Mark III" mode="sRaw2">
  607. +       <ID make="Canon" model="EOS-1D Mark III">Canon EOS-1D Mark III</ID>
  608.         <Crop x="0" y="0" width="0" height="0"/>
  609.         <Sensor black="0" white="65535"/>
  610.     </Camera>
  611.     <Camera make="Canon" model="Canon EOS-1D Mark IV" decoder_version="1">
  612. +       <ID make="Canon" model="EOS-1D Mark IV">Canon EOS-1D Mark IV</ID>
  613.         <CFA width="2" height="2">
  614.             <Color x="0" y="0">GREEN</Color>
  615.             <Color x="1" y="0">BLUE</Color>
  616. @@ -837,14 +930,17 @@
  617.         </BlackAreas>
  618.     </Camera>
  619.     <Camera make="Canon" model="Canon EOS-1D Mark IV" mode="sRaw1">
  620. +       <ID make="Canon" model="EOS-1D Mark IV">Canon EOS-1D Mark IV</ID>
  621.         <Crop x="0" y="0" width="0" height="0"/>
  622.         <Sensor black="0" white="65535"/>
  623.     </Camera>
  624.     <Camera make="Canon" model="Canon EOS-1D Mark IV" mode="sRaw2">
  625. +       <ID make="Canon" model="EOS-1D Mark IV">Canon EOS-1D Mark IV</ID>
  626.         <Crop x="0" y="0" width="0" height="0"/>
  627.         <Sensor black="0" white="65535"/>
  628.     </Camera>
  629.     <Camera make="Canon" model="Canon EOS-1Ds Mark II">
  630. +       <ID make="Canon" model="EOS-1Ds Mark II">Canon EOS-1Ds Mark II</ID>
  631.         <CFA width="2" height="2">
  632.             <Color x="0" y="0">GREEN</Color>
  633.             <Color x="1" y="0">BLUE</Color>
  634. @@ -862,6 +958,7 @@
  635.         </BlackAreas>
  636.     </Camera>
  637.     <Camera make="Canon" model="Canon EOS-1Ds Mark III" decoder_version="1">
  638. +       <ID make="Canon" model="EOS-1Ds Mark III">Canon EOS-1Ds Mark III</ID>
  639.         <CFA width="2" height="2">
  640.             <Color x="0" y="0">RED</Color>
  641.             <Color x="1" y="0">GREEN</Color>
  642. @@ -876,14 +973,17 @@
  643.         </BlackAreas>
  644.     </Camera>
  645.     <Camera make="Canon" model="Canon EOS-1Ds Mark III" mode="sRaw1">
  646. +       <ID make="Canon" model="EOS-1Ds Mark III">Canon EOS-1Ds Mark III</ID>
  647.         <Crop x="0" y="0" width="0" height="0"/>
  648.         <Sensor black="0" white="65535"/>
  649.     </Camera>
  650.     <Camera make="Canon" model="Canon EOS-1Ds Mark III" mode="sRaw2">
  651. +       <ID make="Canon" model="EOS-1Ds Mark III">Canon EOS-1Ds Mark III</ID>
  652.         <Crop x="0" y="0" width="0" height="0"/>
  653.         <Sensor black="0" white="65535"/>
  654.     </Camera>
  655.     <Camera make="Canon" model="Canon EOS-1D X" decoder_version="1">
  656. +       <ID make="Canon" model="EOS-1D X">Canon EOS-1D X</ID>
  657.         <CFA width="2" height="2">
  658.             <Color x="0" y="0">RED</Color>
  659.             <Color x="1" y="0">GREEN</Color>
  660. @@ -898,6 +998,7 @@
  661.         </BlackAreas>
  662.     </Camera>
  663.     <Camera make="Canon" model="Canon EOS-1D X" mode="sRaw1">
  664. +       <ID make="Canon" model="EOS-1D X">Canon EOS-1D X</ID>
  665.         <Crop x="0" y="0" width="0" height="0"/>
  666.         <Sensor black="0" white="65535"/>
  667.         <Hints>
  668. @@ -906,6 +1007,7 @@
  669.         </Hints>
  670.     </Camera>
  671.     <Camera make="Canon" model="Canon EOS-1D X" mode="sRaw2">
  672. +       <ID make="Canon" model="EOS-1D X">Canon EOS-1D X</ID>
  673.         <Crop x="0" y="0" width="0" height="0"/>
  674.         <Sensor black="0" white="65535"/>
  675.         <Hints>
  676. @@ -914,6 +1016,7 @@
  677.         </Hints>
  678.     </Camera>
  679.     <Camera make="Canon" model="Canon PowerShot Pro1">
  680. +       <ID make="Canon" model="PowerShot Pro1">Canon PowerShot Pro1</ID>
  681.         <CFA width="2" height="2">
  682.             <Color x="0" y="0">RED</Color>
  683.             <Color x="1" y="0">GREEN</Color>
  684. @@ -930,8 +1033,10 @@
  685.         </BlackAreas>
  686.     </Camera>
  687.     <Camera make="Canon" model="Canon PowerShot Pro70" supported="no">
  688. +       <ID make="Canon" model="PowerShot Pro70">Canon PowerShot Pro70</ID>
  689.     </Camera>
  690.     <Camera make="Canon" model="Canon PowerShot G1">
  691. +       <ID make="Canon" model="PowerShot G1">Canon PowerShot G1</ID>
  692.         <CFA width="2" height="2">
  693.             <Color x="0" y="0">RED</Color>
  694.             <Color x="1" y="0">GREEN</Color>
  695. @@ -948,6 +1053,7 @@
  696.         </BlackAreas>
  697.     </Camera>
  698.     <Camera make="Canon" model="Canon PowerShot G2">
  699. +       <ID make="Canon" model="PowerShot G2">Canon PowerShot G2</ID>
  700.         <CFA width="2" height="2">
  701.             <Color x="0" y="0">RED</Color>
  702.             <Color x="1" y="0">GREEN</Color>
  703. @@ -965,6 +1071,7 @@
  704.         </BlackAreas>
  705.     </Camera>
  706.     <Camera make="Canon" model="Canon PowerShot G3">
  707. +       <ID make="Canon" model="PowerShot G3">Canon PowerShot G3</ID>
  708.         <CFA width="2" height="2">
  709.             <Color x="0" y="0">RED</Color>
  710.             <Color x="1" y="0">GREEN</Color>
  711. @@ -982,6 +1089,7 @@
  712.         </BlackAreas>
  713.     </Camera>
  714.     <Camera make="Canon" model="Canon PowerShot G5">
  715. +       <ID make="Canon" model="PowerShot G5">Canon PowerShot G5</ID>
  716.         <CFA width="2" height="2">
  717.             <Color x="0" y="0">RED</Color>
  718.             <Color x="1" y="0">GREEN</Color>
  719. @@ -999,6 +1107,7 @@
  720.         </BlackAreas>
  721.     </Camera>
  722.     <Camera make="Canon" model="Canon PowerShot G6">
  723. +       <ID make="Canon" model="PowerShot G6">Canon PowerShot G6</ID>
  724.         <CFA width="2" height="2">
  725.             <Color x="0" y="0">RED</Color>
  726.             <Color x="1" y="0">GREEN</Color>
  727. @@ -1016,6 +1125,7 @@
  728.         </BlackAreas>
  729.     </Camera>
  730.     <Camera make="Canon" model="Canon PowerShot G7 X">
  731. +       <ID make="Canon" model="PowerShot G7 X">Canon PowerShot G7 X</ID>
  732.         <CFA width="2" height="2">
  733.             <Color x="0" y="0">RED</Color>
  734.             <Color x="1" y="0">GREEN</Color>
  735. @@ -1029,6 +1139,7 @@
  736.         </Hints>
  737.     </Camera>
  738.     <Camera make="Canon" model="Canon PowerShot G1 X">
  739. +       <ID make="Canon" model="PowerShot G1 X">Canon PowerShot G1 X</ID>
  740.         <CFA width="2" height="2">
  741.             <Color x="0" y="0">RED</Color>
  742.             <Color x="1" y="0">GREEN</Color>
  743. @@ -1046,6 +1157,7 @@
  744.         </BlackAreas>
  745.     </Camera>
  746.     <Camera make="Canon" model="Canon PowerShot G1 X Mark II">
  747. +       <ID make="Canon" model="PowerShot G1 X Mark II">Canon PowerShot G1 X Mark II</ID>
  748.         <CFA width="2" height="2">
  749.             <Color x="0" y="0">RED</Color>
  750.             <Color x="1" y="0">GREEN</Color>
  751. @@ -1060,6 +1172,7 @@
  752.         </BlackAreas>
  753.     </Camera>
  754.     <Camera make="Canon" model="Canon PowerShot G12">
  755. +       <ID make="Canon" model="PowerShot G12">Canon PowerShot G12</ID>
  756.         <CFA width="2" height="2">
  757.             <Color x="0" y="0">RED</Color>
  758.             <Color x="1" y="0">GREEN</Color>
  759. @@ -1077,6 +1190,7 @@
  760.         </BlackAreas>
  761.     </Camera>
  762.     <Camera make="Canon" model="Canon PowerShot G11">
  763. +       <ID make="Canon" model="PowerShot G11">Canon PowerShot G11</ID>
  764.         <CFA width="2" height="2">
  765.             <Color x="0" y="0">RED</Color>
  766.             <Color x="1" y="0">GREEN</Color>
  767. @@ -1096,6 +1210,7 @@
  768.         </BlackAreas>
  769.     </Camera>
  770.     <Camera make="Canon" model="Canon PowerShot G10">
  771. +       <ID make="Canon" model="PowerShot G10">Canon PowerShot G10</ID>
  772.         <CFA width="2" height="2">
  773.             <Color x="0" y="0">GREEN</Color>
  774.             <Color x="1" y="0">BLUE</Color>
  775. @@ -1113,6 +1228,7 @@
  776.         </BlackAreas>
  777.     </Camera>
  778.     <Camera make="Canon" model="Canon PowerShot G9">
  779. +       <ID make="Canon" model="PowerShot G9">Canon PowerShot G9</ID>
  780.         <CFA width="2" height="2">
  781.             <Color x="0" y="0">RED</Color>
  782.             <Color x="1" y="0">GREEN</Color>
  783. @@ -1127,6 +1243,7 @@
  784.         </BlackAreas>
  785.     </Camera>
  786.     <Camera make="Canon" model="Canon PowerShot G15">
  787. +       <ID make="Canon" model="PowerShot G15">Canon PowerShot G15</ID>
  788.         <CFA width="2" height="2">
  789.             <Color x="0" y="0">GREEN</Color>
  790.             <Color x="1" y="0">BLUE</Color>
  791. @@ -1142,6 +1259,7 @@
  792.         </BlackAreas>
  793.     </Camera>
  794.     <Camera make="Canon" model="Canon PowerShot G16" decoder_version="4">
  795. +       <ID make="Canon" model="PowerShot G16">Canon PowerShot G16</ID>
  796.         <CFA width="2" height="2">
  797.             <Color x="0" y="0">RED</Color>
  798.             <Color x="1" y="0">GREEN</Color>
  799. @@ -1156,6 +1274,7 @@
  800.         </BlackAreas>
  801.     </Camera>
  802.     <Camera make="Canon" model="Canon PowerShot SX1 IS">
  803. +       <ID make="Canon" model="PowerShot SX1 IS">Canon PowerShot SX1 IS</ID>
  804.         <CFA width="2" height="2">
  805.             <Color x="0" y="0">RED</Color>
  806.             <Color x="1" y="0">GREEN</Color>
  807. @@ -1173,6 +1292,7 @@
  808.         </BlackAreas>
  809.     </Camera>
  810.     <Camera make="Canon" model="Canon PowerShot S30">
  811. +       <ID make="Canon" model="PowerShot S30">Canon PowerShot S30</ID>
  812.         <CFA width="2" height="2">
  813.             <Color x="0" y="0">RED</Color>
  814.             <Color x="1" y="0">GREEN</Color>
  815. @@ -1189,6 +1309,7 @@
  816.         </BlackAreas>
  817.     </Camera>
  818.     <Camera make="Canon" model="Canon PowerShot S40">
  819. +       <ID make="Canon" model="PowerShot S40">Canon PowerShot S40</ID>
  820.         <CFA width="2" height="2">
  821.             <Color x="0" y="0">RED</Color>
  822.             <Color x="1" y="0">GREEN</Color>
  823. @@ -1206,6 +1327,7 @@
  824.         </BlackAreas>
  825.     </Camera>
  826.     <Camera make="Canon" model="Canon PowerShot S45">
  827. +       <ID make="Canon" model="PowerShot S45">Canon PowerShot S45</ID>
  828.         <CFA width="2" height="2">
  829.             <Color x="0" y="0">RED</Color>
  830.             <Color x="1" y="0">GREEN</Color>
  831. @@ -1222,6 +1344,7 @@
  832.         </BlackAreas>
  833.     </Camera>
  834.     <Camera make="Canon" model="Canon PowerShot S50">
  835. +       <ID make="Canon" model="PowerShot S50">Canon PowerShot S50</ID>
  836.         <CFA width="2" height="2">
  837.             <Color x="0" y="0">RED</Color>
  838.             <Color x="1" y="0">GREEN</Color>
  839. @@ -1239,6 +1362,7 @@
  840.         </BlackAreas>
  841.     </Camera>
  842.     <Camera make="Canon" model="Canon PowerShot S60">
  843. +       <ID make="Canon" model="PowerShot S60">Canon PowerShot S60</ID>
  844.         <CFA width="2" height="2">
  845.             <Color x="0" y="0">RED</Color>
  846.             <Color x="1" y="0">GREEN</Color>
  847. @@ -1256,6 +1380,7 @@
  848.         </BlackAreas>
  849.     </Camera>
  850.     <Camera make="Canon" model="Canon PowerShot S70">
  851. +       <ID make="Canon" model="PowerShot S70">Canon PowerShot S70</ID>
  852.         <CFA width="2" height="2">
  853.             <Color x="0" y="0">RED</Color>
  854.             <Color x="1" y="0">GREEN</Color>
  855. @@ -1273,6 +1398,7 @@
  856.         </BlackAreas>
  857.     </Camera>
  858.     <Camera make="Canon" model="Canon PowerShot S90">
  859. +       <ID make="Canon" model="PowerShot S90">Canon PowerShot S90</ID>
  860.         <CFA width="2" height="2">
  861.             <Color x="0" y="0">RED</Color>
  862.             <Color x="1" y="0">GREEN</Color>
  863. @@ -1287,6 +1413,7 @@
  864.         </BlackAreas>
  865.     </Camera>
  866.     <Camera make="Canon" model="Canon PowerShot S95">
  867. +       <ID make="Canon" model="PowerShot S95">Canon PowerShot S95</ID>
  868.         <CFA width="2" height="2">
  869.             <Color x="0" y="0">RED</Color>
  870.             <Color x="1" y="0">GREEN</Color>
  871. @@ -1303,6 +1430,7 @@
  872.         </BlackAreas>
  873.     </Camera>
  874.     <Camera make="Canon" model="Canon PowerShot S100">
  875. +       <ID make="Canon" model="PowerShot S100">Canon PowerShot S100</ID>
  876.         <CFA width="2" height="2">
  877.             <Color x="0" y="0">GREEN</Color>
  878.             <Color x="1" y="0">BLUE</Color>
  879. @@ -1318,6 +1446,7 @@
  880.         </BlackAreas>
  881.     </Camera>
  882.     <Camera make="Canon" model="Canon PowerShot S110">
  883. +       <ID make="Canon" model="PowerShot S110">Canon PowerShot S110</ID>
  884.         <CFA width="2" height="2">
  885.             <Color x="0" y="0">GREEN</Color>
  886.             <Color x="1" y="0">BLUE</Color>
  887. @@ -1333,6 +1462,7 @@
  888.         </BlackAreas>
  889.     </Camera>
  890.     <Camera make="Canon" model="Canon PowerShot S120">
  891. +       <ID make="Canon" model="PowerShot S120">Canon PowerShot S120</ID>
  892.         <CFA width="2" height="2">
  893.             <Color x="0" y="0">RED</Color>
  894.             <Color x="1" y="0">GREEN</Color>
  895. @@ -1350,6 +1480,7 @@
  896.         </BlackAreas>
  897.     </Camera>
  898.     <Camera make="Canon" model="Canon PowerShot SX50 HS">
  899. +       <ID make="Canon" model="PowerShot SX50 HS">Canon PowerShot SX50 HS</ID>
  900.         <CFA width="2" height="2">
  901.             <Color x="0" y="0">RED</Color>
  902.             <Color x="1" y="0">GREEN</Color>
  903. @@ -1367,6 +1498,7 @@
  904.         </BlackAreas>
  905.     </Camera>
  906.     <Camera make="NIKON CORPORATION" model="NIKON D100">
  907. +       <ID make="Nikon" model="D100">Nikon D100</ID>
  908.         <CFA width="2" height="2">
  909.             <Color x="0" y="0">GREEN</Color>
  910.             <Color x="1" y="0">RED</Color>
  911. @@ -1377,6 +1509,7 @@
  912.         <Sensor black="0" white="4095"/>
  913.     </Camera>
  914.     <Camera make="NIKON CORPORATION" model="NIKON D1">
  915. +       <ID make="Nikon" model="D1">Nikon D1</ID>
  916.         <CFA width="2" height="2">
  917.             <Color x="0" y="0">BLUE</Color>
  918.             <Color x="1" y="0">GREEN</Color>
  919. @@ -1390,6 +1523,7 @@
  920.         </Hints>
  921.     </Camera>
  922.     <Camera make="NIKON CORPORATION" model="NIKON D1H">
  923. +       <ID make="Nikon" model="D1H">Nikon D1H</ID>
  924.         <CFA width="2" height="2">
  925.             <Color x="0" y="0">BLUE</Color>
  926.             <Color x="1" y="0">GREEN</Color>
  927. @@ -1400,6 +1534,7 @@
  928.         <Sensor black="0" white="4095"/>
  929.     </Camera>
  930.     <Camera make="NIKON CORPORATION" model="NIKON D1X">
  931. +       <ID make="Nikon" model="D1X">Nikon D1X</ID>
  932.         <CFA width="2" height="2">
  933.             <Color x="0" y="0">BLUE</Color>
  934.             <Color x="1" y="0">GREEN</Color>
  935. @@ -1413,6 +1548,7 @@
  936.         </Hints>
  937.     </Camera>
  938.     <Camera make="NIKON CORPORATION" model="NIKON D200">
  939. +       <ID make="Nikon" model="D200">Nikon D200</ID>
  940.         <CFA width="2" height="2">
  941.             <Color x="0" y="0">GREEN</Color>
  942.             <Color x="1" y="0">RED</Color>
  943. @@ -1423,6 +1559,7 @@
  944.         <Sensor black="0" white="3880"/>
  945.     </Camera>
  946.     <Camera make="NIKON CORPORATION" model="NIKON D2H">
  947. +       <ID make="Nikon" model="D2H">Nikon D2H</ID>
  948.         <CFA width="2" height="2">
  949.             <Color x="0" y="0">GREEN</Color>
  950.             <Color x="1" y="0">BLUE</Color>
  951. @@ -1433,6 +1570,7 @@
  952.         <Sensor black="0" white="3880"/>
  953.     </Camera>
  954.     <Camera make="NIKON CORPORATION" model="NIKON D2Hs">
  955. +       <ID make="Nikon" model="D2Hs">Nikon D2Hs</ID>
  956.         <CFA width="2" height="2">
  957.             <Color x="0" y="0">GREEN</Color>
  958.             <Color x="1" y="0">BLUE</Color>
  959. @@ -1443,6 +1581,7 @@
  960.         <Sensor black="0" white="3880"/>
  961.     </Camera>
  962.     <Camera make="NIKON CORPORATION" model="NIKON D2X">
  963. +       <ID make="Nikon" model="D2X">Nikon D2X</ID>
  964.         <CFA width="2" height="2">
  965.             <Color x="0" y="0">RED</Color>
  966.             <Color x="1" y="0">GREEN</Color>
  967. @@ -1453,6 +1592,7 @@
  968.         <Sensor black="0" white="3880"/>
  969.     </Camera>
  970.     <Camera make="NIKON CORPORATION" model="NIKON D3">
  971. +       <ID make="Nikon" model="D3">Nikon D3</ID>
  972.         <CFA width="2" height="2">
  973.             <Color x="0" y="0">RED</Color>
  974.             <Color x="1" y="0">GREEN</Color>
  975. @@ -1463,6 +1603,7 @@
  976.         <Sensor black="0" white="16384"/>
  977.     </Camera>
  978.     <Camera make="NIKON CORPORATION" model="NIKON D3S">
  979. +       <ID make="Nikon" model="D3S">Nikon D3S</ID>
  980.         <CFA width="2" height="2">
  981.             <Color x="0" y="0">RED</Color>
  982.             <Color x="1" y="0">GREEN</Color>
  983. @@ -1473,6 +1614,7 @@
  984.         <Sensor black="0" white="16384"/>
  985.     </Camera>
  986.     <Camera make="NIKON CORPORATION" model="NIKON D3X">
  987. +       <ID make="Nikon" model="D3X">Nikon D3X</ID>
  988.         <CFA width="2" height="2">
  989.             <Color x="0" y="0">RED</Color>
  990.             <Color x="1" y="0">GREEN</Color>
  991. @@ -1483,6 +1625,7 @@
  992.         <Sensor black="0" white="16384"/>
  993.     </Camera>
  994.     <Camera make="NIKON CORPORATION" model="NIKON D300">
  995. +       <ID make="Nikon" model="D300">Nikon D300</ID>
  996.         <CFA width="2" height="2">
  997.             <Color x="0" y="0">RED</Color>
  998.             <Color x="1" y="0">GREEN</Color>
  999. @@ -1493,6 +1636,7 @@
  1000.         <Sensor black="0" white="15236"/>
  1001.     </Camera>
  1002.     <Camera make="NIKON CORPORATION" model="NIKON D300S">
  1003. +       <ID make="Nikon" model="D300S">Nikon D300S</ID>
  1004.         <CFA width="2" height="2">
  1005.             <Color x="0" y="0">RED</Color>
  1006.             <Color x="1" y="0">GREEN</Color>
  1007. @@ -1503,6 +1647,7 @@
  1008.         <Sensor black="0" white="15236"/>
  1009.     </Camera>
  1010.     <Camera make="NIKON CORPORATION" model="NIKON D3000">
  1011. +       <ID make="Nikon" model="D3000">Nikon D3000</ID>
  1012.         <CFA width="2" height="2">
  1013.             <Color x="0" y="0">GREEN</Color>
  1014.             <Color x="1" y="0">BLUE</Color>
  1015. @@ -1513,6 +1658,7 @@
  1016.         <Sensor black="0" white="16383"/>
  1017.     </Camera>
  1018.     <Camera make="NIKON CORPORATION" model="NIKON D3200">
  1019. +       <ID make="Nikon" model="D3200">Nikon D3200</ID>
  1020.         <CFA width="2" height="2">
  1021.             <Color x="0" y="0">RED</Color>
  1022.             <Color x="1" y="0">GREEN</Color>
  1023. @@ -1523,6 +1669,7 @@
  1024.         <Sensor black="0" white="16383"/>
  1025.     </Camera>
  1026.     <Camera make="NIKON CORPORATION" model="NIKON D3300">
  1027. +       <ID make="Nikon" model="D3300">Nikon D3300</ID>
  1028.         <CFA width="2" height="2">
  1029.             <Color x="0" y="0">RED</Color>
  1030.             <Color x="1" y="0">GREEN</Color>
  1031. @@ -1536,6 +1683,7 @@
  1032.         </Hints>
  1033.     </Camera>
  1034.     <Camera make="NIKON CORPORATION" model="NIKON D4">
  1035. +       <ID make="Nikon" model="D4">Nikon D4</ID>
  1036.         <CFA width="2" height="2">
  1037.             <Color x="0" y="0">RED</Color>
  1038.             <Color x="1" y="0">GREEN</Color>
  1039. @@ -1549,6 +1697,7 @@
  1040.         </BlackAreas>
  1041.     </Camera>
  1042.     <Camera make="NIKON CORPORATION" model="NIKON Df">
  1043. +       <ID make="Nikon" model="Df">Nikon Df</ID>
  1044.         <CFA width="2" height="2">
  1045.             <Color x="0" y="0">RED</Color>
  1046.             <Color x="1" y="0">GREEN</Color>
  1047. @@ -1562,6 +1711,7 @@
  1048.         </BlackAreas>
  1049.     </Camera>
  1050.     <Camera make="NIKON CORPORATION" model="NIKON D5100"  decoder_version="2">
  1051. +       <ID make="Nikon" model="D5100">Nikon D5100</ID>
  1052.         <CFA width="2" height="2">
  1053.             <Color x="0" y="0">RED</Color>
  1054.             <Color x="1" y="0">GREEN</Color>
  1055. @@ -1572,6 +1722,7 @@
  1056.         <Sensor black="0" white="15892"/>
  1057.     </Camera>
  1058.     <Camera make="NIKON CORPORATION" model="NIKON D3100"  decoder_version="2">
  1059. +       <ID make="Nikon" model="D3100">Nikon D3100</ID>
  1060.         <CFA width="2" height="2">
  1061.             <Color x="0" y="0">GREEN</Color>
  1062.             <Color x="1" y="0">BLUE</Color>
  1063. @@ -1582,6 +1733,7 @@
  1064.         <Sensor black="0" white="16383"/>
  1065.     </Camera>
  1066.     <Camera make="NIKON CORPORATION" model="NIKON D40">
  1067. +       <ID make="Nikon" model="D40">Nikon D40</ID>
  1068.         <CFA width="2" height="2">
  1069.             <Color x="0" y="0">BLUE</Color>
  1070.             <Color x="1" y="0">GREEN</Color>
  1071. @@ -1592,6 +1744,7 @@
  1072.         <Sensor black="0" white="3880"/>
  1073.     </Camera>
  1074.     <Camera make="NIKON CORPORATION" model="NIKON D40X">
  1075. +       <ID make="Nikon" model="D40X">Nikon D40X</ID>
  1076.         <CFA width="2" height="2">
  1077.             <Color x="0" y="0">GREEN</Color>
  1078.             <Color x="1" y="0">BLUE</Color>
  1079. @@ -1602,6 +1755,7 @@
  1080.         <Sensor black="0" white="3880"/>
  1081.     </Camera>
  1082.     <Camera make="NIKON CORPORATION" model="NIKON D50">
  1083. +       <ID make="Nikon" model="D50">Nikon D50</ID>
  1084.         <CFA width="2" height="2">
  1085.             <Color x="0" y="0">BLUE</Color>
  1086.             <Color x="1" y="0">GREEN</Color>
  1087. @@ -1612,6 +1766,7 @@
  1088.         <Sensor black="0" white="3880"/>
  1089.     </Camera>
  1090.     <Camera make="NIKON CORPORATION" model="NIKON D5000">
  1091. +       <ID make="Nikon" model="D5000">Nikon D5000</ID>
  1092.         <CFA width="2" height="2">
  1093.             <Color x="0" y="0">GREEN</Color>
  1094.             <Color x="1" y="0">BLUE</Color>
  1095. @@ -1622,6 +1777,7 @@
  1096.         <Sensor black="0" white="4096"/>
  1097.     </Camera>
  1098.     <Camera make="NIKON CORPORATION" model="NIKON D5200">
  1099. +       <ID make="Nikon" model="D5200">Nikon D5200</ID>
  1100.         <CFA width="2" height="2">
  1101.             <Color x="0" y="0">RED</Color>
  1102.             <Color x="1" y="0">GREEN</Color>
  1103. @@ -1632,6 +1788,7 @@
  1104.         <Sensor black="0" white="4096"/>
  1105.     </Camera>
  1106.     <Camera make="NIKON CORPORATION" model="NIKON D5300" mode="12bit-compressed">
  1107. +       <ID make="Nikon" model="D5300">Nikon D5300</ID>
  1108.         <CFA width="2" height="2">
  1109.             <Color x="0" y="0">RED</Color>
  1110.             <Color x="1" y="0">GREEN</Color>
  1111. @@ -1645,6 +1802,7 @@
  1112.         </Hints>
  1113.     </Camera>
  1114.     <Camera make="NIKON CORPORATION" model="NIKON D5300">
  1115. +       <ID make="Nikon" model="D5300">Nikon D5300</ID>
  1116.         <CFA width="2" height="2">
  1117.             <Color x="0" y="0">RED</Color>
  1118.             <Color x="1" y="0">GREEN</Color>
  1119. @@ -1658,6 +1816,7 @@
  1120.         </Hints>
  1121.     </Camera>
  1122.     <Camera make="NIKON CORPORATION" model="NIKON D5500" mode="12bit-compressed">
  1123. +       <ID make="Nikon" model="D5500">Nikon D5500</ID>
  1124.         <CFA width="2" height="2">
  1125.             <Color x="0" y="0">RED</Color>
  1126.             <Color x="1" y="0">GREEN</Color>
  1127. @@ -1671,6 +1830,7 @@
  1128.         </Hints>
  1129.     </Camera>
  1130.     <Camera make="NIKON CORPORATION" model="NIKON D5500">
  1131. +       <ID make="Nikon" model="D5500">Nikon D5500</ID>
  1132.         <CFA width="2" height="2">
  1133.             <Color x="0" y="0">RED</Color>
  1134.             <Color x="1" y="0">GREEN</Color>
  1135. @@ -1684,6 +1844,7 @@
  1136.         </Hints>
  1137.     </Camera>
  1138.     <Camera make="NIKON CORPORATION" model="NIKON D60">
  1139. +       <ID make="Nikon" model="D60">Nikon D60</ID>
  1140.         <CFA width="2" height="2">
  1141.             <Color x="0" y="0">GREEN</Color>
  1142.             <Color x="1" y="0">BLUE</Color>
  1143. @@ -1694,6 +1855,7 @@
  1144.         <Sensor black="0" white="3880"/>
  1145.     </Camera>
  1146.     <Camera make="NIKON CORPORATION" model="NIKON D600">
  1147. +       <ID make="Nikon" model="D600">Nikon D600</ID>
  1148.         <CFA width="2" height="2">
  1149.             <Color x="0" y="0">RED</Color>
  1150.             <Color x="1" y="0">GREEN</Color>
  1151. @@ -1704,6 +1866,7 @@
  1152.         <Sensor black="0" white="16383"/>
  1153.     </Camera>
  1154.     <Camera make="NIKON CORPORATION" model="NIKON D610">
  1155. +       <ID make="Nikon" model="D610">Nikon D610</ID>
  1156.         <CFA width="2" height="2">
  1157.             <Color x="0" y="0">RED</Color>
  1158.             <Color x="1" y="0">GREEN</Color>
  1159. @@ -1714,6 +1877,7 @@
  1160.         <Sensor black="0" white="16383"/>
  1161.     </Camera>
  1162.     <Camera make="NIKON CORPORATION" model="NIKON D70">
  1163. +       <ID make="Nikon" model="D70">Nikon D70</ID>
  1164.         <CFA width="2" height="2">
  1165.             <Color x="0" y="0">BLUE</Color>
  1166.             <Color x="1" y="0">GREEN</Color>
  1167. @@ -1724,6 +1888,7 @@
  1168.         <Sensor black="0" white="4095"/>
  1169.     </Camera>
  1170.     <Camera make="NIKON CORPORATION" model="NIKON D700">
  1171. +       <ID make="Nikon" model="D700">Nikon D700</ID>
  1172.         <CFA width="2" height="2">
  1173.             <Color x="0" y="0">RED</Color>
  1174.             <Color x="1" y="0">GREEN</Color>
  1175. @@ -1734,6 +1899,7 @@
  1176.         <Sensor black="0" white="3972"/>
  1177.     </Camera>
  1178.     <Camera make="NIKON CORPORATION" model="NIKON D700" mode="14bit-uncompressed">
  1179. +       <ID make="Nikon" model="D700">Nikon D700</ID>
  1180.         <CFA width="2" height="2">
  1181.             <Color x="0" y="0">RED</Color>
  1182.             <Color x="1" y="0">GREEN</Color>
  1183. @@ -1744,6 +1910,7 @@
  1184.         <Sensor black="0" white="16383"/>
  1185.     </Camera>
  1186.     <Camera make="NIKON CORPORATION" model="NIKON D750" mode="12bit-compressed">
  1187. +       <ID make="Nikon" model="D750">Nikon D750</ID>
  1188.         <CFA width="2" height="2">
  1189.             <Color x="0" y="0">RED</Color>
  1190.             <Color x="1" y="0">GREEN</Color>
  1191. @@ -1757,6 +1924,7 @@
  1192.         </Hints>
  1193.     </Camera>
  1194.     <Camera make="NIKON CORPORATION" model="NIKON D750" mode="14bit-compressed">
  1195. +       <ID make="Nikon" model="D750">Nikon D750</ID>
  1196.         <CFA width="2" height="2">
  1197.             <Color x="0" y="0">RED</Color>
  1198.             <Color x="1" y="0">GREEN</Color>
  1199. @@ -1770,6 +1938,7 @@
  1200.         </Hints>
  1201.     </Camera>
  1202.     <Camera make="NIKON CORPORATION" model="NIKON D7000">
  1203. +       <ID make="Nikon" model="D7000">Nikon D7000</ID>
  1204.         <CFA width="2" height="2">
  1205.             <Color x="0" y="0">RED</Color>
  1206.             <Color x="1" y="0">GREEN</Color>
  1207. @@ -1780,6 +1949,7 @@
  1208.         <Sensor black="0" white="4095"/>
  1209.     </Camera>
  1210.     <Camera make="NIKON CORPORATION" model="NIKON D7100">
  1211. +       <ID make="Nikon" model="D7100">Nikon D7100</ID>
  1212.         <CFA width="2" height="2">
  1213.             <Color x="0" y="0">RED</Color>
  1214.             <Color x="1" y="0">GREEN</Color>
  1215. @@ -1790,6 +1960,7 @@
  1216.         <Sensor black="0" white="16383"/>
  1217.     </Camera>
  1218.     <Camera make="NIKON CORPORATION" model="NIKON D7200" mode="14bit-compressed">
  1219. +       <ID make="Nikon" model="D7200">Nikon D7200</ID>
  1220.         <CFA width="2" height="2">
  1221.             <Color x="0" y="0">RED</Color>
  1222.             <Color x="1" y="0">GREEN</Color>
  1223. @@ -1803,6 +1974,7 @@
  1224.         </Hints>
  1225.     </Camera>
  1226.     <Camera make="NIKON CORPORATION" model="NIKON D7200" mode="12bit-compressed">
  1227. +       <ID make="Nikon" model="D7200">Nikon D7200</ID>
  1228.         <CFA width="2" height="2">
  1229.             <Color x="0" y="0">RED</Color>
  1230.             <Color x="1" y="0">GREEN</Color>
  1231. @@ -1816,6 +1988,7 @@
  1232.         </Hints>
  1233.     </Camera>
  1234.     <Camera make="NIKON CORPORATION" model="NIKON D70s">
  1235. +       <ID make="Nikon" model="D70s">Nikon D70s</ID>
  1236.         <CFA width="2" height="2">
  1237.             <Color x="0" y="0">BLUE</Color>
  1238.             <Color x="1" y="0">GREEN</Color>
  1239. @@ -1826,6 +1999,7 @@
  1240.         <Sensor black="0" white="4095"/>
  1241.     </Camera>
  1242.     <Camera make="NIKON CORPORATION" model="NIKON D80">
  1243. +       <ID make="Nikon" model="D80">Nikon D80</ID>
  1244.         <CFA width="2" height="2">
  1245.             <Color x="0" y="0">GREEN</Color>
  1246.             <Color x="1" y="0">BLUE</Color>
  1247. @@ -1836,6 +2010,7 @@
  1248.         <Sensor black="0" white="3880"/>
  1249.     </Camera>
  1250.     <Camera make="NIKON CORPORATION" model="NIKON D800" mode="7424x4924-14bit-uncompressed">
  1251. +       <ID make="Nikon" model="D800">Nikon D800</ID>
  1252.         <CFA width="2" height="2">
  1253.             <Color x="0" y="0">RED</Color>
  1254.             <Color x="1" y="0">GREEN</Color>
  1255. @@ -1844,11 +2019,9 @@
  1256.         </CFA>
  1257.         <Crop x="2" y="0" width="-48" height="0"/>
  1258.         <Sensor black="0" white="15520"/>
  1259. -       <Aliases>
  1260. -           <Alias>NIKON D800E</Alias>
  1261. -       </Aliases>
  1262.     </Camera>
  1263.     <Camera make="NIKON CORPORATION" model="NIKON D800" mode="14bit-uncompressed">
  1264. +       <ID make="Nikon" model="D800">Nikon D800</ID>
  1265.         <CFA width="2" height="2">
  1266.             <Color x="0" y="0">RED</Color>
  1267.             <Color x="1" y="0">GREEN</Color>
  1268. @@ -1857,11 +2030,42 @@
  1269.         </CFA>
  1270.         <Crop x="0" y="0" width="0" height="0"/>
  1271.         <Sensor black="0" white="15520"/>
  1272. -       <Aliases>
  1273. -           <Alias>NIKON D800E</Alias>
  1274. -       </Aliases>
  1275.     </Camera>
  1276.     <Camera make="NIKON CORPORATION" model="NIKON D800">
  1277. +       <ID make="Nikon" model="D800">Nikon D800</ID>
  1278. +       <CFA width="2" height="2">
  1279. +           <Color x="0" y="0">RED</Color>
  1280. +           <Color x="1" y="0">GREEN</Color>
  1281. +           <Color x="0" y="1">GREEN</Color>
  1282. +           <Color x="1" y="1">BLUE</Color>
  1283. +       </CFA>
  1284. +       <Crop x="2" y="0" width="-48" height="0"/>
  1285. +       <Sensor black="0" white="3880"/>
  1286. +   </Camera>
  1287. +   <Camera make="NIKON CORPORATION" model="NIKON D800E" mode="7424x4924-14bit-uncompressed">
  1288. +       <ID make="Nikon" model="D800E">Nikon D800E</ID>
  1289. +       <CFA width="2" height="2">
  1290. +           <Color x="0" y="0">RED</Color>
  1291. +           <Color x="1" y="0">GREEN</Color>
  1292. +           <Color x="0" y="1">GREEN</Color>
  1293. +           <Color x="1" y="1">BLUE</Color>
  1294. +       </CFA>
  1295. +       <Crop x="2" y="0" width="-48" height="0"/>
  1296. +       <Sensor black="0" white="15520"/>
  1297. +   </Camera>
  1298. +   <Camera make="NIKON CORPORATION" model="NIKON D800E" mode="14bit-uncompressed">
  1299. +       <ID make="Nikon" model="D800E">Nikon D800E</ID>
  1300. +       <CFA width="2" height="2">
  1301. +           <Color x="0" y="0">RED</Color>
  1302. +           <Color x="1" y="0">GREEN</Color>
  1303. +           <Color x="0" y="1">GREEN</Color>
  1304. +           <Color x="1" y="1">BLUE</Color>
  1305. +       </CFA>
  1306. +       <Crop x="0" y="0" width="0" height="0"/>
  1307. +       <Sensor black="0" white="15520"/>
  1308. +   </Camera>
  1309. +   <Camera make="NIKON CORPORATION" model="NIKON D800E">
  1310. +       <ID make="Nikon" model="D800E">Nikon D800E</ID>
  1311.         <CFA width="2" height="2">
  1312.             <Color x="0" y="0">RED</Color>
  1313.             <Color x="1" y="0">GREEN</Color>
  1314. @@ -1870,15 +2074,14 @@
  1315.         </CFA>
  1316.         <Crop x="2" y="0" width="-48" height="0"/>
  1317.         <Sensor black="0" white="3880"/>
  1318. -       <Aliases>
  1319. -           <Alias>NIKON D800E</Alias>
  1320. -       </Aliases>
  1321.     </Camera>
  1322.     <Camera make="NIKON CORPORATION" model="NIKON D810" mode="sNEF-uncompressed">
  1323. +       <ID make="Nikon" model="D810">Nikon D810</ID>
  1324.         <Crop x="0" y="0" width="0" height="0"/>
  1325.         <Sensor black="0" white="65535"/>
  1326.     </Camera>
  1327.     <Camera make="NIKON CORPORATION" model="NIKON D810" mode="12bit-uncompressed">
  1328. +       <ID make="Nikon" model="D810">Nikon D810</ID>
  1329.         <CFA width="2" height="2">
  1330.             <Color x="0" y="0">RED</Color>
  1331.             <Color x="1" y="0">GREEN</Color>
  1332. @@ -1893,6 +2096,7 @@
  1333.         </Hints>
  1334.     </Camera>
  1335.     <Camera make="NIKON CORPORATION" model="NIKON D810" mode="12bit-compressed">
  1336. +       <ID make="Nikon" model="D810">Nikon D810</ID>
  1337.         <CFA width="2" height="2">
  1338.             <Color x="0" y="0">RED</Color>
  1339.             <Color x="1" y="0">GREEN</Color>
  1340. @@ -1906,6 +2110,7 @@
  1341.         </Hints>
  1342.     </Camera>
  1343.     <Camera make="NIKON CORPORATION" model="NIKON D810" mode="14bit-uncompressed">
  1344. +       <ID make="Nikon" model="D810">Nikon D810</ID>
  1345.         <CFA width="2" height="2">
  1346.             <Color x="0" y="0">RED</Color>
  1347.             <Color x="1" y="0">GREEN</Color>
  1348. @@ -1920,6 +2125,7 @@
  1349.         </Hints>
  1350.     </Camera>
  1351.     <Camera make="NIKON CORPORATION" model="NIKON D810" mode="14bit-compressed">
  1352. +       <ID make="Nikon" model="D810">Nikon D810</ID>
  1353.         <CFA width="2" height="2">
  1354.             <Color x="0" y="0">RED</Color>
  1355.             <Color x="1" y="0">GREEN</Color>
  1356. @@ -1933,10 +2139,12 @@
  1357.         </Hints>
  1358.     </Camera>
  1359.     <Camera make="NIKON CORPORATION" model="NIKON D4S" mode="sNEF-uncompressed">
  1360. +       <ID make="Nikon" model="D4S">Nikon D4S</ID>
  1361.         <Crop x="0" y="0" width="0" height="0"/>
  1362.         <Sensor black="0" white="65535"/>
  1363.     </Camera>
  1364.     <Camera make="NIKON CORPORATION" model="NIKON D4S" mode="12bit-compressed">
  1365. +       <ID make="Nikon" model="D4S">Nikon D4S</ID>
  1366.         <CFA width="2" height="2">
  1367.             <Color x="0" y="0">RED</Color>
  1368.             <Color x="1" y="0">GREEN</Color>
  1369. @@ -1950,6 +2158,7 @@
  1370.         </Hints>
  1371.     </Camera>
  1372.     <Camera make="NIKON CORPORATION" model="NIKON D4S" mode="12bit-uncompressed">
  1373. +       <ID make="Nikon" model="D4S">Nikon D4S</ID>
  1374.         <CFA width="2" height="2">
  1375.             <Color x="0" y="0">RED</Color>
  1376.             <Color x="1" y="0">GREEN</Color>
  1377. @@ -1964,6 +2173,7 @@
  1378.         </Hints>
  1379.     </Camera>
  1380.     <Camera make="NIKON CORPORATION" model="NIKON D4S" mode="14bit-uncompressed">
  1381. +       <ID make="Nikon" model="D4S">Nikon D4S</ID>
  1382.         <CFA width="2" height="2">
  1383.             <Color x="0" y="0">RED</Color>
  1384.             <Color x="1" y="0">GREEN</Color>
  1385. @@ -1978,6 +2188,7 @@
  1386.         </Hints>
  1387.     </Camera>
  1388.     <Camera make="NIKON CORPORATION" model="NIKON D4S">
  1389. +       <ID make="Nikon" model="D4S">Nikon D4S</ID>
  1390.         <CFA width="2" height="2">
  1391.             <Color x="0" y="0">RED</Color>
  1392.             <Color x="1" y="0">GREEN</Color>
  1393. @@ -1991,6 +2202,7 @@
  1394.         </Hints>
  1395.     </Camera>
  1396.     <Camera make="NIKON CORPORATION" model="NIKON D90">
  1397. +       <ID make="Nikon" model="D90">Nikon D90</ID>
  1398.         <CFA width="2" height="2">
  1399.             <Color x="0" y="0">GREEN</Color>
  1400.             <Color x="1" y="0">BLUE</Color>
  1401. @@ -2001,6 +2213,7 @@
  1402.         <Sensor black="0" white="3767"/>
  1403.     </Camera>
  1404.     <Camera make="NIKON CORPORATION" model="NIKON 1 J1" decoder_version="4">
  1405. +       <ID make="Nikon" model="1 J1">Nikon 1 J1</ID>
  1406.         <CFA width="2" height="2">
  1407.             <Color x="0" y="0">RED</Color>
  1408.             <Color x="1" y="0">GREEN</Color>
  1409. @@ -2011,6 +2224,7 @@
  1410.         <Sensor black="0" white="0"/>
  1411.     </Camera>
  1412.     <Camera make="NIKON CORPORATION" model="NIKON 1 J2" decoder_version="4">
  1413. +       <ID make="Nikon" model="1 J2">Nikon 1 J2</ID>
  1414.         <CFA width="2" height="2">
  1415.             <Color x="0" y="0">RED</Color>
  1416.             <Color x="1" y="0">GREEN</Color>
  1417. @@ -2021,6 +2235,7 @@
  1418.         <Sensor black="0" white="0"/>
  1419.     </Camera>
  1420.     <Camera make="NIKON CORPORATION" model="NIKON 1 J3" decoder_version="4">
  1421. +       <ID make="Nikon" model="1 J3">Nikon 1 J3</ID>
  1422.         <CFA width="2" height="2">
  1423.             <Color x="0" y="0">RED</Color>
  1424.             <Color x="1" y="0">GREEN</Color>
  1425. @@ -2031,6 +2246,7 @@
  1426.         <Sensor black="0" white="4095"/>
  1427.     </Camera>
  1428.     <Camera make="NIKON CORPORATION" model="NIKON 1 J4" decoder_version="4">
  1429. +       <ID make="Nikon" model="1 J4">Nikon 1 J4</ID>
  1430.         <CFA width="2" height="2">
  1431.             <Color x="0" y="0">RED</Color>
  1432.             <Color x="1" y="0">GREEN</Color>
  1433. @@ -2043,7 +2259,22 @@
  1434.             <Hint name="nikon_override_auto_black" value=""/>
  1435.         </Hints>
  1436.     </Camera>
  1437. +   <Camera make="NIKON CORPORATION" model="NIKON 1 J5">
  1438. +       <ID make="Nikon" model="1 J5">Nikon 1 J5</ID>
  1439. +       <CFA width="2" height="2">
  1440. +           <Color x="0" y="0">RED</Color>
  1441. +           <Color x="1" y="0">GREEN</Color>
  1442. +           <Color x="0" y="1">GREEN</Color>
  1443. +           <Color x="1" y="1">BLUE</Color>
  1444. +       </CFA>
  1445. +       <Crop x="0" y="0" width="0" height="0"/>
  1446. +       <Sensor black="200" white="3800"/>
  1447. +       <Hints>
  1448. +           <Hint name="nikon_override_auto_black" value=""/>
  1449. +       </Hints>
  1450. +   </Camera>
  1451.     <Camera make="NIKON CORPORATION" model="NIKON 1 S1" decoder_version="4">
  1452. +       <ID make="Nikon" model="1 S1">Nikon 1 S1</ID>
  1453.         <CFA width="2" height="2">
  1454.             <Color x="0" y="0">RED</Color>
  1455.             <Color x="1" y="0">GREEN</Color>
  1456. @@ -2054,6 +2285,7 @@
  1457.         <Sensor black="0" white="0"/>
  1458.     </Camera>
  1459.     <Camera make="NIKON CORPORATION" model="NIKON 1 S2" decoder_version="4">
  1460. +       <ID make="Nikon" model="1 S2">Nikon 1 S2</ID>
  1461.         <CFA width="2" height="2">
  1462.             <Color x="0" y="0">RED</Color>
  1463.             <Color x="1" y="0">GREEN</Color>
  1464. @@ -2067,6 +2299,7 @@
  1465.         </Hints>
  1466.     </Camera>
  1467.     <Camera make="NIKON CORPORATION" model="NIKON 1 V1" decoder_version="4">
  1468. +       <ID make="Nikon" model="1 V1">Nikon 1 V1</ID>
  1469.         <CFA width="2" height="2">
  1470.             <Color x="0" y="0">RED</Color>
  1471.             <Color x="1" y="0">GREEN</Color>
  1472. @@ -2077,6 +2310,7 @@
  1473.         <Sensor black="0" white="0"/>
  1474.     </Camera>
  1475.     <Camera make="NIKON CORPORATION" model="NIKON 1 V2" decoder_version="4">
  1476. +       <ID make="Nikon" model="1 V2">Nikon 1 V2</ID>
  1477.         <CFA width="2" height="2">
  1478.             <Color x="0" y="0">RED</Color>
  1479.             <Color x="1" y="0">GREEN</Color>
  1480. @@ -2087,6 +2321,7 @@
  1481.         <Sensor black="0" white="4095"/>
  1482.     </Camera>
  1483.     <Camera make="NIKON CORPORATION" model="NIKON 1 AW1" decoder_version="4">
  1484. +       <ID make="Nikon" model="1 AW1">Nikon 1 AW1</ID>
  1485.         <CFA width="2" height="2">
  1486.             <Color x="0" y="0">RED</Color>
  1487.             <Color x="1" y="0">GREEN</Color>
  1488. @@ -2097,6 +2332,7 @@
  1489.         <Sensor black="0" white="4095"/>
  1490.     </Camera>
  1491.     <Camera make="NIKON" model="E5400" decoder_version="3">
  1492. +       <ID make="Nikon" model="E5400">Nikon E5400</ID>
  1493.         <CFA width="2" height="2">
  1494.             <Color x="0" y="0">BLUE</Color>
  1495.             <Color x="1" y="0">GREEN</Color>
  1496. @@ -2110,6 +2346,7 @@
  1497.         </Hints>
  1498.     </Camera>
  1499.     <Camera make="NIKON" model="E5700" decoder_version="4">
  1500. +       <ID make="Nikon" model="E5700">Nikon E5700</ID>
  1501.         <CFA width="2" height="2">
  1502.             <Color x="0" y="0">BLUE</Color>
  1503.             <Color x="1" y="0">GREEN</Color>
  1504. @@ -2123,6 +2360,7 @@
  1505.         </Hints>
  1506.     </Camera>
  1507.     <Camera make="NIKON" model="E8400" decoder_version="3">
  1508. +       <ID make="Nikon" model="E8400">Nikon E8400</ID>
  1509.         <CFA width="2" height="2">
  1510.             <Color x="0" y="0">BLUE</Color>
  1511.             <Color x="1" y="0">GREEN</Color>
  1512. @@ -2136,6 +2374,7 @@
  1513.         </Hints>
  1514.     </Camera>
  1515.     <Camera make="NIKON" model="COOLPIX P330" decoder_version="5">
  1516. +       <ID make="Nikon" model="Coolpix P330">Nikon Coolpix P330</ID>
  1517.         <CFA width="2" height="2">
  1518.             <Color x="0" y="0">RED</Color>
  1519.             <Color x="1" y="0">GREEN</Color>
  1520. @@ -2150,6 +2389,7 @@
  1521.         </Hints>
  1522.     </Camera>
  1523.     <Camera make="NIKON" model="COOLPIX P340" decoder_version="5">
  1524. +       <ID make="Nikon" model="Coolpix P340">Nikon Coolpix P340</ID>
  1525.         <CFA width="2" height="2">
  1526.             <Color x="0" y="0">RED</Color>
  1527.             <Color x="1" y="0">GREEN</Color>
  1528. @@ -2160,6 +2400,7 @@
  1529.         <Sensor black="200" white="3800"/>
  1530.     </Camera>
  1531.     <Camera make="NIKON CORPORATION" model="COOLPIX A">
  1532. +       <ID make="Nikon" model="Coolpix A">Nikon Coolpix A</ID>
  1533.         <CFA width="2" height="2">
  1534.             <Color x="0" y="0">RED</Color>
  1535.             <Color x="1" y="0">GREEN</Color>
  1536. @@ -2170,6 +2411,7 @@
  1537.         <Sensor black="0" white="4095"/>
  1538.     </Camera>
  1539.     <Camera make="NIKON" model="COOLPIX P6000" decoder_version="1">
  1540. +       <ID make="Nikon" model="Coolpix P6000">Nikon Coolpix P6000</ID>
  1541.         <CFA width="2" height="2">
  1542.             <Color x="0" y="0">RED</Color>
  1543.             <Color x="1" y="0">GREEN</Color>
  1544. @@ -2184,6 +2426,7 @@
  1545.         </Hints>
  1546.     </Camera>
  1547.     <Camera make="NIKON" model="COOLPIX P7000" decoder_version="1">
  1548. +       <ID make="Nikon" model="Coolpix P7000">Nikon Coolpix P7000</ID>
  1549.         <CFA width="2" height="2">
  1550.             <Color x="0" y="0">RED</Color>
  1551.             <Color x="1" y="0">GREEN</Color>
  1552. @@ -2200,6 +2443,7 @@
  1553.         </Hints>
  1554.     </Camera>
  1555.     <Camera make="NIKON" model="COOLPIX P7100" decoder_version="1">
  1556. +       <ID make="Nikon" model="Coolpix P7100">Nikon Coolpix P7100</ID>
  1557.         <CFA width="2" height="2">
  1558.             <Color x="0" y="0">RED</Color>
  1559.             <Color x="1" y="0">GREEN</Color>
  1560. @@ -2216,6 +2460,7 @@
  1561.         </Hints>
  1562.     </Camera>
  1563.     <Camera make="NIKON" model="COOLPIX P7700" decoder_version="5">
  1564. +       <ID make="Nikon" model="Coolpix P7700">Nikon Coolpix P7700</ID>
  1565.         <CFA width="2" height="2">
  1566.             <Color x="0" y="0">RED</Color>
  1567.             <Color x="1" y="0">GREEN</Color>
  1568. @@ -2230,6 +2475,7 @@
  1569.         </Hints>
  1570.     </Camera>
  1571.     <Camera make="NIKON" model="COOLPIX P7800" decoder_version="5">
  1572. +       <ID make="Nikon" model="Coolpix P7800">Nikon Coolpix P7800</ID>
  1573.         <CFA width="2" height="2">
  1574.             <Color x="0" y="0">RED</Color>
  1575.             <Color x="1" y="0">GREEN</Color>
  1576. @@ -2244,6 +2490,7 @@
  1577.         </Hints>
  1578.     </Camera>
  1579.     <Camera make="NIKON" model="E8800" decoder_version="3">
  1580. +       <ID make="Nikon" model="Coolpix E8800">Nikon Coolpix E8800</ID>
  1581.         <CFA width="2" height="2">
  1582.             <Color x="0" y="0">BLUE</Color>
  1583.             <Color x="1" y="0">GREEN</Color>
  1584. @@ -2257,6 +2504,7 @@
  1585.         </Hints>
  1586.     </Camera>
  1587.     <Camera make="OLYMPUS OPTICAL CO.,LTD" model="C5050Z">
  1588. +       <ID make="Olympus" model="C5050Z">Olympus C5050Z</ID>
  1589.         <CFA width="2" height="2">
  1590.             <Color x="0" y="0">BLUE</Color>
  1591.             <Color x="1" y="0">GREEN</Color>
  1592. @@ -2267,6 +2515,7 @@
  1593.         <Sensor black="0" white="4095"/>
  1594.     </Camera>
  1595.     <Camera make="OLYMPUS CORPORATION" model="C5060WZ">
  1596. +       <ID make="Olympus" model="C5060WZ">Olympus C5060WZ</ID>
  1597.         <CFA width="2" height="2">
  1598.             <Color x="0" y="0">RED</Color>
  1599.             <Color x="1" y="0">GREEN</Color>
  1600. @@ -2277,6 +2526,7 @@
  1601.         <Sensor black="0" white="4095"/>
  1602.     </Camera>
  1603.     <Camera make="OLYMPUS CORPORATION" model="C8080WZ">
  1604. +       <ID make="Olympus" model="C8080WZ">Olympus C8080WZ</ID>
  1605.         <CFA width="2" height="2">
  1606.             <Color x="0" y="0">BLUE</Color>
  1607.             <Color x="1" y="0">GREEN</Color>
  1608. @@ -2287,6 +2537,7 @@
  1609.         <Sensor black="0" white="4095"/>
  1610.     </Camera>
  1611.     <Camera make="OLYMPUS CORPORATION" model="E-1">
  1612. +       <ID make="Olympus" model="E-1">Olympus E-1</ID>
  1613.         <CFA width="2" height="2">
  1614.             <Color x="0" y="0">GREEN</Color>
  1615.             <Color x="1" y="0">RED</Color>
  1616. @@ -2297,6 +2548,7 @@
  1617.         <Sensor black="65" white="4095"/>
  1618.     </Camera>
  1619.     <Camera make="OLYMPUS IMAGING CORP." model="C7070WZ">
  1620. +       <ID make="Olympus" model="C7070WZ">Olympus C7070WZ</ID>
  1621.         <CFA width="2" height="2">
  1622.             <Color x="0" y="0">RED</Color>
  1623.             <Color x="1" y="0">GREEN</Color>
  1624. @@ -2307,6 +2559,7 @@
  1625.         <Sensor black="0" white="4095"/>
  1626.     </Camera>
  1627.     <Camera make="OLYMPUS IMAGING CORP." model="E-3">
  1628. +       <ID make="Olympus" model="E-3">Olympus E-3</ID>
  1629.         <CFA width="2" height="2">
  1630.             <Color x="0" y="0">RED</Color>
  1631.             <Color x="1" y="0">GREEN</Color>
  1632. @@ -2317,6 +2570,7 @@
  1633.         <Sensor black="65" white="4015"/>
  1634.     </Camera>
  1635.     <Camera make="OLYMPUS IMAGING CORP." model="E-30">
  1636. +       <ID make="Olympus" model="E-30">Olympus E-30</ID>
  1637.         <CFA width="2" height="2">
  1638.             <Color x="0" y="0">BLUE</Color>
  1639.             <Color x="1" y="0">GREEN</Color>
  1640. @@ -2327,6 +2581,7 @@
  1641.         <Sensor black="65" white="4015"/>
  1642.     </Camera>
  1643.     <Camera make="OLYMPUS IMAGING CORP." model="E-300" decoder_version="3">
  1644. +       <ID make="Olympus" model="E-300">Olympus E-300</ID>
  1645.         <CFA width="2" height="2">
  1646.             <Color x="0" y="0">RED</Color>
  1647.             <Color x="1" y="0">GREEN</Color>
  1648. @@ -2341,6 +2596,7 @@
  1649.         </Hints>
  1650.     </Camera>
  1651.     <Camera make="OLYMPUS IMAGING CORP." model="E-330" decoder_version="3">
  1652. +       <ID make="Olympus" model="E-330">Olympus E-330</ID>
  1653.         <CFA width="2" height="2">
  1654.             <Color x="0" y="0">RED</Color>
  1655.             <Color x="1" y="0">GREEN</Color>
  1656. @@ -2355,6 +2611,7 @@
  1657.         </Hints>
  1658.     </Camera>
  1659.     <Camera make="OLYMPUS IMAGING CORP." model="E-400">
  1660. +       <ID make="Olympus" model="E-400">Olympus E-400</ID>
  1661.         <CFA width="2" height="2">
  1662.             <Color x="0" y="0">GREEN</Color>
  1663.             <Color x="1" y="0">RED</Color>
  1664. @@ -2365,6 +2622,7 @@
  1665.         <Sensor black="96" white="4095"/>
  1666.     </Camera>
  1667.     <Camera make="OLYMPUS IMAGING CORP." model="E-410">
  1668. +       <ID make="Olympus" model="E-410">Olympus E-410</ID>
  1669.         <CFA width="2" height="2">
  1670.             <Color x="0" y="0">RED</Color>
  1671.             <Color x="1" y="0">GREEN</Color>
  1672. @@ -2375,6 +2633,7 @@
  1673.         <Sensor black="72" white="3500"/>
  1674.     </Camera>
  1675.     <Camera make="OLYMPUS IMAGING CORP." model="E-420">
  1676. +       <ID make="Olympus" model="E-420">Olympus E-420</ID>
  1677.         <CFA width="2" height="2">
  1678.             <Color x="0" y="0">RED</Color>
  1679.             <Color x="1" y="0">GREEN</Color>
  1680. @@ -2385,6 +2644,7 @@
  1681.         <Sensor black="68" white="4015"/>
  1682.     </Camera>
  1683.     <Camera make="OLYMPUS IMAGING CORP." model="E-450">
  1684. +       <ID make="Olympus" model="E-450">Olympus E-450</ID>
  1685.         <CFA width="2" height="2">
  1686.             <Color x="0" y="0">RED</Color>
  1687.             <Color x="1" y="0">GREEN</Color>
  1688. @@ -2395,6 +2655,7 @@
  1689.         <Sensor black="69" white="4015"/>
  1690.     </Camera>
  1691.     <Camera make="OLYMPUS IMAGING CORP." model="E-500" decoder_version="3">
  1692. +       <ID make="Olympus" model="E-500">Olympus E-500</ID>
  1693.         <CFA width="2" height="2">
  1694.             <Color x="0" y="0">RED</Color>
  1695.             <Color x="1" y="0">GREEN</Color>
  1696. @@ -2409,6 +2670,7 @@
  1697.         </Hints>
  1698.     </Camera>
  1699.     <Camera make="OLYMPUS IMAGING CORP." model="E-510">
  1700. +       <ID make="Olympus" model="E-510">Olympus E-510</ID>
  1701.         <CFA width="2" height="2">
  1702.             <Color x="0" y="0">RED</Color>
  1703.             <Color x="1" y="0">GREEN</Color>
  1704. @@ -2419,6 +2681,7 @@
  1705.         <Sensor black="72" white="3500"/>
  1706.     </Camera>
  1707.     <Camera make="OLYMPUS IMAGING CORP." model="E-520">
  1708. +       <ID make="Olympus" model="E-520">Olympus E-520</ID>
  1709.         <CFA width="2" height="2">
  1710.             <Color x="0" y="0">RED</Color>
  1711.             <Color x="1" y="0">GREEN</Color>
  1712. @@ -2429,6 +2692,7 @@
  1713.         <Sensor black="69" white="4015"/>
  1714.     </Camera>
  1715.     <Camera make="OLYMPUS IMAGING CORP." model="E-600">
  1716. +       <ID make="Olympus" model="E-600">Olympus E-600</ID>
  1717.         <CFA width="2" height="2">
  1718.             <Color x="0" y="0">BLUE</Color>
  1719.             <Color x="1" y="0">GREEN</Color>
  1720. @@ -2439,6 +2703,7 @@
  1721.         <Sensor black="64" white="4095"/>
  1722.     </Camera>
  1723.     <Camera make="OLYMPUS IMAGING CORP." model="E-620">
  1724. +       <ID make="Olympus" model="E-620">Olympus E-620</ID>
  1725.         <CFA width="2" height="2">
  1726.             <Color x="0" y="0">BLUE</Color>
  1727.             <Color x="1" y="0">GREEN</Color>
  1728. @@ -2449,6 +2714,7 @@
  1729.         <Sensor black="64" white="4095"/>
  1730.     </Camera>
  1731.     <Camera make="OLYMPUS IMAGING CORP." model="SP350">
  1732. +       <ID make="Olympus" model="SP350">Olympus SP350</ID>
  1733.         <CFA width="2" height="2">
  1734.             <Color x="0" y="0">RED</Color>
  1735.             <Color x="1" y="0">GREEN</Color>
  1736. @@ -2459,6 +2725,7 @@
  1737.         <Sensor black="0" white="4095"/>
  1738.     </Camera>
  1739.     <Camera make="OLYMPUS IMAGING CORP." model="SP500UZ">
  1740. +       <ID make="Olympus" model="SP500UZ">Olympus SP500UZ</ID>
  1741.         <CFA width="2" height="2">
  1742.             <Color x="0" y="0">GREEN</Color>
  1743.             <Color x="1" y="0">BLUE</Color>
  1744. @@ -2469,6 +2736,7 @@
  1745.         <Sensor black="0" white="4095"/>
  1746.     </Camera>
  1747.     <Camera make="OLYMPUS IMAGING CORP." model="E-5">
  1748. +       <ID make="Olympus" model="E-5">Olympus E-5</ID>
  1749.         <CFA width="2" height="2">
  1750.             <Color x="0" y="0">BLUE</Color>
  1751.             <Color x="1" y="0">GREEN</Color>
  1752. @@ -2479,6 +2747,7 @@
  1753.         <Sensor black="80" white="4095"/>
  1754.     </Camera>
  1755.     <Camera make="OLYMPUS OPTICAL CO.,LTD" model="E-10">
  1756. +       <ID make="Olympus" model="E-10">Olympus E-10</ID>
  1757.         <CFA width="2" height="2">
  1758.             <Color x="0" y="0">RED</Color>
  1759.             <Color x="1" y="0">GREEN</Color>
  1760. @@ -2489,6 +2758,7 @@
  1761.         <Sensor black="32" white="1023"/>
  1762.     </Camera>
  1763.     <Camera make="OLYMPUS OPTICAL CO.,LTD" model="E-20,E-20N,E-20P">
  1764. +       <ID make="Olympus" model="E-20">Olympus E-20</ID>
  1765.         <CFA width="2" height="2">
  1766.             <Color x="0" y="0">RED</Color>
  1767.             <Color x="1" y="0">GREEN</Color>
  1768. @@ -2499,6 +2769,7 @@
  1769.         <Sensor black="0" white="4092"/>
  1770.     </Camera>
  1771.     <Camera make="OLYMPUS IMAGING CORP." model="E-M1">
  1772. +       <ID make="Olympus" model="E-M1">Olympus E-M1</ID>
  1773.         <CFA width="2" height="2">
  1774.             <Color x="0" y="0">BLUE</Color>
  1775.             <Color x="1" y="0">GREEN</Color>
  1776. @@ -2509,6 +2780,7 @@
  1777.         <Sensor black="255" white="4095"/>
  1778.     </Camera>
  1779.     <Camera make="OLYMPUS IMAGING CORP." model="E-M10">
  1780. +       <ID make="Olympus" model="E-M10">Olympus E-M10</ID>
  1781.         <CFA width="2" height="2">
  1782.             <Color x="0" y="0">RED</Color>
  1783.             <Color x="1" y="0">GREEN</Color>
  1784. @@ -2519,6 +2791,7 @@
  1785.         <Sensor black="254" white="4000"/>
  1786.     </Camera>
  1787.     <Camera make="OLYMPUS IMAGING CORP." model="E-M5">
  1788. +       <ID make="Olympus" model="E-M5">Olympus E-M5</ID>
  1789.         <CFA width="2" height="2">
  1790.             <Color x="0" y="0">RED</Color>
  1791.             <Color x="1" y="0">GREEN</Color>
  1792. @@ -2529,6 +2802,7 @@
  1793.         <Sensor black="255" white="4095"/>
  1794.     </Camera>
  1795.     <Camera make="OLYMPUS IMAGING CORP." model="E-M5MarkII">
  1796. +       <ID make="Olympus" model="E-M5 Mark II">Olympus E-M5 Mark II</ID>
  1797.         <CFA width="2" height="2">
  1798.             <Color x="0" y="0">RED</Color>
  1799.             <Color x="1" y="0">GREEN</Color>
  1800. @@ -2544,6 +2818,7 @@
  1801.         <Sensor black="187" white="4000" iso_min="25600" iso_max="25600"/>
  1802.     </Camera>
  1803.     <Camera make="OLYMPUS IMAGING CORP." model="E-P1">
  1804. +       <ID make="Olympus" model="E-P1">Olympus E-P1</ID>
  1805.         <CFA width="2" height="2">
  1806.             <Color x="0" y="0">RED</Color>
  1807.             <Color x="1" y="0">GREEN</Color>
  1808. @@ -2554,6 +2829,7 @@
  1809.         <Sensor black="55" white="4095"/>
  1810.     </Camera>
  1811.     <Camera make="OLYMPUS IMAGING CORP." model="E-PL1">
  1812. +       <ID make="Olympus" model="E-PL1">Olympus E-PL1</ID>
  1813.         <CFA width="2" height="2">
  1814.             <Color x="0" y="0">RED</Color>
  1815.             <Color x="1" y="0">GREEN</Color>
  1816. @@ -2564,6 +2840,7 @@
  1817.         <Sensor black="55" white="4095"/>
  1818.     </Camera>
  1819.     <Camera make="OLYMPUS IMAGING CORP." model="E-PL2">
  1820. +       <ID make="Olympus" model="E-PL2">Olympus E-PL2</ID>
  1821.         <CFA width="2" height="2">
  1822.             <Color x="0" y="0">RED</Color>
  1823.             <Color x="1" y="0">GREEN</Color>
  1824. @@ -2577,6 +2854,7 @@
  1825.         </BlackAreas>
  1826.     </Camera>
  1827.     <Camera make="OLYMPUS IMAGING CORP." model="E-PL3">
  1828. +       <ID make="Olympus" model="E-PL3">Olympus E-PL3</ID>
  1829.         <CFA width="2" height="2">
  1830.             <Color x="0" y="0">RED</Color>
  1831.             <Color x="1" y="0">GREEN</Color>
  1832. @@ -2590,6 +2868,7 @@
  1833.         </BlackAreas>
  1834.     </Camera>
  1835.     <Camera make="OLYMPUS IMAGING CORP." model="E-PL5">
  1836. +       <ID make="Olympus" model="E-PL5">Olympus E-PL5</ID>
  1837.         <CFA width="2" height="2">
  1838.             <Color x="0" y="0">RED</Color>
  1839.             <Color x="1" y="0">GREEN</Color>
  1840. @@ -2600,6 +2879,7 @@
  1841.         <Sensor black="0" white="4095"/>
  1842.     </Camera>
  1843.     <Camera make="OLYMPUS IMAGING CORP." model="E-PL6">
  1844. +       <ID make="Olympus" model="E-PL6">Olympus E-PL6</ID>
  1845.         <CFA width="2" height="2">
  1846.             <Color x="0" y="0">RED</Color>
  1847.             <Color x="1" y="0">GREEN</Color>
  1848. @@ -2610,6 +2890,7 @@
  1849.         <Sensor black="0" white="4095"/>
  1850.     </Camera>
  1851.     <Camera make="OLYMPUS IMAGING CORP." model="E-PL7">
  1852. +       <ID make="Olympus" model="E-PL7">Olympus E-PL7</ID>
  1853.         <CFA width="2" height="2">
  1854.             <Color x="0" y="0">RED</Color>
  1855.             <Color x="1" y="0">GREEN</Color>
  1856. @@ -2620,6 +2901,7 @@
  1857.         <Sensor black="0" white="4095"/>
  1858.     </Camera>
  1859.     <Camera make="OLYMPUS IMAGING CORP." model="E-P5">
  1860. +       <ID make="Olympus" model="E-P5">Olympus E-P5</ID>
  1861.         <CFA width="2" height="2">
  1862.             <Color x="0" y="0">RED</Color>
  1863.             <Color x="1" y="0">GREEN</Color>
  1864. @@ -2630,6 +2912,7 @@
  1865.         <Sensor black="250" white="4095"/>
  1866.     </Camera>
  1867.     <Camera make="OLYMPUS IMAGING CORP." model="E-PM1">
  1868. +       <ID make="Olympus" model="E-PM1">Olympus E-PM1</ID>
  1869.         <CFA width="2" height="2">
  1870.             <Color x="0" y="0">RED</Color>
  1871.             <Color x="1" y="0">GREEN</Color>
  1872. @@ -2643,6 +2926,7 @@
  1873.         </BlackAreas>
  1874.     </Camera>
  1875.     <Camera make="OLYMPUS IMAGING CORP." model="E-PM2">
  1876. +       <ID make="Olympus" model="E-PM2">Olympus E-PM2</ID>
  1877.         <CFA width="2" height="2">
  1878.             <Color x="0" y="0">RED</Color>
  1879.             <Color x="1" y="0">GREEN</Color>
  1880. @@ -2653,6 +2937,7 @@
  1881.         <Sensor black="250" white="4095"/>
  1882.     </Camera>
  1883.     <Camera make="OLYMPUS IMAGING CORP." model="E-P2">
  1884. +       <ID make="Olympus" model="E-P2">Olympus E-P2</ID>
  1885.         <CFA width="2" height="2">
  1886.             <Color x="0" y="0">RED</Color>
  1887.             <Color x="1" y="0">GREEN</Color>
  1888. @@ -2663,6 +2948,7 @@
  1889.         <Sensor black="55" white="4095"/>
  1890.     </Camera>
  1891.     <Camera make="OLYMPUS IMAGING CORP." model="E-P3">
  1892. +       <ID make="Olympus" model="E-P3">Olympus E-P3</ID>
  1893.         <CFA width="2" height="2">
  1894.             <Color x="0" y="0">RED</Color>
  1895.             <Color x="1" y="0">GREEN</Color>
  1896. @@ -2673,6 +2959,7 @@
  1897.         <Sensor black="0" white="4095"/>
  1898.     </Camera>
  1899.     <Camera make="OLYMPUS IMAGING CORP." model="XZ-1">
  1900. +       <ID make="Olympus" model="XZ-1">Olympus XZ-1</ID>
  1901.         <CFA width="2" height="2">
  1902.             <Color x="0" y="0">RED</Color>
  1903.             <Color x="1" y="0">GREEN</Color>
  1904. @@ -2683,6 +2970,7 @@
  1905.         <Sensor black="55" white="3972"/>
  1906.     </Camera>
  1907.     <Camera make="OLYMPUS IMAGING CORP." model="XZ-2" decoder_version="3">
  1908. +       <ID make="Olympus" model="XZ-2">Olympus XZ-2</ID>
  1909.         <CFA width="2" height="2">
  1910.             <Color x="0" y="0">RED</Color>
  1911.             <Color x="1" y="0">GREEN</Color>
  1912. @@ -2697,6 +2985,7 @@
  1913.         </Hints>
  1914.     </Camera>
  1915.     <Camera make="OLYMPUS IMAGING CORP." model="XZ-10" decoder_version="3">
  1916. +       <ID make="Olympus" model="XZ-10">Olympus XZ-10</ID>
  1917.         <CFA width="2" height="2">
  1918.             <Color x="0" y="0">RED</Color>
  1919.             <Color x="1" y="0">GREEN</Color>
  1920. @@ -2711,6 +3000,7 @@
  1921.         </Hints>
  1922.     </Camera>
  1923.     <Camera make="OLYMPUS IMAGING CORP." model="SP570UZ">
  1924. +       <ID make="Olympus" model="SP570UZ">Olympus SP570UZ</ID>
  1925.         <CFA width="2" height="2">
  1926.             <Color x="0" y="0">GREEN</Color>
  1927.             <Color x="1" y="0">RED</Color>
  1928. @@ -2721,6 +3011,7 @@
  1929.         <Sensor black="0" white="4095"/>
  1930.     </Camera>
  1931.     <Camera make="OLYMPUS IMAGING CORP." model="STYLUS1">
  1932. +       <ID make="Olympus" model="Stylus1">Olympus Stylus1</ID>
  1933.         <CFA width="2" height="2">
  1934.             <Color x="0" y="0">RED</Color>
  1935.             <Color x="1" y="0">GREEN</Color>
  1936. @@ -2730,10 +3021,11 @@
  1937.         <Crop x="0" y="0" width="-14" height="0"/>
  1938.         <Sensor black="200" white="3900"/>
  1939.         <Aliases>
  1940. -           <Alias>STYLUS1,1s</Alias>
  1941. +           <Alias id="Stylus1">STYLUS1,1s</Alias>
  1942.         </Aliases>
  1943.     </Camera>
  1944.     <Camera make="Panasonic" model = "DMC-CM1">
  1945. +       <ID make="Panasonic" model="DMC-CM1">Panasonic DMC-CM1</ID>
  1946.         <CFA width="2" height="2">
  1947.             <Color x="0" y="0">RED</Color>
  1948.             <Color x="1" y="0">GREEN</Color>
  1949. @@ -2747,6 +3039,7 @@
  1950.         </Hints>
  1951.     </Camera>
  1952.     <Camera make="Panasonic" model = "DMC-CM1" mode="3:2">
  1953. +       <ID make="Panasonic" model="DMC-CM1">Panasonic DMC-CM1</ID>
  1954.         <CFA width="2" height="2">
  1955.             <Color x="0" y="0">RED</Color>
  1956.             <Color x="1" y="0">GREEN</Color>
  1957. @@ -2760,6 +3053,7 @@
  1958.         </Hints>
  1959.     </Camera>
  1960.     <Camera make="Panasonic" model = "DMC-FX150">
  1961. +       <ID make="Panasonic" model="DMC-FX150">Panasonic DMC-FX150</ID>
  1962.         <CFA width="2" height="2">
  1963.             <Color x="0" y="0">BLUE</Color>
  1964.             <Color x="1" y="0">GREEN</Color>
  1965. @@ -2773,6 +3067,7 @@
  1966.         </Hints>
  1967.     </Camera>
  1968.     <Camera make="Panasonic" model = "DMC-FX150" mode = "4:3">
  1969. +       <ID make="Panasonic" model="DMC-FX150">Panasonic DMC-FX150</ID>
  1970.         <CFA width="2" height="2">
  1971.             <Color x="0" y="0">BLUE</Color>
  1972.             <Color x="1" y="0">GREEN</Color>
  1973. @@ -2786,6 +3081,7 @@
  1974.         </Hints>
  1975.     </Camera>
  1976.     <Camera make="Panasonic" model = "DMC-FZ28" mode = "4:3">
  1977. +       <ID make="Panasonic" model="DMC-FZ28">Panasonic DMC-FZ28</ID>
  1978.         <CFA width="2" height="2">
  1979.             <Color x="0" y="0">BLUE</Color>
  1980.             <Color x="1" y="0">GREEN</Color>
  1981. @@ -2799,6 +3095,7 @@
  1982.         </Hints>
  1983.     </Camera>
  1984.     <Camera make="Panasonic" model = "DMC-FZ28" mode = "16:9">
  1985. +       <ID make="Panasonic" model="DMC-FZ28">Panasonic DMC-FZ28</ID>
  1986.         <CFA width="2" height="2">
  1987.             <Color x="0" y="0">BLUE</Color>
  1988.             <Color x="1" y="0">GREEN</Color>
  1989. @@ -2812,6 +3109,7 @@
  1990.         </Hints>
  1991.     </Camera>
  1992.     <Camera make="Panasonic" model = "DMC-FZ28">
  1993. +       <ID make="Panasonic" model="DMC-FZ28">Panasonic DMC-FZ28</ID>
  1994.         <CFA width="2" height="2">
  1995.             <Color x="0" y="0">BLUE</Color>
  1996.             <Color x="1" y="0">GREEN</Color>
  1997. @@ -2825,6 +3123,7 @@
  1998.         </Hints>
  1999.     </Camera>
  2000.     <Camera make="Panasonic" model = "DMC-FZ150">
  2001. +       <ID make="Panasonic" model="DMC-FZ150">Panasonic DMC-FZ150</ID>
  2002.         <CFA width="2" height="2">
  2003.             <Color x="0" y="0">GREEN</Color>
  2004.             <Color x="1" y="0">BLUE</Color>
  2005. @@ -2838,6 +3137,7 @@
  2006.         </Hints>
  2007.     </Camera>
  2008.     <Camera make="Panasonic" model = "DMC-FZ150" mode="4:3">
  2009. +       <ID make="Panasonic" model="DMC-FZ150">Panasonic DMC-FZ150</ID>
  2010.         <CFA width="2" height="2">
  2011.             <Color x="0" y="0">GREEN</Color>
  2012.             <Color x="1" y="0">BLUE</Color>
  2013. @@ -2851,6 +3151,7 @@
  2014.         </Hints>
  2015.     </Camera>
  2016.     <Camera make="Panasonic" model = "DMC-FZ200">
  2017. +       <ID make="Panasonic" model="DMC-FZ200">Panasonic DMC-FZ200</ID>
  2018.         <CFA width="2" height="2">
  2019.             <Color x="0" y="0">GREEN</Color>
  2020.             <Color x="1" y="0">BLUE</Color>
  2021. @@ -2864,6 +3165,7 @@
  2022.         </Hints>
  2023.     </Camera>
  2024.     <Camera make="Panasonic" model = "DMC-FZ200" mode="4:3">
  2025. +       <ID make="Panasonic" model="DMC-FZ200">Panasonic DMC-FZ200</ID>
  2026.         <CFA width="2" height="2">
  2027.             <Color x="0" y="0">GREEN</Color>
  2028.             <Color x="1" y="0">BLUE</Color>
  2029. @@ -2919,6 +3221,7 @@
  2030.         </Hints>
  2031.     </Camera>
  2032.     <Camera make="Panasonic" model = "DMC-G1">
  2033. +       <ID make="Panasonic" model="DMC-G1">Panasonic DMC-G1</ID>
  2034.         <CFA width="2" height="2">
  2035.             <Color x="0" y="0">GREEN</Color>
  2036.             <Color x="1" y="0">BLUE</Color>
  2037. @@ -2932,6 +3235,7 @@
  2038.         </Hints>
  2039.     </Camera>
  2040.     <Camera make="Panasonic" model = "DMC-G1" mode="4:3">
  2041. +       <ID make="Panasonic" model="DMC-G1">Panasonic DMC-G1</ID>
  2042.         <CFA width="2" height="2">
  2043.             <Color x="0" y="0">GREEN</Color>
  2044.             <Color x="1" y="0">BLUE</Color>
  2045. @@ -2945,6 +3249,7 @@
  2046.         </Hints>
  2047.     </Camera>
  2048.     <Camera make="Panasonic" model = "DMC-G1" mode="16:9">
  2049. +       <ID make="Panasonic" model="DMC-G1">Panasonic DMC-G1</ID>
  2050.         <CFA width="2" height="2">
  2051.             <Color x="0" y="0">GREEN</Color>
  2052.             <Color x="1" y="0">BLUE</Color>
  2053. @@ -2958,6 +3263,7 @@
  2054.         </Hints>
  2055.     </Camera>
  2056.     <Camera make="Panasonic" model = "DMC-G1" mode="3:2">
  2057. +       <ID make="Panasonic" model="DMC-G1">Panasonic DMC-G1</ID>
  2058.         <CFA width="2" height="2">
  2059.             <Color x="0" y="0">GREEN</Color>
  2060.             <Color x="1" y="0">BLUE</Color>
  2061. @@ -2971,6 +3277,7 @@
  2062.         </Hints>
  2063.     </Camera>
  2064.     <Camera make="Panasonic" model = "DMC-G2" mode="4:3">
  2065. +       <ID make="Panasonic" model="DMC-G2">Panasonic DMC-G2</ID>
  2066.         <CFA width="2" height="2">
  2067.             <Color x="0" y="0">GREEN</Color>
  2068.             <Color x="1" y="0">BLUE</Color>
  2069. @@ -2984,6 +3291,7 @@
  2070.         </Hints>
  2071.     </Camera>
  2072.     <Camera make="Panasonic" model = "DMC-G2" mode="3:2">
  2073. +       <ID make="Panasonic" model="DMC-G2">Panasonic DMC-G2</ID>
  2074.         <CFA width="2" height="2">
  2075.             <Color x="0" y="0">GREEN</Color>
  2076.             <Color x="1" y="0">BLUE</Color>
  2077. @@ -2997,6 +3305,7 @@
  2078.         </Hints>
  2079.     </Camera>
  2080.     <Camera make="Panasonic" model = "DMC-G2" mode="16:9">
  2081. +       <ID make="Panasonic" model="DMC-G2">Panasonic DMC-G2</ID>
  2082.         <CFA width="2" height="2">
  2083.             <Color x="0" y="0">GREEN</Color>
  2084.             <Color x="1" y="0">BLUE</Color>
  2085. @@ -3010,6 +3319,7 @@
  2086.         </Hints>
  2087.     </Camera>
  2088.     <Camera make="Panasonic" model = "DMC-G2" mode="1:1">
  2089. +       <ID make="Panasonic" model="DMC-G2">Panasonic DMC-G2</ID>
  2090.         <CFA width="2" height="2">
  2091.             <Color x="0" y="0">GREEN</Color>
  2092.             <Color x="1" y="0">BLUE</Color>
  2093. @@ -3023,6 +3333,7 @@
  2094.         </Hints>
  2095.     </Camera>
  2096.     <Camera make="Panasonic" model = "DMC-G2">
  2097. +       <ID make="Panasonic" model="DMC-G2">Panasonic DMC-G2</ID>
  2098.         <!-- Default Guess -->
  2099.         <CFA width="2" height="2">
  2100.             <Color x="0" y="0">GREEN</Color>
  2101. @@ -3034,6 +3345,7 @@
  2102.         <Sensor black="0" white="3900"/>
  2103.     </Camera>
  2104.     <Camera make="Panasonic" model = "DMC-G10">
  2105. +       <ID make="Panasonic" model="DMC-G10">Panasonic DMC-G10</ID>
  2106.         <CFA width="2" height="2">
  2107.             <Color x="0" y="0">GREEN</Color>
  2108.             <Color x="1" y="0">BLUE</Color>
  2109. @@ -3044,6 +3356,7 @@
  2110.         <Sensor black="0" white="3900"/>
  2111.     </Camera>
  2112.     <Camera make="Panasonic" model = "DMC-G10" mode="4:3">
  2113. +       <ID make="Panasonic" model="DMC-G10">Panasonic DMC-G10</ID>
  2114.         <CFA width="2" height="2">
  2115.             <Color x="0" y="0">GREEN</Color>
  2116.             <Color x="1" y="0">BLUE</Color>
  2117. @@ -3054,6 +3367,7 @@
  2118.         <Sensor black="0" white="3900"/>
  2119.     </Camera>
  2120.     <Camera make="Panasonic" model = "DMC-GH1" mode="4:3">
  2121. +       <ID make="Panasonic" model="DMC-GH1">Panasonic DMC-GH1</ID>
  2122.         <CFA width="2" height="2">
  2123.             <Color x="0" y="0">GREEN</Color>
  2124.             <Color x="1" y="0">BLUE</Color>
  2125. @@ -3064,6 +3378,7 @@
  2126.         <Sensor black="0" white="3986"/>
  2127.     </Camera>
  2128.     <Camera make="Panasonic" model = "DMC-GH1" mode="3:2">
  2129. +       <ID make="Panasonic" model="DMC-GH1">Panasonic DMC-GH1</ID>
  2130.         <CFA width="2" height="2">
  2131.             <Color x="0" y="0">GREEN</Color>
  2132.             <Color x="1" y="0">BLUE</Color>
  2133. @@ -3074,6 +3389,7 @@
  2134.         <Sensor black="0" white="3986"/>
  2135.     </Camera>
  2136.     <Camera make="Panasonic" model = "DMC-GH1">
  2137. +       <ID make="Panasonic" model="DMC-GH1">Panasonic DMC-GH1</ID>
  2138.         <!-- Default Guess -->
  2139.         <CFA width="2" height="2">
  2140.             <Color x="0" y="0">GREEN</Color>
  2141. @@ -3085,6 +3401,7 @@
  2142.         <Sensor black="0" white="3986"/>
  2143.     </Camera>
  2144.     <Camera make="Panasonic" model = "DMC-GH3" mode="4:3">
  2145. +       <ID make="Panasonic" model="DMC-GH3">Panasonic DMC-GH3</ID>
  2146.         <CFA width="2" height="2">
  2147.             <Color x="0" y="0">GREEN</Color>
  2148.             <Color x="1" y="0">BLUE</Color>
  2149. @@ -3099,6 +3416,7 @@
  2150.         </Hints>
  2151.     </Camera>
  2152.     <Camera make="Panasonic" model = "DMC-GH3" mode="3:2">
  2153. +       <ID make="Panasonic" model="DMC-GH3">Panasonic DMC-GH3</ID>
  2154.         <CFA width="2" height="2">
  2155.             <Color x="0" y="0">GREEN</Color>
  2156.             <Color x="1" y="0">BLUE</Color>
  2157. @@ -3113,6 +3431,7 @@
  2158.         </Hints>
  2159.     </Camera>
  2160.     <Camera make="Panasonic" model = "DMC-GH3" mode="16:9">
  2161. +       <ID make="Panasonic" model="DMC-GH3">Panasonic DMC-GH3</ID>
  2162.         <CFA width="2" height="2">
  2163.             <Color x="0" y="0">GREEN</Color>
  2164.             <Color x="1" y="0">BLUE</Color>
  2165. @@ -3127,6 +3446,7 @@
  2166.         </Hints>
  2167.     </Camera>
  2168.     <Camera make="Panasonic" model = "DMC-GH3" mode="1:1">
  2169. +       <ID make="Panasonic" model="DMC-GH3">Panasonic DMC-GH3</ID>
  2170.         <CFA width="2" height="2">
  2171.             <Color x="0" y="0">GREEN</Color>
  2172.             <Color x="1" y="0">BLUE</Color>
  2173. @@ -3142,6 +3462,7 @@
  2174.     </Camera>
  2175.     <!-- Default Guess -->
  2176.     <Camera make="Panasonic" model = "DMC-GH3">
  2177. +       <ID make="Panasonic" model="DMC-GH3">Panasonic DMC-GH3</ID>
  2178.         <CFA width="2" height="2">
  2179.             <Color x="0" y="0">GREEN</Color>
  2180.             <Color x="1" y="0">BLUE</Color>
  2181. @@ -3156,6 +3477,7 @@
  2182.         </Hints>
  2183.     </Camera>
  2184.     <Camera make="Panasonic" model = "DMC-GH4" mode="4:3">
  2185. +       <ID make="Panasonic" model="DMC-GH4">Panasonic DMC-GH4</ID>
  2186.         <CFA width="2" height="2">
  2187.             <Color x="0" y="0">BLUE</Color>
  2188.             <Color x="1" y="0">GREEN</Color>
  2189. @@ -3169,6 +3491,7 @@
  2190.         </Hints>
  2191.     </Camera>
  2192.     <Camera make="Panasonic" model = "DMC-GH4" mode="3:2">
  2193. +       <ID make="Panasonic" model="DMC-GH4">Panasonic DMC-GH4</ID>
  2194.         <CFA width="2" height="2">
  2195.             <Color x="0" y="0">BLUE</Color>
  2196.             <Color x="1" y="0">GREEN</Color>
  2197. @@ -3182,6 +3505,7 @@
  2198.         </Hints>
  2199.     </Camera>
  2200.     <Camera make="Panasonic" model = "DMC-GH4" mode="16:9">
  2201. +       <ID make="Panasonic" model="DMC-GH4">Panasonic DMC-GH4</ID>
  2202.         <CFA width="2" height="2">
  2203.             <Color x="0" y="0">BLUE</Color>
  2204.             <Color x="1" y="0">GREEN</Color>
  2205. @@ -3195,6 +3519,7 @@
  2206.         </Hints>
  2207.     </Camera>
  2208.     <Camera make="Panasonic" model = "DMC-GH4" mode="1:1">
  2209. +       <ID make="Panasonic" model="DMC-GH4">Panasonic DMC-GH4</ID>
  2210.         <CFA width="2" height="2">
  2211.             <Color x="0" y="0">BLUE</Color>
  2212.             <Color x="1" y="0">GREEN</Color>
  2213. @@ -3209,6 +3534,7 @@
  2214.     </Camera>
  2215.     <!-- Default Guess -->
  2216.     <Camera make="Panasonic" model = "DMC-GH4">
  2217. +       <ID make="Panasonic" model="DMC-GH4">Panasonic DMC-GH4</ID>
  2218.         <CFA width="2" height="2">
  2219.             <Color x="0" y="0">BLUE</Color>
  2220.             <Color x="1" y="0">GREEN</Color>
  2221. @@ -3222,6 +3548,7 @@
  2222.         </Hints>
  2223.     </Camera>
  2224.     <Camera make="Panasonic" model = "DMC-GF1">
  2225. +       <ID make="Panasonic" model="DMC-GF1">Panasonic DMC-GF1</ID>
  2226.         <CFA width="2" height="2">
  2227.             <Color x="0" y="0">GREEN</Color>
  2228.             <Color x="1" y="0">BLUE</Color>
  2229. @@ -3235,6 +3562,7 @@
  2230.         </Hints>
  2231.     </Camera>
  2232.     <Camera make="Panasonic" model = "DMC-GF1" mode="4:3">
  2233. +       <ID make="Panasonic" model="DMC-GF1">Panasonic DMC-GF1</ID>
  2234.         <CFA width="2" height="2">
  2235.             <Color x="0" y="0">GREEN</Color>
  2236.             <Color x="1" y="0">BLUE</Color>
  2237. @@ -3248,6 +3576,7 @@
  2238.         </Hints>
  2239.     </Camera>
  2240.     <Camera make="Panasonic" model = "DMC-GF1" mode="16:9">
  2241. +       <ID make="Panasonic" model="DMC-GF1">Panasonic DMC-GF1</ID>
  2242.         <CFA width="2" height="2">
  2243.             <Color x="0" y="0">GREEN</Color>
  2244.             <Color x="1" y="0">BLUE</Color>
  2245. @@ -3261,6 +3590,7 @@
  2246.         </Hints>
  2247.     </Camera>
  2248.     <Camera make="Panasonic" model = "DMC-GF1" mode="3:2">
  2249. +       <ID make="Panasonic" model="DMC-GF1">Panasonic DMC-GF1</ID>
  2250.         <CFA width="2" height="2">
  2251.             <Color x="0" y="0">GREEN</Color>
  2252.             <Color x="1" y="0">BLUE</Color>
  2253. @@ -3274,6 +3604,7 @@
  2254.         </Hints>
  2255.     </Camera>
  2256.     <Camera make="Panasonic" model = "DMC-GF1" mode="1:1">
  2257. +       <ID make="Panasonic" model="DMC-GF1">Panasonic DMC-GF1</ID>
  2258.         <CFA width="2" height="2">
  2259.             <Color x="0" y="0">GREEN</Color>
  2260.             <Color x="1" y="0">BLUE</Color>
  2261. @@ -3287,6 +3618,7 @@
  2262.         </Hints>
  2263.     </Camera>
  2264.     <Camera make="Panasonic" model = "DMC-GF2">
  2265. +       <ID make="Panasonic" model="DMC-GF2">Panasonic DMC-GF2</ID>
  2266.         <CFA width="2" height="2">
  2267.             <Color x="0" y="0">GREEN</Color>
  2268.             <Color x="1" y="0">BLUE</Color>
  2269. @@ -3300,6 +3632,7 @@
  2270.         </Hints>
  2271.     </Camera>
  2272.     <Camera make="Panasonic" model = "DMC-GF2" mode="4:3">
  2273. +       <ID make="Panasonic" model="DMC-GF2">Panasonic DMC-GF2</ID>
  2274.         <CFA width="2" height="2">
  2275.             <Color x="0" y="0">GREEN</Color>
  2276.             <Color x="1" y="0">BLUE</Color>
  2277. @@ -3313,6 +3646,7 @@
  2278.         </Hints>
  2279.     </Camera>
  2280.     <Camera make="Panasonic" model = "DMC-GF2" mode="16:9">
  2281. +       <ID make="Panasonic" model="DMC-GF2">Panasonic DMC-GF2</ID>
  2282.         <CFA width="2" height="2">
  2283.             <Color x="0" y="0">GREEN</Color>
  2284.             <Color x="1" y="0">BLUE</Color>
  2285. @@ -3326,6 +3660,7 @@
  2286.         </Hints>
  2287.     </Camera>
  2288.     <Camera make="Panasonic" model = "DMC-GF2" mode="3:2">
  2289. +       <ID make="Panasonic" model="DMC-GF2">Panasonic DMC-GF2</ID>
  2290.         <CFA width="2" height="2">
  2291.             <Color x="0" y="0">GREEN</Color>
  2292.             <Color x="1" y="0">BLUE</Color>
  2293. @@ -3339,6 +3674,7 @@
  2294.         </Hints>
  2295.     </Camera>
  2296.     <Camera make="Panasonic" model = "DMC-GF2" mode="1:1">
  2297. +       <ID make="Panasonic" model="DMC-GF2">Panasonic DMC-GF2</ID>
  2298.         <CFA width="2" height="2">
  2299.             <Color x="0" y="0">GREEN</Color>
  2300.             <Color x="1" y="0">BLUE</Color>
  2301. @@ -3349,6 +3685,7 @@
  2302.         <Sensor black="150" white="3956"/>
  2303.     </Camera>
  2304.     <Camera make="Panasonic" model = "DMC-GM1" mode="4:3">
  2305. +       <ID make="Panasonic" model="DMC-GM1">Panasonic DMC-GM1</ID>
  2306.         <CFA width="2" height="2">
  2307.             <Color x="0" y="0">BLUE</Color>
  2308.             <Color x="1" y="0">GREEN</Color>
  2309. @@ -3362,6 +3699,7 @@
  2310.         </Hints>
  2311.     </Camera>
  2312.     <Camera make="Panasonic" model = "DMC-GM1" mode="3:2">
  2313. +       <ID make="Panasonic" model="DMC-GM1">Panasonic DMC-GM1</ID>
  2314.         <CFA width="2" height="2">
  2315.             <Color x="0" y="0">BLUE</Color>
  2316.             <Color x="1" y="0">GREEN</Color>
  2317. @@ -3375,6 +3713,7 @@
  2318.         </Hints>
  2319.     </Camera>
  2320.     <Camera make="Panasonic" model = "DMC-GM1" mode="16:9">
  2321. +       <ID make="Panasonic" model="DMC-GM1">Panasonic DMC-GM1</ID>
  2322.         <CFA width="2" height="2">
  2323.             <Color x="0" y="0">BLUE</Color>
  2324.             <Color x="1" y="0">GREEN</Color>
  2325. @@ -3388,6 +3727,7 @@
  2326.         </Hints>
  2327.     </Camera>
  2328.     <Camera make="Panasonic" model = "DMC-GM1" mode="1:1">
  2329. +       <ID make="Panasonic" model="DMC-GM1">Panasonic DMC-GM1</ID>
  2330.         <CFA width="2" height="2">
  2331.             <Color x="0" y="0">BLUE</Color>
  2332.             <Color x="1" y="0">GREEN</Color>
  2333. @@ -3402,6 +3742,7 @@
  2334.     </Camera>
  2335.     <!-- Default Guess -->
  2336.     <Camera make="Panasonic" model = "DMC-GM1">
  2337. +       <ID make="Panasonic" model="DMC-GM1">Panasonic DMC-GM1</ID>
  2338.         <CFA width="2" height="2">
  2339.             <Color x="0" y="0">BLUE</Color>
  2340.             <Color x="1" y="0">GREEN</Color>
  2341. @@ -3415,6 +3756,7 @@
  2342.         </Hints>
  2343.     </Camera>
  2344.     <Camera make="Panasonic" model="DMC-GM5">
  2345. +       <ID make="Panasonic" model="DMC-GM5">Panasonic DMC-GM5</ID>
  2346.         <CFA width="2" height="2">
  2347.             <Color x="0" y="0">BLUE</Color>
  2348.             <Color x="1" y="0">GREEN</Color>
  2349. @@ -3425,6 +3767,7 @@
  2350.         <Sensor black="143" white="4095"/>
  2351.     </Camera>
  2352.     <Camera make="Panasonic" model="DMC-GM5" mode="4:3">
  2353. +       <ID make="Panasonic" model="DMC-GM5">Panasonic DMC-GM5</ID>
  2354.         <CFA width="2" height="2">
  2355.             <Color x="0" y="0">BLUE</Color>
  2356.             <Color x="1" y="0">GREEN</Color>
  2357. @@ -3435,6 +3778,7 @@
  2358.         <Sensor black="143" white="4095"/>
  2359.     </Camera>
  2360.     <Camera make="Panasonic" model="DMC-GM5" mode="3:2">
  2361. +       <ID make="Panasonic" model="DMC-GM5">Panasonic DMC-GM5</ID>
  2362.         <CFA width="2" height="2">
  2363.             <Color x="0" y="0">BLUE</Color>
  2364.             <Color x="1" y="0">GREEN</Color>
  2365. @@ -3445,6 +3789,7 @@
  2366.         <Sensor black="143" white="4095"/>
  2367.     </Camera>
  2368.     <Camera make="Panasonic" model="DMC-GM5" mode="16:9">
  2369. +       <ID make="Panasonic" model="DMC-GM5">Panasonic DMC-GM5</ID>
  2370.         <CFA width="2" height="2">
  2371.             <Color x="0" y="0">BLUE</Color>
  2372.             <Color x="1" y="0">GREEN</Color>
  2373. @@ -3455,6 +3800,7 @@
  2374.         <Sensor black="143" white="4095"/>
  2375.     </Camera>
  2376.     <Camera make="Panasonic" model="DMC-GM5" mode="1:1">
  2377. +       <ID make="Panasonic" model="DMC-GM5">Panasonic DMC-GM5</ID>
  2378.         <CFA width="2" height="2">
  2379.             <Color x="0" y="0">BLUE</Color>
  2380.             <Color x="1" y="0">GREEN</Color>
  2381. @@ -3465,6 +3811,7 @@
  2382.         <Sensor black="143" white="4095"/>
  2383.     </Camera>
  2384.     <Camera make="Panasonic" model="DMC-G3" mode="4:3">
  2385. +       <ID make="Panasonic" model="DMC-G3">Panasonic DMC-G3</ID>
  2386.         <CFA width="2" height="2">
  2387.             <Color x="0" y="0">GREEN</Color>
  2388.             <Color x="1" y="0">RED</Color>
  2389. @@ -3478,6 +3825,7 @@
  2390.         <Sensor black="143" white="3956"/>
  2391.     </Camera>
  2392.     <Camera make="Panasonic" model="DMC-G3" mode="1:1">
  2393. +       <ID make="Panasonic" model="DMC-G3">Panasonic DMC-G3</ID>
  2394.         <CFA width="2" height="2">
  2395.             <Color x="0" y="0">GREEN</Color>
  2396.             <Color x="1" y="0">RED</Color>
  2397. @@ -3491,6 +3839,7 @@
  2398.         <Sensor black="143" white="3956"/>
  2399.     </Camera>
  2400.     <Camera make="Panasonic" model="DMC-G3" mode="16:9">
  2401. +       <ID make="Panasonic" model="DMC-G3">Panasonic DMC-G3</ID>
  2402.         <CFA width="2" height="2">
  2403.             <Color x="0" y="0">GREEN</Color>
  2404.             <Color x="1" y="0">RED</Color>
  2405. @@ -3504,6 +3853,7 @@
  2406.         <Sensor black="143" white="3956"/>
  2407.     </Camera>
  2408.     <Camera make="Panasonic" model="DMC-G3" mode="3:2">
  2409. +       <ID make="Panasonic" model="DMC-G3">Panasonic DMC-G3</ID>
  2410.         <CFA width="2" height="2">
  2411.             <Color x="0" y="0">GREEN</Color>
  2412.             <Color x="1" y="0">RED</Color>
  2413. @@ -3517,6 +3867,7 @@
  2414.         <Sensor black="143" white="3956"/>
  2415.     </Camera>
  2416.     <Camera make="Panasonic" model="DMC-G3">
  2417. +       <ID make="Panasonic" model="DMC-G3">Panasonic DMC-G3</ID>
  2418.         <CFA width="2" height="2">
  2419.             <Color x="0" y="0">GREEN</Color>
  2420.             <Color x="1" y="0">RED</Color>
  2421. @@ -3530,6 +3881,7 @@
  2422.         <Sensor black="143" white="3956"/>
  2423.     </Camera>
  2424.     <Camera make="Panasonic" model = "DMC-G5" mode="4:3">
  2425. +       <ID make="Panasonic" model="DMC-G5">Panasonic DMC-G5</ID>
  2426.         <CFA width="2" height="2">
  2427.             <Color x="0" y="0">BLUE</Color>
  2428.             <Color x="1" y="0">GREEN</Color>
  2429. @@ -3543,6 +3895,7 @@
  2430.         </Hints>
  2431.     </Camera>
  2432.     <Camera make="Panasonic" model = "DMC-G5" mode="3:2">
  2433. +       <ID make="Panasonic" model="DMC-G5">Panasonic DMC-G5</ID>
  2434.         <CFA width="2" height="2">
  2435.             <Color x="0" y="0">BLUE</Color>
  2436.             <Color x="1" y="0">GREEN</Color>
  2437. @@ -3582,6 +3935,7 @@
  2438.         </Hints>
  2439.     </Camera>
  2440.     <Camera make="Panasonic" model = "DMC-G5">
  2441. +       <ID make="Panasonic" model="DMC-G5">Panasonic DMC-G5</ID>
  2442.         <CFA width="2" height="2">
  2443.             <Color x="0" y="0">BLUE</Color>
  2444.             <Color x="1" y="0">GREEN</Color>
  2445. @@ -3595,6 +3949,7 @@
  2446.         </Hints>
  2447.     </Camera>
  2448.     <Camera make="Panasonic" model = "DMC-G6">
  2449. +       <ID make="Panasonic" model="DMC-G6">Panasonic DMC-G6</ID>
  2450.         <CFA width="2" height="2">
  2451.             <Color x="0" y="0">BLUE</Color>
  2452.             <Color x="1" y="0">GREEN</Color>
  2453. @@ -3608,6 +3963,7 @@
  2454.         </Hints>
  2455.     </Camera>
  2456.     <Camera make="Panasonic" model = "DMC-G6" mode="4:3">
  2457. +       <ID make="Panasonic" model="DMC-G6">Panasonic DMC-G6</ID>
  2458.         <CFA width="2" height="2">
  2459.             <Color x="0" y="0">BLUE</Color>
  2460.             <Color x="1" y="0">GREEN</Color>
  2461. @@ -3621,6 +3977,7 @@
  2462.         </Hints>
  2463.     </Camera>
  2464.     <Camera make="Panasonic" model = "DMC-G6" mode="3:2">
  2465. +       <ID make="Panasonic" model="DMC-G6">Panasonic DMC-G6</ID>
  2466.         <CFA width="2" height="2">
  2467.             <Color x="0" y="0">BLUE</Color>
  2468.             <Color x="1" y="0">GREEN</Color>
  2469. @@ -3634,6 +3991,7 @@
  2470.         </Hints>
  2471.     </Camera>
  2472.     <Camera make="Panasonic" model = "DMC-G6" mode="16:9">
  2473. +       <ID make="Panasonic" model="DMC-G6">Panasonic DMC-G6</ID>
  2474.         <CFA width="2" height="2">
  2475.             <Color x="0" y="0">BLUE</Color>
  2476.             <Color x="1" y="0">GREEN</Color>
  2477. @@ -3647,6 +4005,7 @@
  2478.         </Hints>
  2479.     </Camera>
  2480.     <Camera make="Panasonic" model = "DMC-G6" mode="1:1">
  2481. +       <ID make="Panasonic" model="DMC-G6">Panasonic DMC-G6</ID>
  2482.         <CFA width="2" height="2">
  2483.             <Color x="0" y="0">BLUE</Color>
  2484.             <Color x="1" y="0">GREEN</Color>
  2485. @@ -3659,7 +4018,36 @@
  2486.             <Hint name="zero_is_bad" value=""/>
  2487.         </Hints>
  2488.     </Camera>
  2489. +   <Camera make="Panasonic" model="DMC-G7">
  2490. +       <ID make="Panasonic" model="DMC-G7">Panasonic DMC-G7</ID>
  2491. +       <CFA width="2" height="2">
  2492. +           <Color x="0" y="0">BLUE</Color>
  2493. +           <Color x="1" y="0">GREEN</Color>
  2494. +           <Color x="0" y="1">GREEN</Color>
  2495. +           <Color x="1" y="1">RED</Color>
  2496. +       </CFA>
  2497. +       <Crop x="0" y="0" width="-208" height="0"/>
  2498. +       <Sensor black="143" white="4095"/>
  2499. +       <Hints>
  2500. +           <Hint name="zero_is_bad" value=""/>
  2501. +       </Hints>
  2502. +   </Camera>
  2503. +   <Camera make="Panasonic" model="DMC-G7" mode="4:3">
  2504. +       <ID make="Panasonic" model="DMC-G7">Panasonic DMC-G7</ID>
  2505. +       <CFA width="2" height="2">
  2506. +           <Color x="0" y="0">BLUE</Color>
  2507. +           <Color x="1" y="0">GREEN</Color>
  2508. +           <Color x="0" y="1">GREEN</Color>
  2509. +           <Color x="1" y="1">RED</Color>
  2510. +       </CFA>
  2511. +       <Crop x="0" y="0" width="-208" height="0"/>
  2512. +       <Sensor black="143" white="4095"/>
  2513. +       <Hints>
  2514. +           <Hint name="zero_is_bad" value=""/>
  2515. +       </Hints>
  2516. +   </Camera>
  2517.     <Camera make="Panasonic" model = "DMC-GF3">
  2518. +       <ID make="Panasonic" model="DMC-GF3">Panasonic DMC-GF3</ID>
  2519.         <CFA width="2" height="2">
  2520.             <Color x="0" y="0">GREEN</Color>
  2521.             <Color x="1" y="0">BLUE</Color>
  2522. @@ -3673,6 +4061,7 @@
  2523.         </Hints>
  2524.     </Camera>
  2525.     <Camera make="Panasonic" model = "DMC-GF3" mode= "4:3">
  2526. +       <ID make="Panasonic" model="DMC-GF3">Panasonic DMC-GF3</ID>
  2527.         <CFA width="2" height="2">
  2528.             <Color x="0" y="0">GREEN</Color>
  2529.             <Color x="1" y="0">BLUE</Color>
  2530. @@ -3686,6 +4075,7 @@
  2531.         </Hints>
  2532.     </Camera>
  2533.     <Camera make="Panasonic" model = "DMC-GF3" mode= "3:2">
  2534. +       <ID make="Panasonic" model="DMC-GF3">Panasonic DMC-GF3</ID>
  2535.         <CFA width="2" height="2">
  2536.             <Color x="0" y="0">GREEN</Color>
  2537.             <Color x="1" y="0">BLUE</Color>
  2538. @@ -3699,6 +4089,7 @@
  2539.         </Hints>
  2540.     </Camera>
  2541.     <Camera make="Panasonic" model = "DMC-GF3" mode= "16:9">
  2542. +       <ID make="Panasonic" model="DMC-GF3">Panasonic DMC-GF3</ID>
  2543.         <CFA width="2" height="2">
  2544.             <Color x="0" y="0">GREEN</Color>
  2545.             <Color x="1" y="0">BLUE</Color>
  2546. @@ -3712,6 +4103,7 @@
  2547.         </Hints>
  2548.     </Camera>
  2549.     <Camera make="Panasonic" model = "DMC-GF3" mode= "1:1">
  2550. +       <ID make="Panasonic" model="DMC-GF3">Panasonic DMC-GF3</ID>
  2551.         <CFA width="2" height="2">
  2552.             <Color x="0" y="0">GREEN</Color>
  2553.             <Color x="1" y="0">BLUE</Color>
  2554. @@ -3725,6 +4117,7 @@
  2555.         </Hints>
  2556.     </Camera>
  2557.     <Camera make="Panasonic" model = "DMC-GF5">
  2558. +       <ID make="Panasonic" model="DMC-GF5">Panasonic DMC-GF5</ID>
  2559.         <CFA width="2" height="2">
  2560.             <Color x="0" y="0">GREEN</Color>
  2561.             <Color x="1" y="0">BLUE</Color>
  2562. @@ -3738,6 +4131,7 @@
  2563.         </Hints>
  2564.     </Camera>
  2565.     <Camera make="Panasonic" model = "DMC-GF5" mode= "4:3">
  2566. +       <ID make="Panasonic" model="DMC-GF5">Panasonic DMC-GF5</ID>
  2567.         <CFA width="2" height="2">
  2568.             <Color x="0" y="0">GREEN</Color>
  2569.             <Color x="1" y="0">BLUE</Color>
  2570. @@ -3751,6 +4145,7 @@
  2571.         </Hints>
  2572.     </Camera>
  2573.     <Camera make="Panasonic" model = "DMC-GF5" mode= "16:9">
  2574. +       <ID make="Panasonic" model="DMC-GF5">Panasonic DMC-GF5</ID>
  2575.         <CFA width="2" height="2">
  2576.             <Color x="0" y="0">GREEN</Color>
  2577.             <Color x="1" y="0">BLUE</Color>
  2578. @@ -3764,6 +4159,7 @@
  2579.         </Hints>
  2580.     </Camera>
  2581.     <Camera make="Panasonic" model = "DMC-GF5" mode= "3:2">
  2582. +       <ID make="Panasonic" model="DMC-GF5">Panasonic DMC-GF5</ID>
  2583.         <CFA width="2" height="2">
  2584.             <Color x="0" y="0">GREEN</Color>
  2585.             <Color x="1" y="0">BLUE</Color>
  2586. @@ -3777,6 +4173,7 @@
  2587.         </Hints>
  2588.     </Camera>
  2589.     <Camera make="Panasonic" model = "DMC-GF5" mode= "1:1">
  2590. +       <ID make="Panasonic" model="DMC-GF5">Panasonic DMC-GF5</ID>
  2591.         <CFA width="2" height="2">
  2592.             <Color x="0" y="0">GREEN</Color>
  2593.             <Color x="1" y="0">BLUE</Color>
  2594. @@ -3790,6 +4187,7 @@
  2595.         </Hints>
  2596.     </Camera>
  2597.     <Camera make="Panasonic" model = "DMC-GF6">
  2598. +       <ID make="Panasonic" model="DMC-GF6">Panasonic DMC-GF6</ID>
  2599.         <CFA width="2" height="2">
  2600.             <Color x="0" y="0">GREEN</Color>
  2601.             <Color x="1" y="0">RED</Color>
  2602. @@ -3803,6 +4201,7 @@
  2603.         </Hints>
  2604.     </Camera>
  2605.     <Camera make="Panasonic" model = "DMC-GF6" mode= "4:3">
  2606. +       <ID make="Panasonic" model="DMC-GF6">Panasonic DMC-GF6</ID>
  2607.         <CFA width="2" height="2">
  2608.             <Color x="0" y="0">GREEN</Color>
  2609.             <Color x="1" y="0">RED</Color>
  2610. @@ -3816,6 +4215,7 @@
  2611.         </Hints>
  2612.     </Camera>
  2613.     <Camera make="Panasonic" model="DMC-GF7">
  2614. +       <ID make="Panasonic" model="DMC-GF7">Panasonic DMC-GF7</ID>
  2615.         <CFA width="2" height="2">
  2616.             <Color x="0" y="0">BLUE</Color>
  2617.             <Color x="1" y="0">GREEN</Color>
  2618. @@ -3829,6 +4229,7 @@
  2619.         </Hints>
  2620.     </Camera>
  2621.     <Camera make="Panasonic" model="DMC-GF7" mode="4:3">
  2622. +       <ID make="Panasonic" model="DMC-GF7">Panasonic DMC-GF7</ID>
  2623.         <CFA width="2" height="2">
  2624.             <Color x="0" y="0">BLUE</Color>
  2625.             <Color x="1" y="0">GREEN</Color>
  2626. @@ -3842,6 +4243,7 @@
  2627.         </Hints>
  2628.     </Camera>
  2629.     <Camera make="Panasonic" model = "DMC-GH2">
  2630. +       <ID make="Panasonic" model="DMC-GH2">Panasonic DMC-GH2</ID>
  2631.         <CFA width="2" height="2">
  2632.             <Color x="1" y="0">GREEN</Color>
  2633.             <Color x="0" y="0">BLUE</Color>
  2634. @@ -3855,6 +4257,7 @@
  2635.         </Hints>
  2636.     </Camera>
  2637.     <Camera make="Panasonic" model = "DMC-GH2" mode="4:3">
  2638. +       <ID make="Panasonic" model="DMC-GH2">Panasonic DMC-GH2</ID>
  2639.         <CFA width="2" height="2">
  2640.             <Color x="1" y="0">GREEN</Color>
  2641.             <Color x="0" y="0">BLUE</Color>
  2642. @@ -3868,6 +4271,7 @@
  2643.         </Hints>
  2644.     </Camera>
  2645.     <Camera make="Panasonic" model = "DMC-GH2" mode="16:9">
  2646. +       <ID make="Panasonic" model="DMC-GH2">Panasonic DMC-GH2</ID>
  2647.         <CFA width="2" height="2">
  2648.             <Color x="1" y="0">GREEN</Color>
  2649.             <Color x="0" y="0">BLUE</Color>
  2650. @@ -3881,6 +4285,7 @@
  2651.         </Hints>
  2652.     </Camera>
  2653.     <Camera make="Panasonic" model = "DMC-GH2" mode="3:2">
  2654. +       <ID make="Panasonic" model="DMC-GH2">Panasonic DMC-GH2</ID>
  2655.         <CFA width="2" height="2">
  2656.             <Color x="1" y="0">GREEN</Color>
  2657.             <Color x="0" y="0">BLUE</Color>
  2658. @@ -3894,6 +4299,7 @@
  2659.         </Hints>
  2660.     </Camera>
  2661.     <Camera make="Panasonic" model = "DMC-GH2" mode="1:1">
  2662. +       <ID make="Panasonic" model="DMC-GH2">Panasonic DMC-GH2</ID>
  2663.         <CFA width="2" height="2">
  2664.             <Color x="1" y="0">GREEN</Color>
  2665.             <Color x="0" y="0">BLUE</Color>
  2666. @@ -3907,6 +4313,7 @@
  2667.         </Hints>
  2668.     </Camera>
  2669.     <Camera make="Panasonic" model = "DMC-GH1" mode="16:9">
  2670. +       <ID make="Panasonic" model="DMC-GH1">Panasonic DMC-GH1</ID>
  2671.         <CFA width="2" height="2">
  2672.             <Color x="0" y="0">GREEN</Color>
  2673.             <Color x="1" y="0">BLUE</Color>
  2674. @@ -3917,6 +4324,7 @@
  2675.         <Sensor black="0" white="3986"/>
  2676.     </Camera>
  2677.     <Camera make="Panasonic" model = "DMC-FZ35" mode="4:3">
  2678. +       <ID make="Panasonic" model="DMC-FZ35">Panasonic DMC-FZ35</ID>
  2679.         <CFA width="2" height="2">
  2680.             <Color x="0" y="0">BLUE</Color>
  2681.             <Color x="1" y="0">GREEN</Color>
  2682. @@ -3933,6 +4341,7 @@
  2683.         </Hints>
  2684.     </Camera>
  2685.     <Camera make="Panasonic" model = "DMC-FZ35">
  2686. +       <ID make="Panasonic" model="DMC-FZ35">Panasonic DMC-FZ35</ID>
  2687.         <!-- Default Guess -->
  2688.         <CFA width="2" height="2">
  2689.             <Color x="0" y="0">BLUE</Color>
  2690. @@ -3982,6 +4391,7 @@
  2691.         </Hints>
  2692.     </Camera>
  2693.     <Camera make="Panasonic" model = "DMC-FZ70">
  2694. +       <ID make="Panasonic" model="DMC-FZ70">Panasonic DMC-FZ70</ID>
  2695.         <CFA width="2" height="2">
  2696.             <Color x="0" y="0">RED</Color>
  2697.             <Color x="1" y="0">GREEN</Color>
  2698. @@ -3998,6 +4408,7 @@
  2699.         </Hints>
  2700.     </Camera>
  2701.     <Camera make="Panasonic" model = "DMC-FZ70" mode="4:3">
  2702. +       <ID make="Panasonic" model="DMC-FZ70">Panasonic DMC-FZ70</ID>
  2703.         <CFA width="2" height="2">
  2704.             <Color x="0" y="0">RED</Color>
  2705.             <Color x="1" y="0">GREEN</Color>
  2706. @@ -4014,6 +4425,7 @@
  2707.         </Hints>
  2708.     </Camera>
  2709.     <Camera make="Panasonic" model = "DMC-FZ100">
  2710. +       <ID make="Panasonic" model="DMC-FZ100">Panasonic DMC-FZ100</ID>
  2711.         <CFA width="2" height="2">
  2712.             <Color x="0" y="0">GREEN</Color>
  2713.             <Color x="1" y="0">BLUE</Color>
  2714. @@ -4027,6 +4439,7 @@
  2715.         </Hints>
  2716.     </Camera>
  2717.     <Camera make="Panasonic" model = "DMC-FZ100" mode="4:3">
  2718. +       <ID make="Panasonic" model="DMC-FZ100">Panasonic DMC-FZ100</ID>
  2719.         <CFA width="2" height="2">
  2720.             <Color x="0" y="0">GREEN</Color>
  2721.             <Color x="1" y="0">BLUE</Color>
  2722. @@ -4040,6 +4453,7 @@
  2723.         </Hints>
  2724.     </Camera>
  2725.     <Camera make="Panasonic" model="DMC-FZ1000">
  2726. +       <ID make="Panasonic" model="DMC-FZ1000">Panasonic DMC-FZ1000</ID>
  2727.         <CFA width="2" height="2">
  2728.             <Color x="0" y="0">GREEN</Color>
  2729.             <Color x="1" y="0">BLUE</Color>
  2730. @@ -4050,6 +4464,7 @@
  2731.         <Sensor black="143" white="4095"/>
  2732.     </Camera>
  2733.     <Camera make="Panasonic" model="DMC-FZ1000" mode="3:2">
  2734. +       <ID make="Panasonic" model="DMC-FZ1000">Panasonic DMC-FZ1000</ID>
  2735.         <CFA width="2" height="2">
  2736.             <Color x="0" y="0">GREEN</Color>
  2737.             <Color x="1" y="0">BLUE</Color>
  2738. @@ -4060,6 +4475,7 @@
  2739.         <Sensor black="142" white="4095"/>
  2740.     </Camera>
  2741.     <Camera make="Panasonic" model="DMC-FZ1000" mode="1:1">
  2742. +       <ID make="Panasonic" model="DMC-FZ1000">Panasonic DMC-FZ1000</ID>
  2743.         <CFA width="2" height="2">
  2744.             <Color x="0" y="0">GREEN</Color>
  2745.             <Color x="1" y="0">BLUE</Color>
  2746. @@ -4070,6 +4486,7 @@
  2747.         <Sensor black="143" white="4095"/>
  2748.     </Camera>
  2749.     <Camera make="Panasonic" model="DMC-FZ1000" mode="4:3">
  2750. +       <ID make="Panasonic" model="DMC-FZ1000">Panasonic DMC-FZ1000</ID>
  2751.         <CFA width="2" height="2">
  2752.             <Color x="0" y="0">GREEN</Color>
  2753.             <Color x="1" y="0">BLUE</Color>
  2754. @@ -4080,6 +4497,7 @@
  2755.         <Sensor black="143" white="4095"/>
  2756.     </Camera>
  2757.     <Camera make="Panasonic" model="DMC-FZ1000" mode="16:9">
  2758. +       <ID make="Panasonic" model="DMC-FZ1000">Panasonic DMC-FZ1000</ID>
  2759.         <CFA width="2" height="2">
  2760.             <Color x="0" y="0">GREEN</Color>
  2761.             <Color x="1" y="0">BLUE</Color>
  2762. @@ -4090,6 +4508,7 @@
  2763.         <Sensor black="143" white="4095"/>
  2764.     </Camera>
  2765.     <Camera make="Panasonic" model = "DMC-GX1">
  2766. +       <ID make="Panasonic" model="DMC-GX1">Panasonic DMC-GX1</ID>
  2767.         <CFA width="2" height="2">
  2768.             <Color x="0" y="0">GREEN</Color>
  2769.             <Color x="1" y="0">RED</Color>
  2770. @@ -4103,6 +4522,7 @@
  2771.         </Hints>
  2772.     </Camera>
  2773.     <Camera make="Panasonic" model = "DMC-GX1" mode = "4:3">
  2774. +       <ID make="Panasonic" model="DMC-GX1">Panasonic DMC-GX1</ID>
  2775.         <CFA width="2" height="2">
  2776.             <Color x="0" y="0">GREEN</Color>
  2777.             <Color x="1" y="0">RED</Color>
  2778. @@ -4116,6 +4536,7 @@
  2779.         </Hints>
  2780.     </Camera>
  2781.     <Camera make="Panasonic" model = "DMC-GX1" mode = "3:2">
  2782. +       <ID make="Panasonic" model="DMC-GX1">Panasonic DMC-GX1</ID>
  2783.         <CFA width="2" height="2">
  2784.             <Color x="0" y="0">GREEN</Color>
  2785.             <Color x="1" y="0">RED</Color>
  2786. @@ -4129,6 +4550,7 @@
  2787.         </Hints>
  2788.     </Camera>
  2789.     <Camera make="Panasonic" model = "DMC-GX1" mode = "16:9">
  2790. +       <ID make="Panasonic" model="DMC-GX1">Panasonic DMC-GX1</ID>
  2791.         <CFA width="2" height="2">
  2792.             <Color x="0" y="0">GREEN</Color>
  2793.             <Color x="1" y="0">RED</Color>
  2794. @@ -4142,6 +4564,7 @@
  2795.         </Hints>
  2796.     </Camera>
  2797.     <Camera make="Panasonic" model = "DMC-GX1" mode = "1:1">
  2798. +       <ID make="Panasonic" model="DMC-GX1">Panasonic DMC-GX1</ID>
  2799.         <CFA width="2" height="2">
  2800.             <Color x="0" y="0">GREEN</Color>
  2801.             <Color x="1" y="0">RED</Color>
  2802. @@ -4155,6 +4578,7 @@
  2803.         </Hints>
  2804.     </Camera>
  2805.     <Camera make="Panasonic" model = "DMC-GX7">
  2806. +       <ID make="Panasonic" model="DMC-GX7">Panasonic DMC-GX7</ID>
  2807.         <CFA width="2" height="2">
  2808.             <Color x="0" y="0">BLUE</Color>
  2809.             <Color x="1" y="0">GREEN</Color>
  2810. @@ -4168,6 +4592,7 @@
  2811.         </Hints>
  2812.     </Camera>
  2813.     <Camera make="Panasonic" model = "DMC-GX7" mode = "4:3">
  2814. +       <ID make="Panasonic" model="DMC-GX7">Panasonic DMC-GX7</ID>
  2815.         <CFA width="2" height="2">
  2816.             <Color x="0" y="0">BLUE</Color>
  2817.             <Color x="1" y="0">GREEN</Color>
  2818. @@ -4181,6 +4606,7 @@
  2819.         </Hints>
  2820.     </Camera>
  2821.     <Camera make="Panasonic" model = "DMC-GX7" mode = "3:2">
  2822. +       <ID make="Panasonic" model="DMC-GX7">Panasonic DMC-GX7</ID>
  2823.         <CFA width="2" height="2">
  2824.             <Color x="0" y="0">BLUE</Color>
  2825.             <Color x="1" y="0">GREEN</Color>
  2826. @@ -4194,6 +4620,7 @@
  2827.         </Hints>
  2828.     </Camera>
  2829.     <Camera make="Panasonic" model = "DMC-GX7" mode = "16:9">
  2830. +       <ID make="Panasonic" model="DMC-GX7">Panasonic DMC-GX7</ID>
  2831.         <CFA width="2" height="2">
  2832.             <Color x="0" y="0">BLUE</Color>
  2833.             <Color x="1" y="0">GREEN</Color>
  2834. @@ -4207,6 +4634,7 @@
  2835.         </Hints>
  2836.     </Camera>
  2837.     <Camera make="Panasonic" model = "DMC-GX7" mode = "1:1">
  2838. +       <ID make="Panasonic" model="DMC-GX7">Panasonic DMC-GX7</ID>
  2839.         <CFA width="2" height="2">
  2840.             <Color x="0" y="0">BLUE</Color>
  2841.             <Color x="1" y="0">GREEN</Color>
  2842. @@ -4220,6 +4648,7 @@
  2843.         </Hints>
  2844.     </Camera>
  2845.     <Camera make="Panasonic" model = "DMC-LF1" mode="4:3">
  2846. +       <ID make="Panasonic" model="DMC-LF1">Panasonic DMC-LF1</ID>
  2847.         <CFA width="2" height="2">
  2848.             <Color x="0" y="0">RED</Color>
  2849.             <Color x="1" y="0">GREEN</Color>
  2850. @@ -4234,6 +4663,7 @@
  2851.     </Camera>
  2852.     <!-- Default guess -->
  2853.     <Camera make="Panasonic" model = "DMC-LF1">
  2854. +       <ID make="Panasonic" model="DMC-LF1">Panasonic DMC-LF1</ID>
  2855.         <CFA width="2" height="2">
  2856.             <Color x="0" y="0">RED</Color>
  2857.             <Color x="1" y="0">GREEN</Color>
  2858. @@ -4247,6 +4677,7 @@
  2859.         </Hints>
  2860.     </Camera>
  2861.     <Camera make="Panasonic" model = "DMC-LX3">
  2862. +       <ID make="Panasonic" model="DMC-LX3">Panasonic DMC-LX3</ID>
  2863.         <CFA width="2" height="2">
  2864.             <Color x="0" y="0">BLUE</Color>
  2865.             <Color x="1" y="0">GREEN</Color>
  2866. @@ -4260,6 +4691,7 @@
  2867.         </Hints>
  2868.     </Camera>
  2869.     <Camera make="Panasonic" model = "DMC-LX3" mode="16:9">
  2870. +       <ID make="Panasonic" model="DMC-LX3">Panasonic DMC-LX3</ID>
  2871.         <CFA width="2" height="2">
  2872.             <Color x="0" y="0">BLUE</Color>
  2873.             <Color x="1" y="0">GREEN</Color>
  2874. @@ -4273,6 +4705,7 @@
  2875.         </Hints>
  2876.     </Camera>
  2877.     <Camera make="Panasonic" model = "DMC-LX3" mode="4:3">
  2878. +       <ID make="Panasonic" model="DMC-LX3">Panasonic DMC-LX3</ID>
  2879.         <CFA width="2" height="2">
  2880.             <Color x="0" y="0">BLUE</Color>
  2881.             <Color x="1" y="0">GREEN</Color>
  2882. @@ -4286,6 +4719,7 @@
  2883.         </Hints>
  2884.     </Camera>
  2885.     <Camera make="Panasonic" model = "DMC-LX3" mode="3:2">
  2886. +       <ID make="Panasonic" model="DMC-LX3">Panasonic DMC-LX3</ID>
  2887.         <CFA width="2" height="2">
  2888.             <Color x="0" y="0">BLUE</Color>
  2889.             <Color x="1" y="0">GREEN</Color>
  2890. @@ -4299,6 +4733,7 @@
  2891.         </Hints>
  2892.     </Camera>
  2893.     <Camera make="LEICA" model="DIGILUX 2" decoder_version="2">
  2894. +       <ID make="Leica" model="Digilux 2">Leica Digilux 2</ID>
  2895.         <CFA width="2" height="2">
  2896.             <Color x="0" y="0">RED</Color>
  2897.             <Color x="1" y="0">GREEN</Color>
  2898. @@ -4309,6 +4744,7 @@
  2899.         <Sensor black="0" white="4095"/>
  2900.     </Camera>
  2901.     <Camera make="LEICA" model="DIGILUX 2" mode="4:3" decoder_version="2">
  2902. +       <ID make="Leica" model="Digilux 2">Leica Digilux 2</ID>
  2903.         <CFA width="2" height="2">
  2904.             <Color x="0" y="0">RED</Color>
  2905.             <Color x="1" y="0">GREEN</Color>
  2906. @@ -4319,6 +4755,7 @@
  2907.         <Sensor black="0" white="4095"/>
  2908.     </Camera>
  2909.     <Camera make="LEICA" model="D-LUX 3" decoder_version="2">
  2910. +       <ID make="Leica" model="D-LUX 3">Leica D-LUX 3</ID>
  2911.         <CFA width="2" height="2">
  2912.             <Color x="0" y="0">BLUE</Color>
  2913.             <Color x="1" y="0">GREEN</Color>
  2914. @@ -4329,6 +4766,7 @@
  2915.         <Sensor black="0" white="3986"/>
  2916.     </Camera>
  2917.     <Camera make="LEICA" model="D-LUX 3" mode="16:9" decoder_version="2">
  2918. +       <ID make="Leica" model="D-LUX 3">Leica D-LUX 3</ID>
  2919.         <CFA width="2" height="2">
  2920.             <Color x="0" y="0">BLUE</Color>
  2921.             <Color x="1" y="0">GREEN</Color>
  2922. @@ -4339,6 +4777,7 @@
  2923.         <Sensor black="0" white="3986"/>
  2924.     </Camera>
  2925.     <Camera make="LEICA" model="V-LUX 1" decoder_version="2">
  2926. +       <ID make="Leica" model="V-LUX 1">Leica V-LUX 1</ID>
  2927.         <CFA width="2" height="2">
  2928.             <Color x="0" y="0">BLUE</Color>
  2929.             <Color x="1" y="0">GREEN</Color>
  2930. @@ -4349,6 +4788,18 @@
  2931.         <Sensor black="0" white="3986"/>
  2932.     </Camera>
  2933.     <Camera make="LEICA" model="V-LUX 1" mode="3:2" decoder_version="2">
  2934. +       <ID make="Leica" model="V-LUX 1">Leica V-LUX 1</ID>
  2935. +       <CFA width="2" height="2">
  2936. +           <Color x="0" y="0">BLUE</Color>
  2937. +           <Color x="1" y="0">GREEN</Color>
  2938. +           <Color x="0" y="1">GREEN</Color>
  2939. +           <Color x="1" y="1">RED</Color>
  2940. +       </CFA>
  2941. +       <Crop x="4" y="0" width="-14" height="-3"/>
  2942. +       <Sensor black="0" white="3986"/>
  2943. +   </Camera>
  2944. +   <Camera make="LEICA" model="V-LUX 1" mode="4:3" decoder_version="2">
  2945. +       <ID make="Leica" model="V-LUX 1">Leica V-LUX 1</ID>
  2946.         <CFA width="2" height="2">
  2947.             <Color x="0" y="0">BLUE</Color>
  2948.             <Color x="1" y="0">GREEN</Color>
  2949. @@ -4359,6 +4810,7 @@
  2950.         <Sensor black="0" white="3986"/>
  2951.     </Camera>
  2952.     <Camera make="Panasonic" model="DMC-L10" decoder_version="2">
  2953. +       <ID make="Panasonic" model="DMC-L10">Panasonic DMC-L10</ID>
  2954.         <CFA width="2" height="2">
  2955.             <Color x="0" y="0">GREEN</Color>
  2956.             <Color x="1" y="0">BLUE</Color>
  2957. @@ -4369,6 +4821,7 @@
  2958.         <Sensor black="0" white="3986"/>
  2959.     </Camera>
  2960.     <Camera make="Panasonic" model="DMC-L10" mode="4:3" decoder_version="2">
  2961. +       <ID make="Panasonic" model="DMC-L10">Panasonic DMC-L10</ID>
  2962.         <CFA width="2" height="2">
  2963.             <Color x="0" y="0">GREEN</Color>
  2964.             <Color x="1" y="0">BLUE</Color>
  2965. @@ -4379,6 +4832,7 @@
  2966.         <Sensor black="0" white="3986"/>
  2967.     </Camera>
  2968.     <Camera make="Panasonic" model="DMC-FZ30" decoder_version="2">
  2969. +       <ID make="Panasonic" model="DMC-FZ30">Panasonic DMC-FZ30</ID>
  2970.         <CFA width="2" height="2">
  2971.             <Color x="0" y="0">RED</Color>
  2972.             <Color x="1" y="0">GREEN</Color>
  2973. @@ -4389,6 +4843,7 @@
  2974.         <Sensor black="0" white="3971"/>
  2975.     </Camera>
  2976.     <Camera make="Panasonic" model="DMC-FZ30" mode="4:3" decoder_version="2">
  2977. +       <ID make="Panasonic" model="DMC-FZ30">Panasonic DMC-FZ30</ID>
  2978.         <CFA width="2" height="2">
  2979.             <Color x="0" y="0">RED</Color>
  2980.             <Color x="1" y="0">GREEN</Color>
  2981. @@ -4399,6 +4854,7 @@
  2982.         <Sensor black="0" white="3971"/>
  2983.     </Camera>
  2984.     <Camera make="Panasonic" model="DMC-FZ50" decoder_version="2">
  2985. +       <ID make="Panasonic" model="DMC-FZ50">Panasonic DMC-FZ50</ID>
  2986.         <CFA width="2" height="2">
  2987.             <Color x="0" y="0">BLUE</Color>
  2988.             <Color x="1" y="0">GREEN</Color>
  2989. @@ -4409,6 +4865,7 @@
  2990.         <Sensor black="0" white="3986"/>
  2991.     </Camera>
  2992.     <Camera make="Panasonic" model = "DMC-FZ50" mode = "4:3" decoder_version="2">
  2993. +       <ID make="Panasonic" model="DMC-FZ50">Panasonic DMC-FZ50</ID>
  2994.         <CFA width="2" height="2">
  2995.             <Color x="0" y="0">BLUE</Color>
  2996.             <Color x="1" y="0">GREEN</Color>
  2997. @@ -4419,6 +4876,7 @@
  2998.         <Sensor black="0" white="65535"/>
  2999.     </Camera>
  3000.     <Camera make="Panasonic" model="DMC-FZ8" decoder_version="2">
  3001. +       <ID make="Panasonic" model="DMC-FZ8">Panasonic DMC-FZ8</ID>
  3002.         <CFA width="2" height="2">
  3003.             <Color x="0" y="0">RED</Color>
  3004.             <Color x="1" y="0">GREEN</Color>
  3005. @@ -4429,6 +4887,7 @@
  3006.         <Sensor black="0" white="3986"/>
  3007.     </Camera>
  3008.     <Camera make="Panasonic" model="DMC-FZ8" mode="4:3"> decoder_version="2"
  3009. +       <ID make="Panasonic" model="DMC-FZ8">Panasonic DMC-FZ8</ID>
  3010.         <CFA width="2" height="2">
  3011.             <Color x="0" y="0">RED</Color>
  3012.             <Color x="1" y="0">GREEN</Color>
  3013. @@ -4439,6 +4898,7 @@
  3014.         <Sensor black="0" white="3986"/>
  3015.     </Camera>
  3016.     <Camera make="Panasonic" model="DMC-FZ18" decoder_version="2">
  3017. +       <ID make="Panasonic" model="DMC-FZ18">Panasonic DMC-FZ18</ID>
  3018.         <CFA width="2" height="2">
  3019.             <Color x="0" y="0">BLUE</Color>
  3020.             <Color x="1" y="0">GREEN</Color>
  3021. @@ -4449,6 +4909,7 @@
  3022.         <Sensor black="0" white="3986"/>
  3023.     </Camera>
  3024.     <Camera make="Panasonic" model="DMC-FZ18" mode="4:3" decoder_version="2">
  3025. +       <ID make="Panasonic" model="DMC-FZ18">Panasonic DMC-FZ18</ID>
  3026.         <CFA width="2" height="2">
  3027.             <Color x="0" y="0">BLUE</Color>
  3028.             <Color x="1" y="0">GREEN</Color>
  3029. @@ -4459,6 +4920,7 @@
  3030.         <Sensor black="0" white="3986"/>
  3031.     </Camera>
  3032.     <Camera make="Panasonic" model="DMC-L1" decoder_version="2">
  3033. +       <ID make="Panasonic" model="DMC-L1">Panasonic DMC-L1</ID>
  3034.         <CFA width="2" height="2">
  3035.             <Color x="0" y="0">GREEN</Color>
  3036.             <Color x="1" y="0">BLUE</Color>
  3037. @@ -4469,6 +4931,7 @@
  3038.         <Sensor black="0" white="3986"/>
  3039.     </Camera>
  3040.     <Camera make="Panasonic" model="DMC-L1" mode="4:3" decoder_version="2">
  3041. +       <ID make="Panasonic" model="DMC-L1">Panasonic DMC-L1</ID>
  3042.         <CFA width="2" height="2">
  3043.             <Color x="0" y="0">GREEN</Color>
  3044.             <Color x="1" y="0">BLUE</Color>
  3045. @@ -4479,6 +4942,7 @@
  3046.         <Sensor black="0" white="3986"/>
  3047.     </Camera>
  3048.     <Camera make="Panasonic" model="DMC-LX2" decoder_version="2">
  3049. +       <ID make="Panasonic" model="DMC-LX2">Panasonic DMC-LX2</ID>
  3050.         <CFA width="2" height="2">
  3051.             <Color x="0" y="0">BLUE</Color>
  3052.             <Color x="1" y="0">GREEN</Color>
  3053. @@ -4489,6 +4953,7 @@
  3054.         <Sensor black="0" white="3986"/>
  3055.     </Camera>
  3056.     <Camera make="Panasonic" model="DMC-LX2" mode="16:9" decoder_version="2">
  3057. +       <ID make="Panasonic" model="DMC-LX2">Panasonic DMC-LX2</ID>
  3058.         <CFA width="2" height="2">
  3059.             <Color x="0" y="0">BLUE</Color>
  3060.             <Color x="1" y="0">GREEN</Color>
  3061. @@ -4500,6 +4965,7 @@
  3062.     </Camera>
  3063.     <!-- Leica D-Lux 4 is the same camera as LX-3 -->
  3064.     <Camera make="LEICA" model = "D-LUX 4">
  3065. +       <ID make="Leica" model="D-LUX 4">Leica D-LUX 4</ID>
  3066.         <CFA width="2" height="2">
  3067.             <Color x="0" y="0">BLUE</Color>
  3068.             <Color x="1" y="0">GREEN</Color>
  3069. @@ -4513,6 +4979,7 @@
  3070.         </Hints>
  3071.     </Camera>
  3072.     <Camera make="LEICA" model = "D-LUX 4" mode="16:9">
  3073. +       <ID make="Leica" model="D-LUX 4">Leica D-LUX 4</ID>
  3074.         <CFA width="2" height="2">
  3075.             <Color x="0" y="0">BLUE</Color>
  3076.             <Color x="1" y="0">GREEN</Color>
  3077. @@ -4526,6 +4993,7 @@
  3078.         </Hints>
  3079.     </Camera>
  3080.     <Camera make="LEICA" model = "D-LUX 4" mode="4:3">
  3081. +       <ID make="Leica" model="D-LUX 4">Leica D-LUX 4</ID>
  3082.         <CFA width="2" height="2">
  3083.             <Color x="0" y="0">BLUE</Color>
  3084.             <Color x="1" y="0">GREEN</Color>
  3085. @@ -4539,6 +5007,7 @@
  3086.         </Hints>
  3087.     </Camera>
  3088.     <Camera make="LEICA" model = "D-LUX 4" mode="3:2">
  3089. +       <ID make="Leica" model="D-LUX 4">Leica D-LUX 4</ID>
  3090.         <CFA width="2" height="2">
  3091.             <Color x="0" y="0">BLUE</Color>
  3092.             <Color x="1" y="0">GREEN</Color>
  3093. @@ -4553,6 +5022,7 @@
  3094.     </Camera>
  3095.  
  3096.     <Camera make="Panasonic" model = "DMC-LX5">
  3097. +       <ID make="Panasonic" model="DMC-LX5">Panasonic DMC-LX5</ID>
  3098.         <CFA width="2" height="2">
  3099.             <Color x="0" y="0">GREEN</Color>
  3100.             <Color x="1" y="0">RED</Color>
  3101. @@ -4566,6 +5036,7 @@
  3102.         </Hints>
  3103.     </Camera>
  3104.     <Camera make="Panasonic" model = "DMC-LX5" mode="4:3">
  3105. +       <ID make="Panasonic" model="DMC-LX5">Panasonic DMC-LX5</ID>
  3106.         <CFA width="2" height="2">
  3107.             <Color x="0" y="0">GREEN</Color>
  3108.             <Color x="1" y="0">RED</Color>
  3109. @@ -4579,6 +5050,7 @@
  3110.         </Hints>
  3111.     </Camera>
  3112.     <Camera make="Panasonic" model = "DMC-LX5" mode="3:2">
  3113. +       <ID make="Panasonic" model="DMC-LX5">Panasonic DMC-LX5</ID>
  3114.         <CFA width="2" height="2">
  3115.             <Color x="0" y="0">GREEN</Color>
  3116.             <Color x="1" y="0">RED</Color>
  3117. @@ -4592,6 +5064,7 @@
  3118.         </Hints>
  3119.     </Camera>
  3120.     <Camera make="Panasonic" model = "DMC-LX5" mode="16:9">
  3121. +       <ID make="Panasonic" model="DMC-LX5">Panasonic DMC-LX5</ID>
  3122.         <CFA width="2" height="2">
  3123.             <Color x="0" y="0">GREEN</Color>
  3124.             <Color x="1" y="0">RED</Color>
  3125. @@ -4605,6 +5078,7 @@
  3126.         </Hints>
  3127.     </Camera>
  3128.     <Camera make="Panasonic" model = "DMC-LX5" mode="1:1">
  3129. +       <ID make="Panasonic" model="DMC-LX5">Panasonic DMC-LX5</ID>
  3130.         <CFA width="2" height="2">
  3131.             <Color x="0" y="0">GREEN</Color>
  3132.             <Color x="1" y="0">RED</Color>
  3133. @@ -4619,6 +5093,7 @@
  3134.     </Camera>
  3135.     <!-- Leica D-Lux 5 is the same camera as LX-5 -->
  3136.     <Camera make="LEICA" model = "D-LUX 5">
  3137. +       <ID make="Leica" model="D-LUX 5">Leica D-LUX 5</ID>
  3138.         <CFA width="2" height="2">
  3139.             <Color x="0" y="0">GREEN</Color>
  3140.             <Color x="1" y="0">RED</Color>
  3141. @@ -4632,6 +5107,7 @@
  3142.         </Hints>
  3143.     </Camera>
  3144.     <Camera make="LEICA" model = "D-LUX 5" mode="4:3">
  3145. +       <ID make="Leica" model="D-LUX 5">Leica D-LUX 5</ID>
  3146.         <CFA width="2" height="2">
  3147.             <Color x="0" y="0">GREEN</Color>
  3148.             <Color x="1" y="0">RED</Color>
  3149. @@ -4645,6 +5121,7 @@
  3150.         </Hints>
  3151.     </Camera>
  3152.     <Camera make="LEICA" model = "D-LUX 5" mode="3:2">
  3153. +       <ID make="Leica" model="D-LUX 5">Leica D-LUX 5</ID>
  3154.         <CFA width="2" height="2">
  3155.             <Color x="0" y="0">GREEN</Color>
  3156.             <Color x="1" y="0">RED</Color>
  3157. @@ -4658,6 +5135,7 @@
  3158.         </Hints>
  3159.     </Camera>
  3160.     <Camera make="LEICA" model = "D-LUX 5" mode="16:9">
  3161. +       <ID make="Leica" model="D-LUX 5">Leica D-LUX 5</ID>
  3162.         <CFA width="2" height="2">
  3163.             <Color x="0" y="0">GREEN</Color>
  3164.             <Color x="1" y="0">RED</Color>
  3165. @@ -4671,6 +5149,7 @@
  3166.         </Hints>
  3167.     </Camera>
  3168.     <Camera make="LEICA" model = "D-LUX 5" mode="1:1">
  3169. +       <ID make="Leica" model="D-LUX 5">Leica D-LUX 5</ID>
  3170.         <CFA width="2" height="2">
  3171.             <Color x="0" y="0">GREEN</Color>
  3172.             <Color x="1" y="0">RED</Color>
  3173. @@ -4684,6 +5163,7 @@
  3174.         </Hints>
  3175.     </Camera>
  3176.     <Camera make="Panasonic" model = "DMC-LX7">
  3177. +       <ID make="Panasonic" model="DMC-LX7">Panasonic DMC-LX7</ID>
  3178.         <CFA width="2" height="2">
  3179.             <Color x="0" y="0">GREEN</Color>
  3180.             <Color x="1" y="0">RED</Color>
  3181. @@ -4697,6 +5177,7 @@
  3182.         </Hints>
  3183.     </Camera>
  3184.     <Camera make="Panasonic" model = "DMC-LX7" mode="4:3">
  3185. +       <ID make="Panasonic" model="DMC-LX7">Panasonic DMC-LX7</ID>
  3186.         <CFA width="2" height="2">
  3187.             <Color x="0" y="0">GREEN</Color>
  3188.             <Color x="1" y="0">RED</Color>
  3189. @@ -4710,6 +5191,7 @@
  3190.         </Hints>
  3191.     </Camera>
  3192.     <Camera make="Panasonic" model = "DMC-LX7" mode="3:2">
  3193. +       <ID make="Panasonic" model="DMC-LX7">Panasonic DMC-LX7</ID>
  3194.         <CFA width="2" height="2">
  3195.             <Color x="0" y="0">GREEN</Color>
  3196.             <Color x="1" y="0">RED</Color>
  3197. @@ -4723,6 +5205,7 @@
  3198.         </Hints>
  3199.     </Camera>
  3200.     <Camera make="Panasonic" model = "DMC-LX7" mode="16:9">
  3201. +       <ID make="Panasonic" model="DMC-LX7">Panasonic DMC-LX7</ID>
  3202.         <CFA width="2" height="2">
  3203.             <Color x="0" y="0">GREEN</Color>
  3204.             <Color x="1" y="0">RED</Color>
  3205. @@ -4736,6 +5219,7 @@
  3206.         </Hints>
  3207.     </Camera>
  3208.     <Camera make="Panasonic" model = "DMC-LX7" mode="1:1">
  3209. +       <ID make="Panasonic" model="DMC-LX7">Panasonic DMC-LX7</ID>
  3210.         <CFA width="2" height="2">
  3211.             <Color x="0" y="0">GREEN</Color>
  3212.             <Color x="1" y="0">RED</Color>
  3213. @@ -4750,6 +5234,7 @@
  3214.     </Camera>
  3215.     <!-- LEICA D-LUX 6 is the same camera as Panasonic DMC-LX7 -->
  3216.     <Camera make="LEICA" model = "D-LUX 6">
  3217. +       <ID make="Leica" model="D-LUX 6">Leica D-LUX 6</ID>
  3218.         <CFA width="2" height="2">
  3219.             <Color x="0" y="0">GREEN</Color>
  3220.             <Color x="1" y="0">RED</Color>
  3221. @@ -4763,6 +5248,7 @@
  3222.         </Hints>
  3223.     </Camera>
  3224.     <Camera make="LEICA" model = "D-LUX 6" mode="4:3">
  3225. +       <ID make="Leica" model="D-LUX 6">Leica D-LUX 6</ID>
  3226.         <CFA width="2" height="2">
  3227.             <Color x="0" y="0">GREEN</Color>
  3228.             <Color x="1" y="0">RED</Color>
  3229. @@ -4776,6 +5262,7 @@
  3230.         </Hints>
  3231.     </Camera>
  3232.     <Camera make="LEICA" model = "D-LUX 6" mode="3:2">
  3233. +       <ID make="Leica" model="D-LUX 6">Leica D-LUX 6</ID>
  3234.         <CFA width="2" height="2">
  3235.             <Color x="0" y="0">GREEN</Color>
  3236.             <Color x="1" y="0">RED</Color>
  3237. @@ -4789,6 +5276,7 @@
  3238.         </Hints>
  3239.     </Camera>
  3240.     <Camera make="LEICA" model = "D-LUX 6" mode="16:9">
  3241. +       <ID make="Leica" model="D-LUX 6">Leica D-LUX 6</ID>
  3242.         <CFA width="2" height="2">
  3243.             <Color x="0" y="0">GREEN</Color>
  3244.             <Color x="1" y="0">RED</Color>
  3245. @@ -4802,6 +5290,7 @@
  3246.         </Hints>
  3247.     </Camera>
  3248.     <Camera make="LEICA" model = "D-LUX 6" mode="1:1">
  3249. +       <ID make="Leica" model="D-LUX 6">Leica D-LUX 6</ID>
  3250.         <CFA width="2" height="2">
  3251.             <Color x="0" y="0">GREEN</Color>
  3252.             <Color x="1" y="0">RED</Color>
  3253. @@ -4815,6 +5304,7 @@
  3254.         </Hints>
  3255.     </Camera>
  3256.     <Camera make="Panasonic" model="DMC-LX1" mode="16:9">
  3257. +       <ID make="Panasonic" model="DMC-LX1">Panasonic DMC-LX1</ID>
  3258.         <CFA width="2" height="2">
  3259.             <Color x="0" y="0">RED</Color>
  3260.             <Color x="1" y="0">GREEN</Color>
  3261. @@ -4825,6 +5315,7 @@
  3262.         <Sensor black="0" white="3971"/>
  3263.     </Camera>
  3264.     <Camera make="Panasonic" model="DMC-LX1">
  3265. +       <ID make="Panasonic" model="DMC-LX1">Panasonic DMC-LX1</ID>
  3266.         <CFA width="2" height="2">
  3267.             <Color x="0" y="0">RED</Color>
  3268.             <Color x="1" y="0">GREEN</Color>
  3269. @@ -4835,6 +5326,7 @@
  3270.         <Sensor black="0" white="3971"/>
  3271.     </Camera>
  3272.     <Camera make="Panasonic" model="DMC-LX100">
  3273. +       <ID make="Panasonic" model="DMC-LX100">Panasonic DMC-LX100</ID>
  3274.         <CFA width="2" height="2">
  3275.             <Color x="0" y="0">BLUE</Color>
  3276.             <Color x="1" y="0">GREEN</Color>
  3277. @@ -4845,6 +5337,7 @@
  3278.         <Sensor black="143" white="4095"/>
  3279.     </Camera>
  3280.     <Camera make="Panasonic" model="DMC-LX100" mode="4:3">
  3281. +       <ID make="Panasonic" model="DMC-LX100">Panasonic DMC-LX100</ID>
  3282.         <CFA width="2" height="2">
  3283.             <Color x="0" y="0">BLUE</Color>
  3284.             <Color x="1" y="0">GREEN</Color>
  3285. @@ -4855,6 +5348,7 @@
  3286.         <Sensor black="143" white="4095"/>
  3287.     </Camera>
  3288.     <Camera make="Panasonic" model="DMC-LX100" mode="16:9">
  3289. +       <ID make="Panasonic" model="DMC-LX100">Panasonic DMC-LX100</ID>
  3290.         <CFA width="2" height="2">
  3291.             <Color x="0" y="0">BLUE</Color>
  3292.             <Color x="1" y="0">GREEN</Color>
  3293. @@ -4865,6 +5359,7 @@
  3294.         <Sensor black="143" white="4095"/>
  3295.     </Camera>
  3296.     <Camera make="Panasonic" model="DMC-LX100" mode="3:2">
  3297. +       <ID make="Panasonic" model="DMC-LX100">Panasonic DMC-LX100</ID>
  3298.         <CFA width="2" height="2">
  3299.             <Color x="0" y="0">BLUE</Color>
  3300.             <Color x="1" y="0">GREEN</Color>
  3301. @@ -4875,6 +5370,7 @@
  3302.         <Sensor black="143" white="4095"/>
  3303.     </Camera>
  3304.     <Camera make="Panasonic" model="DMC-LX100" mode="1:1">
  3305. +       <ID make="Panasonic" model="DMC-LX100">Panasonic DMC-LX100</ID>
  3306.         <CFA width="2" height="2">
  3307.             <Color x="0" y="0">BLUE</Color>
  3308.             <Color x="1" y="0">GREEN</Color>
  3309. @@ -4934,7 +5430,63 @@
  3310.         <Crop x="0" y="0" width="-128" height="0"/>
  3311.         <Sensor black="145" white="3956"/>
  3312.     </Camera>
  3313. +   <Camera make="Panasonic" model="DMC-TZ71">
  3314. +       <ID make="Panasonic" model="DMC-TZ71">Panasonic DMC-ZS50</ID>
  3315. +       <CFA width="2" height="2">
  3316. +           <Color x="0" y="0">RED</Color>
  3317. +           <Color x="1" y="0">GREEN</Color>
  3318. +           <Color x="0" y="1">GREEN</Color>
  3319. +           <Color x="1" y="1">BLUE</Color>
  3320. +       </CFA>
  3321. +       <Crop x="0" y="0" width="0" height="0"/>
  3322. +       <Sensor black="143" white="3956"/>
  3323. +   </Camera>
  3324. +   <Camera make="Panasonic" model="DMC-TZ71" mode="4:3">
  3325. +       <ID make="Panasonic" model="DMC-TZ71">Panasonic DMC-ZS50</ID>
  3326. +       <CFA width="2" height="2">
  3327. +           <Color x="0" y="0">RED</Color>
  3328. +           <Color x="1" y="0">GREEN</Color>
  3329. +           <Color x="0" y="1">GREEN</Color>
  3330. +           <Color x="1" y="1">BLUE</Color>
  3331. +       </CFA>
  3332. +       <Crop x="0" y="0" width="-128" height="0"/>
  3333. +       <Sensor black="143" white="3956"/>
  3334. +   </Camera>
  3335. +   <Camera make="Panasonic" model="DMC-TZ71" mode="3:2">
  3336. +       <ID make="Panasonic" model="DMC-TZ71">Panasonic DMC-ZS50</ID>
  3337. +       <CFA width="2" height="2">
  3338. +           <Color x="0" y="0">RED</Color>
  3339. +           <Color x="1" y="0">GREEN</Color>
  3340. +           <Color x="0" y="1">GREEN</Color>
  3341. +           <Color x="1" y="1">BLUE</Color>
  3342. +       </CFA>
  3343. +       <Crop x="0" y="0" width="-128" height="0"/>
  3344. +       <Sensor black="142" white="3971"/>
  3345. +   </Camera>
  3346. +   <Camera make="Panasonic" model="DMC-TZ71" mode="16:9">
  3347. +       <ID make="Panasonic" model="DMC-TZ71">Panasonic DMC-ZS50</ID>
  3348. +       <CFA width="2" height="2">
  3349. +           <Color x="0" y="0">RED</Color>
  3350. +           <Color x="1" y="0">GREEN</Color>
  3351. +           <Color x="0" y="1">GREEN</Color>
  3352. +           <Color x="1" y="1">BLUE</Color>
  3353. +       </CFA>
  3354. +       <Crop x="0" y="0" width="-128" height="0"/>
  3355. +       <Sensor black="143" white="3956"/>
  3356. +   </Camera>
  3357. +   <Camera make="Panasonic" model="DMC-TZ71" mode="1:1">
  3358. +       <ID make="Panasonic" model="DMC-TZ71">Panasonic DMC-ZS50</ID>
  3359. +       <CFA width="2" height="2">
  3360. +           <Color x="0" y="0">RED</Color>
  3361. +           <Color x="1" y="0">GREEN</Color>
  3362. +           <Color x="0" y="1">GREEN</Color>
  3363. +           <Color x="1" y="1">BLUE</Color>
  3364. +       </CFA>
  3365. +       <Crop x="0" y="0" width="-16" height="0"/>
  3366. +       <Sensor black="143" white="3956"/>
  3367. +   </Camera>
  3368.     <Camera make="PENTAX Corporation" model="PENTAX K100D">
  3369. +       <ID make="Pentax" model="K100D">Pentax K100D</ID>
  3370.         <CFA width="2" height="2">
  3371.             <Color x="0" y="0">RED</Color>
  3372.             <Color x="1" y="0">GREEN</Color>
  3373. @@ -4945,6 +5497,7 @@
  3374.         <Sensor black="127" white="3950"/>
  3375.     </Camera>
  3376.     <Camera make="PENTAX Corporation" model="PENTAX K110D">
  3377. +       <ID make="Pentax" model="K110D">Pentax K110D</ID>
  3378.         <CFA width="2" height="2">
  3379.             <Color x="0" y="0">RED</Color>
  3380.             <Color x="1" y="0">GREEN</Color>
  3381. @@ -4955,6 +5508,7 @@
  3382.         <Sensor black="127" white="4095"/>
  3383.     </Camera>
  3384.     <Camera make="PENTAX Corporation" model="PENTAX K100D Super">
  3385. +       <ID make="Pentax" model="K100D Super">Pentax K100D Super</ID>
  3386.         <CFA width="2" height="2">
  3387.             <Color x="0" y="0">RED</Color>
  3388.             <Color x="1" y="0">GREEN</Color>
  3389. @@ -4965,6 +5519,7 @@
  3390.         <Sensor black="127" white="4095"/>
  3391.     </Camera>
  3392.     <Camera make="PENTAX" model="PENTAX K100D">
  3393. +       <ID make="Pentax" model="K100D">Pentax K100D</ID>
  3394.         <CFA width="2" height="2">
  3395.             <Color x="0" y="0">RED</Color>
  3396.             <Color x="1" y="0">GREEN</Color>
  3397. @@ -4975,6 +5530,7 @@
  3398.         <Sensor black="127" white="3950"/>
  3399.     </Camera>
  3400.     <Camera make="PENTAX" model="PENTAX K110D">
  3401. +       <ID make="Pentax" model="K110D">Pentax K110D</ID>
  3402.         <CFA width="2" height="2">
  3403.             <Color x="0" y="0">RED</Color>
  3404.             <Color x="1" y="0">GREEN</Color>
  3405. @@ -4985,6 +5541,7 @@
  3406.         <Sensor black="127" white="4095"/>
  3407.     </Camera>
  3408.     <Camera make="PENTAX Corporation" model="PENTAX *ist D">
  3409. +       <ID make="Pentax" model="*ist D">Pentax *ist D</ID>
  3410.         <CFA width="2" height="2">
  3411.             <Color x="0" y="0">RED</Color>
  3412.             <Color x="1" y="0">GREEN</Color>
  3413. @@ -4995,6 +5552,7 @@
  3414.         <Sensor black="128" white="4095"/>
  3415.     </Camera>
  3416.     <Camera make="PENTAX Corporation" model="PENTAX *ist DL">
  3417. +       <ID make="Pentax" model="*ist DL">Pentax *ist DL</ID>
  3418.         <CFA width="2" height="2">
  3419.             <Color x="0" y="0">RED</Color>
  3420.             <Color x="1" y="0">GREEN</Color>
  3421. @@ -5005,6 +5563,7 @@
  3422.         <Sensor black="128" white="4095"/>
  3423.     </Camera>
  3424.     <Camera make="PENTAX Corporation" model="PENTAX *ist DL2">
  3425. +       <ID make="Pentax" model="*ist DL2">Pentax *ist DL2</ID>
  3426.         <CFA width="2" height="2">
  3427.             <Color x="0" y="0">RED</Color>
  3428.             <Color x="1" y="0">GREEN</Color>
  3429. @@ -5015,6 +5574,7 @@
  3430.         <Sensor black="127" white="3950"/>
  3431.     </Camera>
  3432.     <Camera make="PENTAX Corporation" model="PENTAX *ist DS">
  3433. +       <ID make="Pentax" model="*ist DS">Pentax *ist DS</ID>
  3434.         <CFA width="2" height="2">
  3435.             <Color x="0" y="0">RED</Color>
  3436.             <Color x="1" y="0">GREEN</Color>
  3437. @@ -5025,6 +5585,7 @@
  3438.         <Sensor black="128" white="3950"/>
  3439.     </Camera>
  3440.     <Camera make="PENTAX Corporation" model="PENTAX K10D">
  3441. +       <ID make="Pentax" model="K10D">Pentax K10D</ID>
  3442.         <CFA width="2" height="2">
  3443.             <Color x="0" y="0">RED</Color>
  3444.             <Color x="1" y="0">GREEN</Color>
  3445. @@ -5035,6 +5596,7 @@
  3446.         <Sensor black="0" white="4095"/>
  3447.     </Camera>
  3448.     <Camera make="PENTAX Corporation" model="PENTAX K20D">
  3449. +       <ID make="Pentax" model="K20D">Pentax K20D</ID>
  3450.         <CFA width="2" height="2">
  3451.             <Color x="0" y="0">BLUE</Color>
  3452.             <Color x="1" y="0">GREEN</Color>
  3453. @@ -5045,6 +5607,7 @@
  3454.         <Sensor black="0" white="4095"/>
  3455.     </Camera>
  3456.     <Camera make="PENTAX" model="PENTAX K20D">
  3457. +       <ID make="Pentax" model="K20D">Pentax K20D</ID>
  3458.         <CFA width="2" height="2">
  3459.             <Color x="0" y="0">BLUE</Color>
  3460.             <Color x="1" y="0">GREEN</Color>
  3461. @@ -5055,6 +5618,7 @@
  3462.         <Sensor black="0" white="4095"/>
  3463.     </Camera>
  3464.     <Camera make="PENTAX Corporation" model="PENTAX K200D">
  3465. +       <ID make="Pentax" model="K200D">Pentax K200D</ID>
  3466.         <CFA width="2" height="2">
  3467.             <Color x="0" y="0">RED</Color>
  3468.             <Color x="1" y="0">GREEN</Color>
  3469. @@ -5064,7 +5628,19 @@
  3470.         <Crop x="0" y="0" width="3880" height="2604"/>
  3471.         <Sensor black="0" white="4095"/>
  3472.     </Camera>
  3473. +   <Camera make="RICOH IMAGING COMPANY, LTD." model="PENTAX K-S2">
  3474. +       <ID make="Pentax" model="K-S2">Pentax K-S2</ID>
  3475. +       <CFA width="2" height="2">
  3476. +           <Color x="0" y="0">RED</Color>
  3477. +           <Color x="1" y="0">GREEN</Color>
  3478. +           <Color x="0" y="1">GREEN</Color>
  3479. +           <Color x="1" y="1">BLUE</Color>
  3480. +       </CFA>
  3481. +       <Crop x="0" y="0" width="0" height="0"/>
  3482. +       <Sensor black="0" white="3839"/>
  3483. +   </Camera>
  3484.     <Camera make="RICOH IMAGING COMPANY, LTD." model="PENTAX K-3">
  3485. +       <ID make="Pentax" model="K-3">Pentax K-3</ID>
  3486.         <CFA width="2" height="2">
  3487.             <Color x="0" y="0">RED</Color>
  3488.             <Color x="1" y="0">GREEN</Color>
  3489. @@ -5075,6 +5651,7 @@
  3490.         <Sensor black="1" white="15868"/>
  3491.     </Camera>
  3492.     <Camera make="PENTAX" model="PENTAX K-5" decoder_version="2">
  3493. +       <ID make="Pentax" model="K-5">PENTAX K-5</ID>
  3494.         <CFA width="2" height="2">
  3495.             <Color x="0" y="0">BLUE</Color>
  3496.             <Color x="1" y="0">GREEN</Color>
  3497. @@ -5088,6 +5665,7 @@
  3498.         </BlackAreas>
  3499.     </Camera>
  3500.     <Camera make="PENTAX" model="PENTAX K-5 II" decoder_version="2">
  3501. +       <ID make="Pentax" model="K-5 II">PENTAX K-5 II</ID>
  3502.         <CFA width="2" height="2">
  3503.             <Color x="0" y="0">BLUE</Color>
  3504.             <Color x="1" y="0">GREEN</Color>
  3505. @@ -5101,6 +5679,7 @@
  3506.         </BlackAreas>
  3507.     </Camera>
  3508.     <Camera make="PENTAX" model="PENTAX K-5 II s" decoder_version="2">
  3509. +       <ID make="Pentax" model="K-5 II s">PENTAX K-5 II s</ID>
  3510.         <CFA width="2" height="2">
  3511.             <Color x="0" y="0">BLUE</Color>
  3512.             <Color x="1" y="0">GREEN</Color>
  3513. @@ -5114,6 +5693,7 @@
  3514.         </BlackAreas>
  3515.     </Camera>
  3516.     <Camera make="PENTAX" model="PENTAX K-7">
  3517. +       <ID make="Pentax" model="K-7">PENTAX K-7</ID>
  3518.         <CFA width="2" height="2">
  3519.             <Color x="0" y="0">BLUE</Color>
  3520.             <Color x="1" y="0">GREEN</Color>
  3521. @@ -5124,6 +5704,7 @@
  3522.         <Sensor black="0" white="4095"/>
  3523.     </Camera>
  3524.     <Camera make="PENTAX" model="PENTAX K-m">
  3525. +       <ID make="Pentax" model="K-m">Pentax K-m</ID>
  3526.         <CFA width="2" height="2">
  3527.             <Color x="0" y="0">RED</Color>
  3528.             <Color x="1" y="0">GREEN</Color>
  3529. @@ -5134,6 +5715,7 @@
  3530.         <Sensor black="0" white="4095"/>
  3531.     </Camera>
  3532.     <Camera make="PENTAX" model="PENTAX K-x">
  3533. +       <ID make="Pentax" model="K-x">PENTAX K-x</ID>
  3534.         <CFA width="2" height="2">
  3535.             <Color x="0" y="0">BLUE</Color>
  3536.             <Color x="1" y="0">GREEN</Color>
  3537. @@ -5147,6 +5729,7 @@
  3538.         </BlackAreas>
  3539.     </Camera>
  3540.     <Camera make="PENTAX" model="PENTAX K-r" decoder_version="3">
  3541. +       <ID make="Pentax" model="K-r">PENTAX K-r</ID>
  3542.         <CFA width="2" height="2">
  3543.             <Color x="0" y="0">BLUE</Color>
  3544.             <Color x="1" y="0">GREEN</Color>
  3545. @@ -5157,6 +5740,7 @@
  3546.         <Sensor black="64" white="4000"/>
  3547.     </Camera>
  3548.     <Camera make="PENTAX" model="PENTAX K200D">
  3549. +       <ID make="Pentax" model="K200D">Pentax K200D</ID>
  3550.         <CFA width="2" height="2">
  3551.             <Color x="0" y="0">RED</Color>
  3552.             <Color x="1" y="0">GREEN</Color>
  3553. @@ -5167,6 +5751,7 @@
  3554.         <Sensor black="0" white="4095"/>
  3555.     </Camera>
  3556.     <Camera make="PENTAX" model="PENTAX K2000">
  3557. +       <ID make="Pentax" model="K2000">Pentax K2000</ID>
  3558.         <CFA width="2" height="2">
  3559.             <Color x="0" y="0">RED</Color>
  3560.             <Color x="1" y="0">GREEN</Color>
  3561. @@ -5177,6 +5762,7 @@
  3562.         <Sensor black="0" white="4095"/>
  3563.     </Camera>
  3564.     <Camera make="SAMSUNG" model="EX2F">
  3565. +       <ID make="Samsung" model="EX2F">Samsung EX2F</ID>
  3566.         <CFA width="2" height="2">
  3567.             <Color x="0" y="0">RED</Color>
  3568.             <Color x="1" y="0">GREEN</Color>
  3569. @@ -5187,6 +5773,7 @@
  3570.         <Sensor black="0" white="4095"/>
  3571.     </Camera>
  3572.     <Camera make="SAMSUNG" model="EX1">
  3573. +       <ID make="Samsung" model="EX1">Samsung EX1</ID>
  3574.         <CFA width="2" height="2">
  3575.             <Color x="0" y="0">RED</Color>
  3576.             <Color x="1" y="0">GREEN</Color>
  3577. @@ -5197,6 +5784,7 @@
  3578.         <Sensor black="0" white="16383"/>
  3579.     </Camera>
  3580.     <Camera make="SAMSUNG" model="NX1">
  3581. +       <ID make="Samsung" model="NX1">Samsung NX1</ID>
  3582.         <CFA width="2" height="2">
  3583.             <Color x="0" y="0">GREEN</Color>
  3584.             <Color x="1" y="0">RED</Color>
  3585. @@ -5209,6 +5797,7 @@
  3586.         <Sensor black="128" white="16100"/>
  3587.     </Camera>
  3588.     <Camera make="SAMSUNG" model="NX5">
  3589. +       <ID make="Samsung" model="NX5">Samsung NX5</ID>
  3590.         <CFA width="2" height="2">
  3591.             <Color x="0" y="0">BLUE</Color>
  3592.             <Color x="1" y="0">GREEN</Color>
  3593. @@ -5222,6 +5811,7 @@
  3594.         </BlackAreas>
  3595.     </Camera>
  3596.     <Camera make="SAMSUNG" model="NX10">
  3597. +       <ID make="Samsung" model="NX10">Samsung NX10</ID>
  3598.         <CFA width="2" height="2">
  3599.             <Color x="0" y="0">BLUE</Color>
  3600.             <Color x="1" y="0">GREEN</Color>
  3601. @@ -5236,6 +5826,7 @@
  3602.         </BlackAreas>
  3603.     </Camera>
  3604.     <Camera make="SAMSUNG" model="NX11">
  3605. +       <ID make="Samsung" model="NX11">Samsung NX11</ID>
  3606.         <CFA width="2" height="2">
  3607.             <Color x="0" y="0">BLUE</Color>
  3608.             <Color x="1" y="0">GREEN</Color>
  3609. @@ -5249,6 +5840,7 @@
  3610.         </BlackAreas>
  3611.     </Camera>
  3612.     <Camera make="SAMSUNG" model="NX100">
  3613. +       <ID make="Samsung" model="NX100">Samsung NX100</ID>
  3614.         <CFA width="2" height="2">
  3615.             <Color x="0" y="0">BLUE</Color>
  3616.             <Color x="1" y="0">GREEN</Color>
  3617. @@ -5263,6 +5855,7 @@
  3618.         </BlackAreas>
  3619.     </Camera>
  3620.     <Camera make="SAMSUNG" model="NX1000" decoder_version="2">
  3621. +       <ID make="Samsung" model="NX1000">Samsung NX1000</ID>
  3622.         <CFA width="2" height="2">
  3623.             <Color x="0" y="0">GREEN</Color>
  3624.             <Color x="1" y="0">RED</Color>
  3625. @@ -5276,6 +5869,7 @@
  3626.         </Hints>
  3627.     </Camera>
  3628.     <Camera make="SAMSUNG" model="NX1100" decoder_version="2">
  3629. +       <ID make="Samsung" model="NX1100">Samsung NX1100</ID>
  3630.         <CFA width="2" height="2">
  3631.             <Color x="0" y="0">GREEN</Color>
  3632.             <Color x="1" y="0">RED</Color>
  3633. @@ -5289,6 +5883,7 @@
  3634.         </Hints>
  3635.     </Camera>
  3636.     <Camera make="SAMSUNG" model="NX20" decoder_version="2">
  3637. +       <ID make="Samsung" model="NX20">Samsung NX20</ID>
  3638.         <CFA width="2" height="2">
  3639.             <Color x="0" y="0">GREEN</Color>
  3640.             <Color x="1" y="0">RED</Color>
  3641. @@ -5302,6 +5897,7 @@
  3642.         </Hints>
  3643.     </Camera>
  3644.     <Camera make="SAMSUNG" model="NX200" decoder_version="2">
  3645. +       <ID make="Samsung" model="NX200">Samsung NX200</ID>
  3646.         <CFA width="2" height="2">
  3647.             <Color x="0" y="0">GREEN</Color>
  3648.             <Color x="1" y="0">RED</Color>
  3649. @@ -5315,6 +5911,7 @@
  3650.         </Hints>
  3651.     </Camera>
  3652.     <Camera make="SAMSUNG" model="NX210" decoder_version="2">
  3653. +       <ID make="Samsung" model="NX210">Samsung NX210</ID>
  3654.         <CFA width="2" height="2">
  3655.             <Color x="0" y="0">GREEN</Color>
  3656.             <Color x="1" y="0">RED</Color>
  3657. @@ -5328,6 +5925,7 @@
  3658.         </Hints>
  3659.     </Camera>
  3660.     <Camera make="SAMSUNG" model="NX2000" decoder_version="3">
  3661. +       <ID make="Samsung" model="NX2000">Samsung NX2000</ID>
  3662.         <CFA width="2" height="2">
  3663.             <Color x="0" y="0">GREEN</Color>
  3664.             <Color x="1" y="0">RED</Color>
  3665. @@ -5338,6 +5936,7 @@
  3666.         <Sensor black="0" white="4095"/>
  3667.     </Camera>
  3668.     <Camera make="SAMSUNG" model="NX30" decoder_version="3">
  3669. +       <ID make="Samsung" model="NX30">Samsung NX30</ID>
  3670.         <CFA width="2" height="2">
  3671.             <Color x="0" y="0">GREEN</Color>
  3672.             <Color x="1" y="0">RED</Color>
  3673. @@ -5348,6 +5947,7 @@
  3674.         <Sensor black="0" white="4095"/>
  3675.     </Camera>
  3676.     <Camera make="SAMSUNG" model="NX300" decoder_version="3">
  3677. +       <ID make="Samsung" model="NX300">Samsung NX300</ID>
  3678.         <CFA width="2" height="2">
  3679.             <Color x="0" y="0">GREEN</Color>
  3680.             <Color x="1" y="0">RED</Color>
  3681. @@ -5361,6 +5961,7 @@
  3682.         </Aliases>
  3683.     </Camera>
  3684.     <Camera make="SAMSUNG" model="NX3000">
  3685. +       <ID make="Samsung" model="NX3000">Samsung NX3000</ID>
  3686.         <CFA width="2" height="2">
  3687.             <Color x="0" y="0">GREEN</Color>
  3688.             <Color x="1" y="0">RED</Color>
  3689. @@ -5371,6 +5972,7 @@
  3690.         <Sensor black="0" white="4095"/>
  3691.     </Camera>
  3692.     <Camera make="SAMSUNG" model="NX500">
  3693. +       <ID make="Samsung" model="NX500">Samsung NX500</ID>
  3694.         <CFA width="2" height="2">
  3695.             <Color x="0" y="0">GREEN</Color>
  3696.             <Color x="1" y="0">RED</Color>
  3697. @@ -5383,6 +5985,7 @@
  3698.         <Sensor black="128" white="16100"/>
  3699.     </Camera>
  3700.     <Camera make="SAMSUNG" model="EK-GN120" decoder_version="3">
  3701. +       <ID make="Samsung" model="EK-GN120">Samsung EK-GN120</ID>
  3702.         <CFA width="2" height="2">
  3703.             <Color x="0" y="0">GREEN</Color>
  3704.             <Color x="1" y="0">BLUE</Color>
  3705. @@ -5393,6 +5996,7 @@
  3706.         <Sensor black="0" white="4095"/>
  3707.     </Camera>
  3708.     <Camera make="SAMSUNG" model="WB2000">
  3709. +       <ID make="Samsung" model="WB2000">Samsung WB2000</ID>
  3710.         <CFA width="2" height="2">
  3711.             <Color x="0" y="0">RED</Color>
  3712.             <Color x="1" y="0">GREEN</Color>
  3713. @@ -5403,6 +6007,7 @@
  3714.         <Sensor black="0" white="4095"/>
  3715.     </Camera>
  3716.     <Camera make="SONY" model="DSC-RX10">
  3717. +       <ID make="Sony" model="DSC-RX10">Sony DSC-RX10</ID>
  3718.         <CFA width="2" height="2">
  3719.             <Color x="0" y="0">RED</Color>
  3720.             <Color x="1" y="0">GREEN</Color>
  3721. @@ -5418,6 +6023,7 @@
  3722.         <Sensor black="1245" white="16384"/>
  3723.     </Camera>
  3724.     <Camera make="SONY" model="DSC-RX100">
  3725. +       <ID make="Sony" model="DSC-RX100">Sony DSC-RX100</ID>
  3726.         <CFA width="2" height="2">
  3727.             <Color x="0" y="0">RED</Color>
  3728.             <Color x="1" y="0">GREEN</Color>
  3729. @@ -5428,6 +6034,7 @@
  3730.         <Sensor black="800" white="16620"/>
  3731.     </Camera>
  3732.     <Camera make="SONY" model="DSC-RX100M2">
  3733. +       <ID make="Sony" model="DSC-RX100M2">Sony DSC-RX100M2</ID>
  3734.         <CFA width="2" height="2">
  3735.             <Color x="0" y="0">RED</Color>
  3736.             <Color x="1" y="0">GREEN</Color>
  3737. @@ -5438,6 +6045,7 @@
  3738.         <Sensor black="800" white="16300"/>
  3739.     </Camera>
  3740.     <Camera make="SONY" model="DSC-RX100M3">
  3741. +       <ID make="Sony" model="DSC-RX100M3">Sony DSC-RX100M3</ID>
  3742.         <CFA width="2" height="2">
  3743.             <Color x="0" y="0">RED</Color>
  3744.             <Color x="1" y="0">GREEN</Color>
  3745. @@ -5448,6 +6056,7 @@
  3746.         <Sensor black="800" white="16300"/>
  3747.     </Camera>
  3748.     <Camera make="SONY" model="DSC-RX1R">
  3749. +       <ID make="Sony" model="DSC-RX1R">Sony DSC-RX1R</ID>
  3750.         <CFA width="2" height="2">
  3751.             <Color x="0" y="0">RED</Color>
  3752.             <Color x="1" y="0">GREEN</Color>
  3753. @@ -5462,6 +6071,7 @@
  3754.         </BlackAreas>
  3755.     </Camera>
  3756.     <Camera make="SONY" model="DSLR-A100" decoder_version="1">
  3757. +       <ID make="Sony" model="DSLR-A100">Sony DSLR-A100</ID>
  3758.         <CFA width="2" height="2">
  3759.             <Color x="0" y="0">GREEN</Color>
  3760.             <Color x="1" y="0">RED</Color>
  3761. @@ -5472,6 +6082,7 @@
  3762.         <Sensor black="0" white="4095"/>
  3763.     </Camera>
  3764.     <Camera make="SONY" model="DSLR-A200">
  3765. +       <ID make="Sony" model="DSLR-A200">Sony DSLR-A200</ID>
  3766.         <CFA width="2" height="2">
  3767.             <Color x="0" y="0">RED</Color>
  3768.             <Color x="1" y="0">GREEN</Color>
  3769. @@ -5482,6 +6093,7 @@
  3770.         <Sensor black="0" white="4095"/>
  3771.     </Camera>
  3772.     <Camera make="SONY" model="DSLR-A230">
  3773. +       <ID make="Sony" model="DSLR-A230">Sony DSLR-A230</ID>
  3774.         <CFA width="2" height="2">
  3775.             <Color x="0" y="0">RED</Color>
  3776.             <Color x="1" y="0">GREEN</Color>
  3777. @@ -5492,6 +6104,7 @@
  3778.         <Sensor black="0" white="4095"/>
  3779.     </Camera>
  3780.     <Camera make="SONY" model="DSLR-A290">
  3781. +       <ID make="Sony" model="DSLR-A290">Sony DSLR-A290</ID>
  3782.         <CFA width="2" height="2">
  3783.             <Color x="0" y="0">RED</Color>
  3784.             <Color x="1" y="0">GREEN</Color>
  3785. @@ -5502,6 +6115,7 @@
  3786.         <Sensor black="0" white="4095"/>
  3787.     </Camera>
  3788.     <Camera make="SONY" model="DSLR-A300">
  3789. +       <ID make="Sony" model="DSLR-A300">Sony DSLR-A300</ID>
  3790.         <CFA width="2" height="2">
  3791.             <Color x="0" y="0">RED</Color>
  3792.             <Color x="1" y="0">GREEN</Color>
  3793. @@ -5512,6 +6126,7 @@
  3794.         <Sensor black="0" white="4095"/>
  3795.     </Camera>
  3796.     <Camera make="SONY" model="DSLR-A330">
  3797. +       <ID make="Sony" model="DSLR-A330">Sony DSLR-A330</ID>
  3798.         <CFA width="2" height="2">
  3799.             <Color x="0" y="0">RED</Color>
  3800.             <Color x="1" y="0">GREEN</Color>
  3801. @@ -5522,6 +6137,7 @@
  3802.         <Sensor black="0" white="4095"/>
  3803.     </Camera>
  3804.     <Camera make="SONY" model="DSLR-A350">
  3805. +       <ID make="Sony" model="DSLR-A350">Sony DSLR-A350</ID>
  3806.         <CFA width="2" height="2">
  3807.             <Color x="0" y="0">RED</Color>
  3808.             <Color x="1" y="0">GREEN</Color>
  3809. @@ -5532,6 +6148,7 @@
  3810.         <Sensor black="0" white="4095"/>
  3811.     </Camera>
  3812.     <Camera make="SONY" model="DSLR-A390">
  3813. +       <ID make="Sony" model="DSLR-A390">Sony DSLR-A390</ID>
  3814.         <CFA width="2" height="2">
  3815.             <Color x="0" y="0">RED</Color>
  3816.             <Color x="1" y="0">GREEN</Color>
  3817. @@ -5542,6 +6159,7 @@
  3818.         <Sensor black="0" white="4095"/>
  3819.     </Camera>
  3820.     <Camera make="SONY" model="DSLR-A450">
  3821. +       <ID make="Sony" model="DSLR-A450">Sony DSLR-A450</ID>
  3822.         <CFA width="2" height="2">
  3823.             <Color x="0" y="0">RED</Color>
  3824.             <Color x="1" y="0">GREEN</Color>
  3825. @@ -5552,6 +6170,7 @@
  3826.         <Sensor black="500" white="16000"/>
  3827.     </Camera>
  3828.     <Camera make="SONY" model="DSLR-A500">
  3829. +       <ID make="Sony" model="DSLR-A500">Sony DSLR-A500</ID>
  3830.         <CFA width="2" height="2">
  3831.             <Color x="1" y="1">BLUE</Color>
  3832.             <Color x="1" y="0">GREEN</Color>
  3833. @@ -5562,6 +6181,7 @@
  3834.         <Sensor black="500" white="16600"/>
  3835.     </Camera>
  3836.     <Camera make="SONY" model="DSLR-A550">
  3837. +       <ID make="Sony" model="DSLR-A550">Sony DSLR-A550</ID>
  3838.         <CFA width="2" height="2">
  3839.             <Color x="1" y="1">BLUE</Color>
  3840.             <Color x="1" y="0">GREEN</Color>
  3841. @@ -5572,6 +6192,7 @@
  3842.         <Sensor black="512" white="16372"/>
  3843.     </Camera>
  3844.     <Camera make="SONY" model="DSLR-A560">
  3845. +       <ID make="Sony" model="DSLR-A560">Sony DSLR-A560</ID>
  3846.         <CFA width="2" height="2">
  3847.             <Color x="1" y="1">BLUE</Color>
  3848.             <Color x="1" y="0">GREEN</Color>
  3849. @@ -5582,6 +6203,7 @@
  3850.         <Sensor black="476" white="16596"/>
  3851.     </Camera>
  3852.     <Camera make="SONY" model="DSLR-A580">
  3853. +       <ID make="Sony" model="DSLR-A580">Sony DSLR-A580</ID>
  3854.         <CFA width="2" height="2">
  3855.             <Color x="1" y="1">BLUE</Color>
  3856.             <Color x="1" y="0">GREEN</Color>
  3857. @@ -5592,6 +6214,7 @@
  3858.         <Sensor black="520" white="16596"/>
  3859.     </Camera>
  3860.     <Camera make="SONY" model="DSLR-A700">
  3861. +       <ID make="Sony" model="DSLR-A700">Sony DSLR-A700</ID>
  3862.         <CFA width="2" height="2">
  3863.             <Color x="1" y="1">BLUE</Color>
  3864.             <Color x="1" y="0">GREEN</Color>
  3865. @@ -5602,6 +6225,7 @@
  3866.         <Sensor black="520" white="16383"/>
  3867.     </Camera>
  3868.     <Camera make="SONY" model="DSLR-A850">
  3869. +       <ID make="Sony" model="DSLR-A850">Sony DSLR-A850</ID>
  3870.         <CFA width="2" height="2">
  3871.             <Color x="1" y="1">BLUE</Color>
  3872.             <Color x="1" y="0">GREEN</Color>
  3873. @@ -5612,6 +6236,7 @@
  3874.         <Sensor black="500" white="15000"/>
  3875.     </Camera>
  3876.     <Camera make="SONY" model="DSLR-A900">
  3877. +       <ID make="Sony" model="DSLR-A900">Sony DSLR-A900</ID>
  3878.         <CFA width="2" height="2">
  3879.             <Color x="0" y="0">RED</Color>
  3880.             <Color x="1" y="0">GREEN</Color>
  3881. @@ -5622,6 +6247,7 @@
  3882.         <Sensor black="520" white="16383"/>
  3883.     </Camera>
  3884.     <Camera make="SONY" model="NEX-3">
  3885. +       <ID make="Sony" model="NEX-3">Sony NEX-3</ID>
  3886.         <CFA width="2" height="2">
  3887.             <Color x="0" y="0">RED</Color>
  3888.             <Color x="1" y="0">GREEN</Color>
  3889. @@ -5632,6 +6258,7 @@
  3890.         <Sensor black="520" white="16360"/>
  3891.     </Camera>
  3892.     <Camera make="SONY" model="NEX-3N">
  3893. +       <ID make="Sony" model="NEX-3N">Sony NEX-3N</ID>
  3894.         <CFA width="2" height="2">
  3895.             <Color x="0" y="0">RED</Color>
  3896.             <Color x="1" y="0">GREEN</Color>
  3897. @@ -5642,6 +6269,7 @@
  3898.         <Sensor black="520" white="16596"/>
  3899.     </Camera>
  3900.     <Camera make="SONY" model="NEX-5">
  3901. +       <ID make="Sony" model="NEX-5">Sony NEX-5</ID>
  3902.         <CFA width="2" height="2">
  3903.             <Color x="0" y="0">RED</Color>
  3904.             <Color x="1" y="0">GREEN</Color>
  3905. @@ -5652,6 +6280,7 @@
  3906.         <Sensor black="520" white="16383"/>
  3907.     </Camera>
  3908.     <Camera make="SONY" model="NEX-5N">
  3909. +       <ID make="Sony" model="NEX-5N">Sony NEX-5N</ID>
  3910.         <CFA width="2" height="2">
  3911.             <Color x="0" y="0">RED</Color>
  3912.             <Color x="1" y="0">GREEN</Color>
  3913. @@ -5662,6 +6291,7 @@
  3914.         <Sensor black="520" white="16596"/>
  3915.     </Camera>
  3916.     <Camera make="SONY" model="NEX-5R">
  3917. +       <ID make="Sony" model="NEX-5R">Sony NEX-5R</ID>
  3918.         <CFA width="2" height="2">
  3919.             <Color x="0" y="0">RED</Color>
  3920.             <Color x="1" y="0">GREEN</Color>
  3921. @@ -5672,6 +6302,7 @@
  3922.         <Sensor black="520" white="16596"/>
  3923.     </Camera>
  3924.     <Camera make="SONY" model="NEX-5T">
  3925. +       <ID make="Sony" model="NEX-5T">Sony NEX-5T</ID>
  3926.         <CFA width="2" height="2">
  3927.             <Color x="0" y="0">RED</Color>
  3928.             <Color x="1" y="0">GREEN</Color>
  3929. @@ -5682,6 +6313,7 @@
  3930.         <Sensor black="512" white="16300"/>
  3931.     </Camera>
  3932.     <Camera make="SONY" model="NEX-6">
  3933. +       <ID make="Sony" model="NEX-6">Sony NEX-6</ID>
  3934.         <CFA width="2" height="2">
  3935.             <Color x="0" y="0">RED</Color>
  3936.             <Color x="1" y="0">GREEN</Color>
  3937. @@ -5693,6 +6325,7 @@
  3938.     </Camera>
  3939.     <!-- Measured on images from https://github.com/klauspost/rawspeed/issues/78 -->
  3940.     <Camera make="SONY" model="NEX-7">
  3941. +       <ID make="Sony" model="NEX-7">Sony NEX-7</ID>
  3942.         <CFA width="2" height="2">
  3943.             <Color x="0" y="0">RED</Color>
  3944.             <Color x="1" y="0">GREEN</Color>
  3945. @@ -5703,6 +6336,7 @@
  3946.         <Sensor black="512" white="16300"/>
  3947.     </Camera>
  3948.     <Camera make="SONY" model="NEX-C3">
  3949. +       <ID make="Sony" model="NEX-C3">Sony NEX-C3</ID>
  3950.         <CFA width="2" height="2">
  3951.             <Color x="0" y="0">RED</Color>
  3952.             <Color x="1" y="0">GREEN</Color>
  3953. @@ -5713,6 +6347,7 @@
  3954.         <Sensor black="520" white="16596"/>
  3955.     </Camera>
  3956.     <Camera make="SONY" model="NEX-F3">
  3957. +       <ID make="Sony" model="NEX-F3">Sony NEX-F3</ID>
  3958.         <CFA width="2" height="2">
  3959.             <Color x="0" y="0">RED</Color>
  3960.             <Color x="1" y="0">GREEN</Color>
  3961. @@ -5723,6 +6358,7 @@
  3962.         <Sensor black="520" white="16360"/>
  3963.     </Camera>
  3964.     <Camera make="SONY" model="ILCE-3000">
  3965. +       <ID make="Sony" model="ILCE-3000">Sony ILCE-3000</ID>
  3966.         <CFA width="2" height="2">
  3967.             <Color x="0" y="0">RED</Color>
  3968.             <Color x="1" y="0">GREEN</Color>
  3969. @@ -5733,6 +6369,7 @@
  3970.         <Sensor black="512" white="16300"/>
  3971.     </Camera>
  3972.     <Camera make="SONY" model="ILCE-3500">
  3973. +       <ID make="Sony" model="ILCE-3500">Sony ILCE-3500</ID>
  3974.         <CFA width="2" height="2">
  3975.             <Color x="0" y="0">RED</Color>
  3976.             <Color x="1" y="0">GREEN</Color>
  3977. @@ -5743,6 +6380,7 @@
  3978.         <Sensor black="512" white="16300"/>
  3979.     </Camera>
  3980.     <Camera make="SONY" model="ILCE-5000">
  3981. +       <ID make="Sony" model="ILCE-5000">Sony ILCE-5000</ID>
  3982.         <CFA width="2" height="2">
  3983.             <Color x="0" y="0">RED</Color>
  3984.             <Color x="1" y="0">GREEN</Color>
  3985. @@ -5753,6 +6391,7 @@
  3986.         <Sensor black="512" white="16300"/>
  3987.     </Camera>
  3988.     <Camera make="SONY" model="ILCE-5100">
  3989. +       <ID make="Sony" model="ILCE-5100">Sony ILCE-5100</ID>
  3990.         <CFA width="2" height="2">
  3991.             <Color x="0" y="0">RED</Color>
  3992.             <Color x="1" y="0">GREEN</Color>
  3993. @@ -5763,6 +6402,7 @@
  3994.         <Sensor black="512" white="16300"/>
  3995.     </Camera>
  3996.     <Camera make="SONY" model="ILCE-6000">
  3997. +       <ID make="Sony" model="ILCE-6000">Sony ILCE-6000</ID>
  3998.         <CFA width="2" height="2">
  3999.             <Color x="0" y="0">RED</Color>
  4000.             <Color x="1" y="0">GREEN</Color>
  4001. @@ -5773,6 +6413,7 @@
  4002.         <Sensor black="512" white="16300"/>
  4003.     </Camera>
  4004.     <Camera make="SONY" model="ILCE-7">
  4005. +       <ID make="Sony" model="ILCE-7">Sony ILCE-7</ID>
  4006.         <CFA width="2" height="2">
  4007.             <Color x="0" y="0">RED</Color>
  4008.             <Color x="1" y="0">GREEN</Color>
  4009. @@ -5783,6 +6424,7 @@
  4010.         <Sensor black="512" white="16300"/>
  4011.     </Camera>
  4012.     <Camera make="SONY" model="ILCE-7M2">
  4013. +       <ID make="Sony" model="ILCE-7M2">Sony ILCE-7M2</ID>
  4014.         <CFA width="2" height="2">
  4015.             <Color x="0" y="0">RED</Color>
  4016.             <Color x="1" y="0">GREEN</Color>
  4017. @@ -5793,6 +6435,7 @@
  4018.         <Sensor black="512" white="16300"/>
  4019.     </Camera>
  4020.     <Camera make="SONY" model="ILCE-7R">
  4021. +       <ID make="Sony" model="ILCE-7R">Sony ILCE-7R</ID>
  4022.         <CFA width="2" height="2">
  4023.             <Color x="0" y="0">RED</Color>
  4024.             <Color x="1" y="0">GREEN</Color>
  4025. @@ -5803,6 +6446,7 @@
  4026.         <Sensor black="512" white="16300"/>
  4027.     </Camera>
  4028.     <Camera make="SONY" model="ILCE-7S">
  4029. +       <ID make="Sony" model="ILCE-7S">Sony ILCE-7S</ID>
  4030.         <CFA width="2" height="2">
  4031.             <Color x="0" y="0">RED</Color>
  4032.             <Color x="1" y="0">GREEN</Color>
  4033. @@ -5813,6 +6457,7 @@
  4034.         <Sensor black="512" white="16300"/>
  4035.     </Camera>
  4036.     <Camera make="SONY" model="DSC-RX1">
  4037. +       <ID make="Sony" model="DSC-RX1">Sony DSC-RX1</ID>
  4038.         <CFA width="2" height="2">
  4039.             <Color x="0" y="0">RED</Color>
  4040.             <Color x="1" y="0">GREEN</Color>
  4041. @@ -5823,6 +6468,7 @@
  4042.         <Sensor black="520" white="16628"/>
  4043.     </Camera>
  4044.     <Camera make="SONY" model="SLT-A33">
  4045. +       <ID make="Sony" model="SLT-A33">Sony SLT-A33</ID>
  4046.         <CFA width="2" height="2">
  4047.             <Color x="0" y="0">RED</Color>
  4048.             <Color x="1" y="0">GREEN</Color>
  4049. @@ -5833,6 +6479,7 @@
  4050.         <Sensor black="520" white="16596"/>
  4051.     </Camera>
  4052.     <Camera make="SONY" model="SLT-A35">
  4053. +       <ID make="Sony" model="SLT-A35">Sony SLT-A35</ID>
  4054.         <CFA width="2" height="2">
  4055.             <Color x="0" y="0">RED</Color>
  4056.             <Color x="1" y="0">GREEN</Color>
  4057. @@ -5843,6 +6490,7 @@
  4058.         <Sensor black="545" white="16596"/>
  4059.     </Camera>
  4060.     <Camera make="SONY" model="SLT-A37">
  4061. +       <ID make="Sony" model="SLT-A37">Sony SLT-A37</ID>
  4062.         <CFA width="2" height="2">
  4063.             <Color x="0" y="0">RED</Color>
  4064.             <Color x="1" y="0">GREEN</Color>
  4065. @@ -5853,6 +6501,7 @@
  4066.         <Sensor black="520" white="16500"/>
  4067.     </Camera>
  4068.     <Camera make="SONY" model="SLT-A55">
  4069. +       <ID make="Sony" model="SLT-A55">Sony SLT-A55</ID>
  4070.         <CFA width="2" height="2">
  4071.             <Color x="0" y="0">RED</Color>
  4072.             <Color x="1" y="0">GREEN</Color>
  4073. @@ -5862,10 +6511,11 @@
  4074.         <Crop x="0" y="0" width="0" height="0"/>
  4075.         <Sensor black="520" white="16596"/>
  4076.         <Aliases>
  4077. -           <Alias>SLT-A55V</Alias>
  4078. +           <Alias id="SLT-A55">SLT-A55V</Alias>
  4079.         </Aliases>
  4080.     </Camera>
  4081.     <Camera make="SONY" model="SLT-A57">
  4082. +       <ID make="Sony" model="SLT-A57">Sony SLT-A57</ID>
  4083.         <CFA width="2" height="2">
  4084.             <Color x="0" y="0">RED</Color>
  4085.             <Color x="1" y="0">GREEN</Color>
  4086. @@ -5876,6 +6526,7 @@
  4087.         <Sensor black="512" white="16596"/>
  4088.     </Camera>
  4089.     <Camera make="SONY" model="SLT-A58">
  4090. +       <ID make="Sony" model="SLT-A58">Sony SLT-A58</ID>
  4091.         <CFA width="2" height="2">
  4092.             <Color x="0" y="0">RED</Color>
  4093.             <Color x="1" y="0">GREEN</Color>
  4094. @@ -5886,6 +6537,7 @@
  4095.         <Sensor black="520" white="16596"/>
  4096.     </Camera>
  4097.     <Camera make="SONY" model="SLT-A65">
  4098. +       <ID make="Sony" model="SLT-A65">Sony SLT-A65</ID>
  4099.         <CFA width="2" height="2">
  4100.             <Color x="0" y="0">RED</Color>
  4101.             <Color x="1" y="0">GREEN</Color>
  4102. @@ -5895,10 +6547,11 @@
  4103.         <Crop x="0" y="0" width="-30" height="0"/>
  4104.         <Sensor black="520" white="16596"/>
  4105.         <Aliases>
  4106. -           <Alias>SLT-A65V</Alias>
  4107. +           <Alias id="SLT-A65">SLT-A65V</Alias>
  4108.         </Aliases>
  4109.     </Camera>
  4110.     <Camera make="SONY" model="SLT-A77">
  4111. +       <ID make="Sony" model="SLT-A77">Sony SLT-A77</ID>
  4112.         <CFA width="2" height="2">
  4113.             <Color x="0" y="0">RED</Color>
  4114.             <Color x="1" y="0">GREEN</Color>
  4115. @@ -5908,10 +6561,11 @@
  4116.         <Crop x="0" y="0" width="-28" height="0"/>
  4117.         <Sensor black="520" white="16596"/>
  4118.         <Aliases>
  4119. -           <Alias>SLT-A77V</Alias>
  4120. +           <Alias id="SLT-A77">SLT-A77V</Alias>
  4121.         </Aliases>
  4122.     </Camera>
  4123.     <Camera make="SONY" model="ILCA-77M2">
  4124. +       <ID make="Sony" model="ILCA-77M2">Sony ILCA-77M2</ID>
  4125.         <CFA width="2" height="2">
  4126.             <Color x="0" y="0">RED</Color>
  4127.             <Color x="1" y="0">GREEN</Color>
  4128. @@ -5922,6 +6576,7 @@
  4129.         <Sensor black="512" white="16300"/>
  4130.     </Camera>
  4131.     <Camera make="SONY" model="SLT-A99">
  4132. +       <ID make="Sony" model="SLT-A99">Sony SLT-A99</ID>
  4133.         <CFA width="2" height="2">
  4134.             <Color x="0" y="0">RED</Color>
  4135.             <Color x="1" y="0">GREEN</Color>
  4136. @@ -5931,10 +6586,11 @@
  4137.         <Crop x="0" y="0" width="-28" height="0"/>
  4138.         <Sensor black="520" white="16596"/>
  4139.         <Aliases>
  4140. -           <Alias>SLT-A99V</Alias>
  4141. +           <Alias id="SLT-A99">SLT-A99V</Alias>
  4142.         </Aliases>
  4143.     </Camera>
  4144.     <Camera make="Sinar Photography AG" model="Sinar Hy6/ Sinarback eXact" mode="dng">
  4145. +       <ID make="Sinar" model="Hy6">Sinar Hy6</ID>
  4146.         <CFA width="2" height="2">
  4147.             <Color x="0" y="0">RED</Color>
  4148.             <Color x="1" y="0">GREEN</Color>
  4149. @@ -5948,6 +6604,7 @@
  4150.         </Hints>
  4151.     </Camera>
  4152.     <Camera make="FUJIFILM" model="FinePix S6000fd">
  4153. +       <ID make="Fujifilm" model="FinePix S6000fd">Fujifilm FinePix S6000fd</ID>
  4154.         <CFA2 width="2" height="2">
  4155.             <ColorRow y="0">GB</ColorRow>
  4156.             <ColorRow y="1">RG</ColorRow>
  4157. @@ -5958,6 +6615,7 @@
  4158.         </Hints>
  4159.     </Camera>
  4160.     <Camera make="FUJIFILM" model="FinePix S200EXR">
  4161. +       <ID make="Fujifilm" model="FinePix S200EXR">Fujifilm FinePix S200EXR</ID>
  4162.         <CFA width="2" height="2">
  4163.             <Color x="0" y="0">RED</Color>
  4164.             <Color x="1" y="0">GREEN</Color>
  4165. @@ -5968,6 +6626,7 @@
  4166.         <Sensor black="519" white="16250"/>
  4167.     </Camera>
  4168.     <Camera make="FUJIFILM" model="FinePix F600EXR">
  4169. +       <ID make="Fujifilm" model="FinePix F600EXR">Fujifilm FinePix F600EXR</ID>
  4170.         <CFA width="2" height="2">
  4171.             <Color x="0" y="0">RED</Color>
  4172.             <Color x="1" y="0">GREEN</Color>
  4173. @@ -5978,6 +6637,7 @@
  4174.         <Sensor black="256" white="3900"/>
  4175.     </Camera>
  4176.     <Camera make="FUJIFILM" model="FinePix F700">
  4177. +       <ID make="Fujifilm" model="FinePix F700">Fujifilm FinePix F700</ID>
  4178.         <CFA2 width="2" height="2">
  4179.             <ColorRow y="0">GB</ColorRow>
  4180.             <ColorRow y="1">RG</ColorRow>
  4181. @@ -5990,6 +6650,7 @@
  4182.         </Hints>
  4183.     </Camera>
  4184.     <Camera make="FUJIFILM" model="FinePix F900EXR">
  4185. +       <ID make="Fujifilm" model="FinePix F900EXR">Fujifilm FinePix F900EXR</ID>
  4186.         <CFA width="2" height="2">
  4187.             <Color x="0" y="0">BLUE</Color>
  4188.             <Color x="1" y="0">GREEN</Color>
  4189. @@ -6000,6 +6661,7 @@
  4190.         <Sensor black="256" white="3900"/>
  4191.     </Camera>
  4192.     <Camera make="FUJIFILM" model="FinePix E550">
  4193. +       <ID make="Fujifilm" model="FinePix E550">Fujifilm FinePix E550</ID>
  4194.         <CFA2 width="2" height="2">
  4195.             <ColorRow y="0">GB</ColorRow>
  4196.             <ColorRow y="1">RG</ColorRow>
  4197. @@ -6011,6 +6673,7 @@
  4198.         </Hints>
  4199.     </Camera>
  4200.     <Camera make="FUJIFILM" model="IS-1">
  4201. +       <ID make="Fujifilm" model="IS-1">Fujifilm IS-1</ID>
  4202.         <CFA2 width="2" height="2">
  4203.             <ColorRow y="0">GB</ColorRow>
  4204.             <ColorRow y="1">RG</ColorRow>
  4205. @@ -6022,6 +6685,7 @@
  4206.         </Hints>
  4207.     </Camera>
  4208.     <Camera make="FUJIFILM" model="FinePix S3Pro">
  4209. +       <ID make="Fujifilm" model="FinePix S3Pro">Fujifilm FinePix S3Pro</ID>
  4210.         <CFA2 width="2" height="2">
  4211.             <ColorRow y="0">GB</ColorRow>
  4212.             <ColorRow y="1">RG</ColorRow>
  4213. @@ -6033,6 +6697,7 @@
  4214.         </Hints>
  4215.     </Camera>
  4216.     <Camera make="FUJIFILM" model="FinePix S5Pro">
  4217. +       <ID make="Fujifilm" model="FinePix S5Pro">Fujifilm FinePix S5Pro</ID>
  4218.         <CFA2 width="2" height="2">
  4219.             <ColorRow y="0">GB</ColorRow>
  4220.             <ColorRow y="1">RG</ColorRow>
  4221. @@ -6044,6 +6709,7 @@
  4222.         </Hints>
  4223.     </Camera>
  4224.     <Camera make="FUJIFILM" model="FinePix S5600">
  4225. +       <ID make="Fujifilm" model="FinePix S5600">Fujifilm FinePix S5600</ID>
  4226.         <CFA2 width="2" height="2">
  4227.             <ColorRow y="0">GB</ColorRow>
  4228.             <ColorRow y="1">RG</ColorRow>
  4229. @@ -6055,6 +6721,7 @@
  4230.         </Hints>
  4231.     </Camera>
  4232.     <Camera make="FUJIFILM" model="FinePix E900">
  4233. +       <ID make="Fujifilm" model="FinePix E900">Fujifilm FinePix E900</ID>
  4234.         <CFA2 width="2" height="2">
  4235.             <ColorRow y="0">GB</ColorRow>
  4236.             <ColorRow y="1">RG</ColorRow>
  4237. @@ -6066,6 +6733,7 @@
  4238.         </Hints>
  4239.     </Camera>
  4240.     <Camera make="FUJIFILM" model="FinePixS2Pro">
  4241. +       <ID make="Fujifilm" model="FinePix S2Pro">Fujifilm FinePix S2Pro</ID>
  4242.         <CFA2 width="2" height="2">
  4243.             <ColorRow y="0">GB</ColorRow>
  4244.             <ColorRow y="1">RG</ColorRow>
  4245. @@ -6077,6 +6745,7 @@
  4246.         </Hints>
  4247.     </Camera>
  4248.     <Camera make="FUJIFILM" model="FinePix S5000">
  4249. +       <ID make="Fujifilm" model="FinePix S5000">Fujifilm FinePix S5000</ID>
  4250.         <CFA2 width="2" height="2">
  4251.             <ColorRow y="0">GB</ColorRow>
  4252.             <ColorRow y="1">RG</ColorRow>
  4253. @@ -6088,6 +6757,7 @@
  4254.         </Hints>
  4255.     </Camera>
  4256.     <Camera make="FUJIFILM" model="FinePix S5200">
  4257. +       <ID make="Fujifilm" model="FinePix S5200">Fujifilm FinePix S5200</ID>
  4258.         <CFA2 width="2" height="2">
  4259.             <ColorRow y="0">GB</ColorRow>
  4260.             <ColorRow y="1">RG</ColorRow>
  4261. @@ -6099,6 +6769,7 @@
  4262.         </Hints>
  4263.     </Camera>
  4264.     <Camera make="FUJIFILM" model="FinePix S5500">
  4265. +       <ID make="Fujifilm" model="FinePix S5500">Fujifilm FinePix S5500</ID>
  4266.         <CFA2 width="2" height="2">
  4267.             <ColorRow y="0">RG</ColorRow>
  4268.             <ColorRow y="1">GB</ColorRow>
  4269. @@ -6107,6 +6778,7 @@
  4270.         <Sensor black="0" white="15872"/>
  4271.     </Camera>
  4272.     <Camera make="FUJIFILM" model="FinePix S6500fd">
  4273. +       <ID make="Fujifilm" model="FinePix S6500fd">Fujifilm FinePix S6500fd</ID>
  4274.         <CFA2 width="2" height="2">
  4275.             <ColorRow y="0">GB</ColorRow>
  4276.             <ColorRow y="1">RG</ColorRow>
  4277. @@ -6118,6 +6790,7 @@
  4278.         </Hints>
  4279.     </Camera>
  4280.     <Camera make="FUJIFILM" model="FinePix S9500">
  4281. +       <ID make="Fujifilm" model="FinePix S9500">Fujifilm FinePix S9500</ID>
  4282.         <CFA2 width="2" height="2">
  4283.             <ColorRow y="0">GB</ColorRow>
  4284.             <ColorRow y="1">RG</ColorRow>
  4285. @@ -6132,6 +6805,7 @@
  4286.         </Aliases>
  4287.     </Camera>
  4288.     <Camera make="FUJIFILM" model="FinePix S9600">
  4289. +       <ID make="Fujifilm" model="FinePix S9600">Fujifilm FinePix S9600</ID>
  4290.         <CFA2 width="2" height="2">
  4291.             <ColorRow y="0">GB</ColorRow>
  4292.             <ColorRow y="1">RG</ColorRow>
  4293. @@ -6143,6 +6817,7 @@
  4294.         </Hints>
  4295.     </Camera>
  4296.     <Camera make="FUJIFILM" model="FinePix S9600fd">
  4297. +       <ID make="Fujifilm" model="FinePix S9600fd">Fujifilm FinePix S9600fd</ID>
  4298.         <CFA2 width="2" height="2">
  4299.             <ColorRow y="0">GB</ColorRow>
  4300.             <ColorRow y="1">RG</ColorRow>
  4301. @@ -6154,6 +6829,7 @@
  4302.         </Hints>
  4303.     </Camera>
  4304.     <Camera make="FUJIFILM" model="FinePix HS10 HS11">
  4305. +       <ID make="Fujifilm" model="FinePix HS10 HS11">Fujifilm FinePix HS10 HS11</ID>
  4306.         <CFA width="2" height="2">
  4307.             <Color x="0" y="0">BLUE</Color>
  4308.             <Color x="1" y="0">GREEN</Color>
  4309. @@ -6167,6 +6843,7 @@
  4310.         </Hints>
  4311.     </Camera>
  4312.     <Camera make="FUJIFILM" model="FinePix HS20EXR">
  4313. +       <ID make="Fujifilm" model="FinePix HS20EXR">Fujifilm FinePix HS20EXR</ID>
  4314.         <CFA width="2" height="2">
  4315.             <Color x="0" y="0">RED</Color>
  4316.             <Color x="1" y="0">GREEN</Color>
  4317. @@ -6177,6 +6854,7 @@
  4318.         <Sensor black="256" white="3900"/>
  4319.     </Camera>
  4320.     <Camera make="FUJIFILM" model="FinePix HS30EXR">
  4321. +       <ID make="Fujifilm" model="FinePix HS30EXR">Fujifilm FinePix HS30EXR</ID>
  4322.         <CFA width="2" height="2">
  4323.             <Color x="0" y="0">RED</Color>
  4324.             <Color x="1" y="0">GREEN</Color>
  4325. @@ -6187,6 +6865,7 @@
  4326.         <Sensor black="258" white="3900"/>
  4327.     </Camera>
  4328.     <Camera make="FUJIFILM" model="FinePix HS50EXR">
  4329. +       <ID make="Fujifilm" model="FinePix HS50EXR">Fujifilm FinePix HS50EXR</ID>
  4330.         <CFA width="2" height="2">
  4331.             <Color x="0" y="0">BLUE</Color>
  4332.             <Color x="1" y="0">GREEN</Color>
  4333. @@ -6197,6 +6876,7 @@
  4334.         <Sensor black="256" white="3900"/>
  4335.     </Camera>
  4336.     <Camera make="FUJIFILM" model="FinePix X100">
  4337. +       <ID make="Fujifilm" model="FinePix X100">Fujifilm FinePix X100</ID>
  4338.         <CFA width="2" height="2">
  4339.             <Color x="0" y="0">BLUE</Color>
  4340.             <Color x="1" y="0">GREEN</Color>
  4341. @@ -6207,6 +6887,7 @@
  4342.         <Sensor black="254" white="4000"/>
  4343.     </Camera>
  4344.     <Camera make="FUJIFILM" model="X10">
  4345. +       <ID make="Fujifilm" model="FinePix X10">Fujifilm FinePix X10</ID>
  4346.         <CFA width="2" height="2">
  4347.             <Color x="0" y="0">BLUE</Color>
  4348.             <Color x="1" y="0">GREEN</Color>
  4349. @@ -6217,6 +6898,7 @@
  4350.         <Sensor black="256" white="4000"/>
  4351.     </Camera>
  4352.     <Camera make="FUJIFILM" model="X-S1">
  4353. +       <ID make="Fujifilm" model="X-S1">Fujifilm X-S1</ID>
  4354.         <CFA width="2" height="2">
  4355.             <Color x="0" y="0">BLUE</Color>
  4356.             <Color x="1" y="0">GREEN</Color>
  4357. @@ -6227,6 +6909,7 @@
  4358.         <Sensor black="260" white="4000"/>
  4359.     </Camera>
  4360.     <Camera make="FUJIFILM" model="X-Pro1">
  4361. +       <ID make="Fujifilm" model="X-Pro1">Fujifilm X-Pro1</ID>
  4362.         <CFA2 width="6" height="6">
  4363.             <ColorRow y="0">GGRGGB</ColorRow>
  4364.             <ColorRow y="1">GGBGGR</ColorRow>
  4365. @@ -6239,6 +6922,7 @@
  4366.         <Sensor black="256" white="4094"/>
  4367.     </Camera>
  4368.     <Camera make="FUJIFILM" model="XF1">
  4369. +       <ID make="Fujifilm" model="XF1">Fujifilm XF1</ID>
  4370.         <CFA width="2" height="2">
  4371.             <Color x="0" y="0">BLUE</Color>
  4372.             <Color x="1" y="0">GREEN</Color>
  4373. @@ -6249,6 +6933,7 @@
  4374.         <Sensor black="257" white="4000"/>
  4375.     </Camera>
  4376.     <Camera make="FUJIFILM" model="X-E1">
  4377. +       <ID make="Fujifilm" model="X-E1">Fujifilm X-E1</ID>
  4378.         <CFA2 width="6" height="6">
  4379.             <ColorRow y="0">GGRGGB</ColorRow>
  4380.             <ColorRow y="1">GGBGGR</ColorRow>
  4381. @@ -6261,6 +6946,7 @@
  4382.         <Sensor black="255" white="4094"/>
  4383.     </Camera>
  4384.     <Camera make="FUJIFILM" model="X20">
  4385. +       <ID make="Fujifilm" model="X20">Fujifilm X20</ID>
  4386.         <CFA2 width="6" height="6">
  4387.             <ColorRow y="0">GBGGRG</ColorRow>
  4388.             <ColorRow y="1">RGRBGB</ColorRow>
  4389. @@ -6273,6 +6959,7 @@
  4390.         <Sensor black="257" white="4094"/>
  4391.     </Camera>
  4392.     <Camera make="FUJIFILM" model="X30">
  4393. +       <ID make="Fujifilm" model="X30">Fujifilm X30</ID>
  4394.         <CFA2 width="6" height="6">
  4395.             <ColorRow y="0">GBGGRG</ColorRow>
  4396.             <ColorRow y="1">RGRBGB</ColorRow>
  4397. @@ -6285,6 +6972,7 @@
  4398.         <Sensor black="257" white="4094"/>
  4399.     </Camera>
  4400.     <Camera make="FUJIFILM" model="X100S">
  4401. +       <ID make="Fujifilm" model="X100S">Fujifilm X100S</ID>
  4402.         <CFA2 width="6" height="6">
  4403.             <ColorRow y="0">RBGBRG</ColorRow>
  4404.             <ColorRow y="1">GGRGGB</ColorRow>
  4405. @@ -6297,6 +6985,7 @@
  4406.         <Sensor black="1024" white="16383"/>
  4407.     </Camera>
  4408.     <Camera make="FUJIFILM" model="X100T">
  4409. +       <ID make="Fujifilm" model="X100T">Fujifilm X100T</ID>
  4410.         <CFA2 width="6" height="6">
  4411.             <ColorRow y="0">RBGBRG</ColorRow>
  4412.             <ColorRow y="1">GGRGGB</ColorRow>
  4413. @@ -6309,6 +6998,7 @@
  4414.         <Sensor black="1024" white="16383"/>
  4415.     </Camera>
  4416.     <Camera make="FUJIFILM" model="X-M1">
  4417. +       <ID make="Fujifilm" model="X-M1">Fujifilm X-M1</ID>
  4418.         <CFA2 width="6" height="6">
  4419.             <ColorRow y="0">GGRGGB</ColorRow>
  4420.             <ColorRow y="1">GGBGGR</ColorRow>
  4421. @@ -6321,6 +7011,7 @@
  4422.         <Sensor black="256" white="4094"/>
  4423.     </Camera>
  4424.     <Camera make="FUJIFILM" model="X-A1">
  4425. +       <ID make="Fujifilm" model="X-A1">Fujifilm X-A1</ID>
  4426.         <CFA width="2" height="2">
  4427.             <Color x="0" y="0">RED</Color>
  4428.             <Color x="1" y="0">GREEN</Color>
  4429. @@ -6331,6 +7022,7 @@
  4430.         <Sensor black="256" white="4094"/>
  4431.     </Camera>
  4432.     <Camera make="FUJIFILM" model="XQ1">
  4433. +       <ID make="Fujifilm" model="XQ1">Fujifilm XQ1</ID>
  4434.         <CFA2 width="6" height="6">
  4435.             <ColorRow y="0">GBGGRG</ColorRow>
  4436.             <ColorRow y="1">RGRBGB</ColorRow>
  4437. @@ -6343,6 +7035,7 @@
  4438.         <Sensor black="257" white="4094"/>
  4439.     </Camera>
  4440.     <Camera make="FUJIFILM" model="X-E2">
  4441. +       <ID make="Fujifilm" model="X-E2">Fujifilm X-E2</ID>
  4442.         <CFA2 width="6" height="6">
  4443.             <ColorRow y="0">RBGBRG</ColorRow>
  4444.             <ColorRow y="1">GGRGGB</ColorRow>
  4445. @@ -6355,6 +7048,7 @@
  4446.         <Sensor black="1024" white="16383"/>
  4447.     </Camera>
  4448.     <Camera make="FUJIFILM" model="X-T1">
  4449. +       <ID make="Fujifilm" model="X-T1">Fujifilm X-T1</ID>
  4450.         <CFA2 width="6" height="6">
  4451.             <ColorRow y="0">RBGBRG</ColorRow>
  4452.             <ColorRow y="1">GGRGGB</ColorRow>
  4453. @@ -6366,7 +7060,21 @@
  4454.         <Crop x="4" y="0" width="-52" height="0"/>
  4455.         <Sensor black="1024" white="16383"/>
  4456.     </Camera>
  4457. -   <Camera make="MINOLTA" model="DYNAX 5D">
  4458. +   <Camera make="FUJIFILM" model="X-T10">
  4459. +       <ID make="Fujifilm" model="X-T10">Fujifilm X-T10</ID>
  4460. +       <CFA2 width="6" height="6">
  4461. +           <ColorRow y="0">RBGBRG</ColorRow>
  4462. +           <ColorRow y="1">GGRGGB</ColorRow>
  4463. +           <ColorRow y="2">GGBGGR</ColorRow>
  4464. +           <ColorRow y="3">BRGRBG</ColorRow>
  4465. +           <ColorRow y="4">GGBGGR</ColorRow>
  4466. +           <ColorRow y="5">GGRGGB</ColorRow>
  4467. +       </CFA2>
  4468. +       <Crop x="4" y="0" width="-52" height="0"/>
  4469. +       <Sensor black="1024" white="16383"/>
  4470. +   </Camera>
  4471. +   <Camera make="KONICA MINOLTA" model="DYNAX 5D">
  4472. +       <ID make="Minolta" model="Dynax 5D">Konica Minolta Maxxum 5D</ID>
  4473.         <CFA width="2" height="2">
  4474.             <Color x="0" y="0">RED</Color>
  4475.             <Color x="1" y="0">GREEN</Color>
  4476. @@ -6375,8 +7083,13 @@
  4477.         </CFA>
  4478.         <Crop x="0" y="0" width="0" height="0"/>
  4479.         <Sensor black="0" white="4095"/>
  4480. +       <Aliases>
  4481. +           <Alias id="Maxxum 5D">MAXXUM 5D</Alias>
  4482. +           <Alias id="Alpha 5D">ALPHA 5D</Alias>
  4483. +       </Aliases>
  4484.     </Camera>
  4485. -  <Camera make="MINOLTA" model="DYNAX 7D">
  4486. +   <Camera make="KONICA MINOLTA" model="DYNAX 7D">
  4487. +       <ID make="Minolta" model="Dynax 7D">Konica Minolta Maxxum 7D</ID>
  4488.         <CFA width="2" height="2">
  4489.             <Color x="0" y="0">RED</Color>
  4490.             <Color x="1" y="0">GREEN</Color>
  4491. @@ -6385,8 +7098,13 @@
  4492.         </CFA>
  4493.         <Crop x="0" y="0" width="0" height="0"/>
  4494.         <Sensor black="0" white="4095"/>
  4495. +       <Aliases>
  4496. +           <Alias id="Maxxum 7D">MAXXUM 7D</Alias>
  4497. +           <Alias id="Alpha 7D">ALPHA 7D</Alias>
  4498. +       </Aliases>
  4499.     </Camera>
  4500. -   <Camera make="MINOLTA" model="DIMAGE A1">
  4501. +   <Camera make="Minolta Co., Ltd." model="DiMAGE A1">
  4502. +       <ID make="Minolta" model="DiMAGE A1">Minolta DiMAGE A1</ID>
  4503.         <CFA width="2" height="2">
  4504.             <Color x="0" y="0">RED</Color>
  4505.             <Color x="1" y="0">GREEN</Color>
  4506. @@ -6396,7 +7114,8 @@
  4507.         <Crop x="0" y="0" width="0" height="0"/>
  4508.         <Sensor black="0" white="3965"/>
  4509.     </Camera>
  4510. -   <Camera make="MINOLTA" model="DIMAGE A2">
  4511. +   <Camera make="Konica Minolta Camera, Inc." model="DiMAGE A2">
  4512. +       <ID make="Minolta" model="DiMAGE A2">Konica Minolta DiMAGE A2</ID>
  4513.         <CFA width="2" height="2">
  4514.             <Color x="0" y="0">RED</Color>
  4515.             <Color x="1" y="0">GREEN</Color>
  4516. @@ -6406,7 +7125,8 @@
  4517.         <Crop x="0" y="0" width="0" height="0"/>
  4518.         <Sensor black="0" white="3965"/>
  4519.     </Camera>
  4520. -   <Camera make="MINOLTA" model="DIMAGE A200">
  4521. +   <Camera make="KONICA MINOLTA" model="DiMAGE A200">
  4522. +       <ID make="Minolta" model="DiMAGE A200">Konica Minolta DiMAGE A200</ID>
  4523.         <CFA width="2" height="2">
  4524.             <Color x="0" y="0">GREEN</Color>
  4525.             <Color x="1" y="0">BLUE</Color>
  4526. @@ -6415,8 +7135,12 @@
  4527.         </CFA>
  4528.         <Crop x="0" y="0" width="0" height="0"/>
  4529.         <Sensor black="0" white="3965"/>
  4530. +       <Hints>
  4531. +           <Hint name="swapped_wb" value=""/>
  4532. +       </Hints>
  4533.     </Camera>
  4534. -   <Camera make="MINOLTA" model="DIMAGE 5">
  4535. +   <Camera make="Minolta Co., Ltd." model="DiMAGE 5">
  4536. +       <ID make="Minolta" model="DiMAGE 5">Minolta DiMAGE 5</ID>
  4537.         <CFA width="2" height="2">
  4538.             <Color x="0" y="0">RED</Color>
  4539.             <Color x="1" y="0">GREEN</Color>
  4540. @@ -6426,7 +7150,8 @@
  4541.         <Crop x="0" y="0" width="0" height="0"/>
  4542.         <Sensor black="0" white="3965"/>
  4543.     </Camera>
  4544. -   <Camera make="MINOLTA" model="DIMAGE 7">
  4545. +   <Camera make="Minolta Co., Ltd." model="DiMAGE 7">
  4546. +       <ID make="Minolta" model="DiMAGE 7">Minolta DiMAGE 7</ID>
  4547.         <CFA width="2" height="2">
  4548.             <Color x="0" y="0">RED</Color>
  4549.             <Color x="1" y="0">GREEN</Color>
  4550. @@ -6436,7 +7161,8 @@
  4551.         <Crop x="0" y="0" width="0" height="0"/>
  4552.         <Sensor black="0" white="3965"/>
  4553.     </Camera>
  4554. -   <Camera make="MINOLTA" model="DIMAGE 7I">
  4555. +   <Camera make="Minolta Co., Ltd." model="DiMAGE 7i">
  4556. +       <ID make="Minolta" model="DiMAGE 7i">Minolta DiMAGE 7i</ID>
  4557.         <CFA width="2" height="2">
  4558.             <Color x="0" y="0">RED</Color>
  4559.             <Color x="1" y="0">GREEN</Color>
  4560. @@ -6446,7 +7172,8 @@
  4561.         <Crop x="0" y="0" width="0" height="0"/>
  4562.         <Sensor black="0" white="3965"/>
  4563.     </Camera>
  4564. -   <Camera make="MINOLTA" model="DIMAGE 7HI">
  4565. +   <Camera make="Minolta Co., Ltd." model="DiMAGE 7Hi">
  4566. +       <ID make="Minolta" model="DiMAGE 7Hi">Minolta DiMAGE 7Hi</ID>
  4567.         <CFA width="2" height="2">
  4568.             <Color x="0" y="0">RED</Color>
  4569.             <Color x="1" y="0">GREEN</Color>
  4570. @@ -6457,6 +7184,7 @@
  4571.         <Sensor black="0" white="3965"/>
  4572.     </Camera>
  4573.     <Camera make="SONY" model="DSC-R1">
  4574. +       <ID make="Sony" model="DSC-R1">Sony DSC-R1</ID>
  4575.         <CFA width="2" height="2">
  4576.             <Color x="0" y="0">GREEN</Color>
  4577.             <Color x="1" y="0">RED</Color>
  4578. @@ -6467,6 +7195,7 @@
  4579.         <Sensor black="511" white="16383"/>
  4580.     </Camera>
  4581.     <Camera make="Mamiya-OP Co.,Ltd." model="MAMIYA ZD">
  4582. +       <ID make="Mamiya" model="ZD">Mamiya ZD</ID>
  4583.         <CFA width="2" height="2">
  4584.             <Color x="0" y="0">RED</Color>
  4585.             <Color x="1" y="0">GREEN</Color>
  4586. @@ -6480,6 +7209,7 @@
  4587.         </Hints>
  4588.     </Camera>
  4589.     <Camera make="Creo/Leaf" model="Leaf Aptus 22(LF3779     )/Hasselblad H1">
  4590. +       <ID make="Leaf" model="Aptus 22">Leaf Aptus 22</ID>
  4591.         <CFA width="2" height="2">
  4592.             <Color x="0" y="0">RED</Color>
  4593.             <Color x="1" y="0">GREEN</Color>
  4594. @@ -6490,6 +7220,7 @@
  4595.         <Sensor black="0" white="16191"/>
  4596.     </Camera>
  4597.     <Camera make="Leaf" model="Leaf Aptus 75(LI400146   )/Large Format" supported="no">
  4598. +       <ID make="Leaf" model="Aptus 75">Leaf Aptus 75</ID>
  4599.         <CFA width="2" height="2">
  4600.             <Color x="0" y="0">RED</Color>
  4601.             <Color x="1" y="0">GREEN</Color>
  4602. @@ -6499,37 +7230,41 @@
  4603.         <Crop x="0" y="0" width="0" height="0"/>
  4604.         <Sensor black="0" white="16191"/>
  4605.     </Camera>
  4606. -   <Camera make="Leaf" model="Credo 40" supported="no">
  4607. +   <Camera make="Leaf" model="Credo 40">
  4608. +       <ID make="Leaf" model="Credo 40">Leaf Credo 40</ID>
  4609.         <CFA width="2" height="2">
  4610.             <Color x="0" y="0">RED</Color>
  4611.             <Color x="1" y="0">GREEN</Color>
  4612.             <Color x="0" y="1">GREEN</Color>
  4613.             <Color x="1" y="1">BLUE</Color>
  4614.         </CFA>
  4615. -       <Crop x="0" y="0" width="0" height="0"/>
  4616. -       <Sensor black="" white="65535"/>
  4617. +       <Crop x="36" y="6" width="-16" height="-46"/>
  4618. +       <Sensor black="0" white="16383"/>
  4619.     </Camera>
  4620. -   <Camera make="Leaf" model="Credo 60" supported="no">
  4621. +   <Camera make="Leaf" model="Credo 60">
  4622. +       <ID make="Leaf" model="Credo 60">Leaf Credo 60</ID>
  4623.         <CFA width="2" height="2">
  4624.             <Color x="0" y="0">RED</Color>
  4625.             <Color x="1" y="0">GREEN</Color>
  4626.             <Color x="0" y="1">GREEN</Color>
  4627.             <Color x="1" y="1">BLUE</Color>
  4628.         </CFA>
  4629. -       <Crop x="0" y="0" width="0" height="0"/>
  4630. -       <Sensor black="" white="65535"/>
  4631. +       <Crop x="36" y="6" width="-16" height="-46"/>
  4632. +       <Sensor black="0" white="16383"/>
  4633.     </Camera>
  4634. -   <Camera make="Leaf" model="Credo 80" supported="no">
  4635. +   <Camera make="Leaf" model="Credo 80">
  4636. +       <ID make="Leaf" model="Credo 80">Leaf Credo 80</ID>
  4637.         <CFA width="2" height="2">
  4638.             <Color x="0" y="0">RED</Color>
  4639.             <Color x="1" y="0">GREEN</Color>
  4640.             <Color x="0" y="1">GREEN</Color>
  4641.             <Color x="1" y="1">BLUE</Color>
  4642.         </CFA>
  4643. -       <Crop x="0" y="0" width="0" height="0"/>
  4644. -       <Sensor black="" white="65535"/>
  4645. +       <Crop x="36" y="8" width="-16" height="-48"/>
  4646. +       <Sensor black="0" white="16383"/>
  4647.     </Camera>
  4648.     <Camera make="Leaf" model="Leaf Aptus-II 5(LI300059   )/Mamiya 645 AFD">
  4649. +       <ID make="Leaf" model="Aptus-II 5">Leaf Aptus-II 5</ID>
  4650.         <CFA width="2" height="2">
  4651.             <Color x="0" y="0">GREEN</Color>
  4652.             <Color x="1" y="0">RED</Color>
  4653. @@ -6600,6 +7335,7 @@
  4654.         <Sensor black="0" white="3700"/>
  4655.     </Camera>
  4656.     <Camera make="EASTMAN KODAK COMPANY" model="KODAK P880 ZOOM DIGITAL CAMERA">
  4657. +       <ID make="Kodak" model="P880">Kodak P880</ID>
  4658.         <CFA width="2" height="2">
  4659.             <Color x="0" y="0">BLUE</Color>
  4660.             <Color x="1" y="0">GREEN</Color>
  4661. @@ -6610,6 +7346,7 @@
  4662.         <Sensor black="0" white="4095"/>
  4663.     </Camera>
  4664.     <Camera make="EASTMAN KODAK COMPANY" model="KODAK EASYSHARE Z1015 IS DIGITAL CAMERA">
  4665. +       <ID make="Kodak" model="Z1015 IS">Kodak Z1015 IS</ID>
  4666.         <CFA width="2" height="2">
  4667.             <Color x="0" y="0">BLUE</Color>
  4668.             <Color x="1" y="0">GREEN</Color>
  4669. @@ -6623,6 +7360,7 @@
  4670.         </Hints>
  4671.     </Camera>
  4672.     <Camera make="SEIKO EPSON CORP." model="R-D1">
  4673. +       <ID make="Epson" model="R-D1">Epson R-D1</ID>
  4674.         <CFA width="2" height="2">
  4675.             <Color x="0" y="0">RED</Color>
  4676.             <Color x="1" y="0">GREEN</Color>
  4677. @@ -6633,6 +7371,7 @@
  4678.         <Sensor black="63" white="4095"/>
  4679.     </Camera>
  4680.     <Camera make="Hasselblad" model="Hasselblad 500 mech.">
  4681. +       <ID make="Hasselblad" model="CFV">Hasselblad 16-Uncoated</ID>
  4682.         <CFA width="2" height="2">
  4683.             <Color x="0" y="0">RED</Color>
  4684.             <Color x="1" y="0">GREEN</Color>
  4685. @@ -6643,6 +7382,7 @@
  4686.         <Sensor black="" white="32767"/>
  4687.     </Camera>
  4688.     <Camera make="Hasselblad" model="Hasselblad H3D">
  4689. +       <ID make="Hasselblad" model="H3D">Hasselblad 39-Coated</ID>
  4690.         <CFA width="2" height="2">
  4691.             <Color x="0" y="0">RED</Color>
  4692.             <Color x="1" y="0">GREEN</Color>
  4693. @@ -6652,8 +7392,58 @@
  4694.         <Crop x="0" y="0" width="0" height="0"/>
  4695.         <Sensor black="0" white="31456"/>
  4696.     </Camera>
  4697. +   <Camera make="Hasselblad" model="Flash Sync">
  4698. +       <ID make="Hasselblad" model="CF132">Hasselblad 22-Uncoated</ID>
  4699. +       <CFA width="2" height="2">
  4700. +           <Color x="0" y="0">RED</Color>
  4701. +           <Color x="1" y="0">GREEN</Color>
  4702. +           <Color x="0" y="1">GREEN</Color>
  4703. +           <Color x="1" y="1">BLUE</Color>
  4704. +       </CFA>
  4705. +       <Crop x="0" y="0" width="0" height="0"/>
  4706. +       <Sensor black="0" white="62914"/>
  4707. +   </Camera>
  4708. +   <Camera make="RICOH IMAGING COMPANY, LTD." model="PENTAX 645Z" mode="dng">
  4709. +       <ID make="Pentax" model="645Z">PENTAX 645Z</ID>
  4710. +   </Camera>
  4711. +   <Camera make="PENTAX" model="PENTAX 645D" mode="dng">
  4712. +       <ID make="Pentax" model="645D">PENTAX 645D</ID>
  4713. +   </Camera>
  4714. +   <Camera make="PENTAX" model="PENTAX K-01" mode="dng">
  4715. +       <ID make="Pentax" model="K-01">PENTAX K-01</ID>
  4716. +   </Camera>
  4717. +   <Camera make="PENTAX" model="PENTAX K-30" mode="dng">
  4718. +       <ID make="Pentax" model="K-30">PENTAX K-30</ID>
  4719. +   </Camera>
  4720. +   <Camera make="PENTAX" model="PENTAX K-50" mode="dng">
  4721. +       <ID make="Pentax" model="K-50">PENTAX K-50</ID>
  4722. +   </Camera>
  4723. +   <Camera make="PENTAX" model="PENTAX K-500" mode="dng">
  4724. +       <ID make="Pentax" model="K-500">PENTAX K-500</ID>
  4725. +   </Camera>
  4726. +   <Camera make="PENTAX" model="PENTAX Q" mode="dng">
  4727. +       <ID make="Pentax" model="Q">PENTAX Q</ID>
  4728. +   </Camera>
  4729. +   <Camera make="PENTAX" model="PENTAX Q7" mode="dng">
  4730. +       <ID make="Pentax" model="Q7">PENTAX Q7</ID>
  4731. +   </Camera>
  4732. +   <Camera make="PENTAX" model="PENTAX Q10" mode="dng">
  4733. +       <ID make="Pentax" model="Q10">PENTAX Q10</ID>
  4734. +   </Camera>
  4735. +   <Camera make="PENTAX RICOH IMAGING" model="PENTAX MX-1" mode="dng">
  4736. +       <ID make="Pentax" model="MX-1">PENTAX MX-1</ID>
  4737. +   </Camera>
  4738. +   <Camera make="Leica Camera AG" model="M8 Digital Camera" mode="dng">
  4739. +       <ID make="Leica" model="M8">M8 Digital Camera</ID>
  4740. +   </Camera>
  4741. +   <Camera make="Canon" model="Canon PowerShot SX100 IS" mode="dng">
  4742. +       <ID make="Canon" model="PowerShot SX100 IS">Canon PowerShot SX100 IS</ID>
  4743. +   </Camera>
  4744. +   <Camera make="Canon" model="Canon PowerShot A3200 IS" mode="dng">
  4745. +       <ID make="Canon" model="PowerShot A3200 IS">Canon PowerShot A3200 IS</ID>
  4746. +   </Camera>
  4747.     <!-- CHDK Cameras -->
  4748. -   <Camera make="AVT" model="F-080C" supported="no" mode="chdk">
  4749. +   <Camera make="AVT" model="F-080C" mode="chdk">
  4750.         <CFA2 width="2" height="2">
  4751.             <ColorRow y="0">RG</ColorRow>
  4752.             <ColorRow y="1">GB</ColorRow>
  4753. @@ -6666,7 +7456,7 @@
  4754.             <Hint name="full_height" value="768"/>
  4755.         </Hints>
  4756.     </Camera>
  4757. -   <Camera make="AVT" model="F-145C" supported="no" mode="chdk">
  4758. +   <Camera make="AVT" model="F-145C" mode="chdk">
  4759.         <CFA2 width="2" height="2">
  4760.             <ColorRow y="0">RG</ColorRow>
  4761.             <ColorRow y="1">GB</ColorRow>
  4762. @@ -6679,7 +7469,7 @@
  4763.             <Hint name="full_height" value="1040"/>
  4764.         </Hints>
  4765.     </Camera>
  4766. -   <Camera make="AVT" model="F-201C" supported="no" mode="chdk">
  4767. +   <Camera make="AVT" model="F-201C" mode="chdk">
  4768.         <CFA2 width="2" height="2">
  4769.             <ColorRow y="0">RG</ColorRow>
  4770.             <ColorRow y="1">GB</ColorRow>
  4771. @@ -6692,7 +7482,7 @@
  4772.             <Hint name="full_height" value="1200"/>
  4773.         </Hints>
  4774.     </Camera>
  4775. -   <Camera make="AVT" model="F-510C" supported="no" mode="chdk-a">
  4776. +   <Camera make="AVT" model="F-510C" mode="chdk-a">
  4777.         <CFA2 width="2" height="2">
  4778.             <ColorRow y="0">RG</ColorRow>
  4779.             <ColorRow y="1">GB</ColorRow>
  4780. @@ -6705,7 +7495,7 @@
  4781.             <Hint name="full_height" value="1958"/>
  4782.         </Hints>
  4783.     </Camera>
  4784. -   <Camera make="AVT" model="F-510C" supported="no" mode="chdk-b">
  4785. +   <Camera make="AVT" model="F-510C" mode="chdk-b">
  4786.         <CFA2 width="2" height="2">
  4787.             <ColorRow y="0">RG</ColorRow>
  4788.             <ColorRow y="1">GB</ColorRow>
  4789. @@ -6719,7 +7509,7 @@
  4790.             <Hint name="offset" value="12"/>
  4791.         </Hints>
  4792.     </Camera>
  4793. -   <Camera make="AVT" model="F-510C" supported="no" mode="chdk-c">
  4794. +   <Camera make="AVT" model="F-510C" mode="chdk-c">
  4795.         <CFA2 width="2" height="2">
  4796.             <ColorRow y="0">RG</ColorRow>
  4797.             <ColorRow y="1">GB</ColorRow>
  4798. @@ -6732,7 +7522,7 @@
  4799.             <Hint name="full_height" value="1958"/>
  4800.         </Hints>
  4801.     </Camera>
  4802. -   <Camera make="AVT" model="F-510C" supported="no" mode="chdk-d">
  4803. +   <Camera make="AVT" model="F-510C" mode="chdk-d">
  4804.         <CFA2 width="2" height="2">
  4805.             <ColorRow y="0">RG</ColorRow>
  4806.             <ColorRow y="1">GB</ColorRow>
  4807. @@ -6746,7 +7536,7 @@
  4808.             <Hint name="offset" value="12"/>
  4809.         </Hints>
  4810.     </Camera>
  4811. -   <Camera make="AVT" model="F-810C" supported="no" mode="chdk">
  4812. +   <Camera make="AVT" model="F-810C" mode="chdk">
  4813.         <CFA2 width="2" height="2">
  4814.             <ColorRow y="0">RG</ColorRow>
  4815.             <ColorRow y="1">GB</ColorRow>
  4816. @@ -6759,7 +7549,7 @@
  4817.             <Hint name="full_height" value="2469"/>
  4818.         </Hints>
  4819.     </Camera>
  4820. -   <Camera make="AgfaPhoto" model="DC-833m" supported="no" mode="chdk">
  4821. +   <Camera make="AgfaPhoto" model="DC-833m" mode="chdk">
  4822.         <CFA2 width="2" height="2">
  4823.             <ColorRow y="0">GB</ColorRow>
  4824.             <ColorRow y="1">RG</ColorRow>
  4825. @@ -6772,7 +7562,7 @@
  4826.             <Hint name="full_height" value="2448"/>
  4827.         </Hints>
  4828.     </Camera>
  4829. -   <Camera make="Alcatel" model="5035D" supported="no" mode="chdk">
  4830. +   <Camera make="Alcatel" model="5035D" mode="chdk">
  4831.         <CFA2 width="2" height="2">
  4832.             <ColorRow y="0">GB</ColorRow>
  4833.             <ColorRow y="1">RG</ColorRow>
  4834. @@ -6785,7 +7575,7 @@
  4835.             <Hint name="full_height" value="1902"/>
  4836.         </Hints>
  4837.     </Camera>
  4838. -   <Camera make="Baumer" model="TXG14" supported="no" mode="chdk">
  4839. +   <Camera make="Baumer" model="TXG14" mode="chdk">
  4840.         <CFA2 width="2" height="2">
  4841.             <ColorRow y="0">GR</ColorRow>
  4842.             <ColorRow y="1">BG</ColorRow>
  4843. @@ -6799,7 +7589,7 @@
  4844.             <Hint name="offset" value="1078"/>
  4845.         </Hints>
  4846.     </Camera>
  4847. -   <Camera make="Canon" model="PowerShot SD300" supported="no" mode="chdk">
  4848. +   <Camera make="Canon" model="PowerShot SD300" mode="chdk">
  4849.         <CFA2 width="2" height="2">
  4850.             <ColorRow y="0">RG</ColorRow>
  4851.             <ColorRow y="1">GB</ColorRow>
  4852. @@ -6812,7 +7602,7 @@
  4853.             <Hint name="full_height" value="1766"/>
  4854.         </Hints>
  4855.     </Camera>
  4856. -   <Camera make="Canon" model="PowerShot A460" supported="no" mode="chdk">
  4857. +   <Camera make="Canon" model="PowerShot A460" mode="chdk">
  4858.         <CFA2 width="2" height="2">
  4859.             <ColorRow y="0">RG</ColorRow>
  4860.             <ColorRow y="1">GB</ColorRow>
  4861. @@ -6842,7 +7632,7 @@
  4862.             <Vertical x="2632" width="40"/>
  4863.         </BlackAreas>
  4864.     </Camera>
  4865. -   <Camera make="Canon" model="PowerShot A530" supported="no" mode="chdk">
  4866. +   <Camera make="Canon" model="PowerShot A530" mode="chdk">
  4867.         <CFA2 width="2" height="2">
  4868.             <ColorRow y="0">RG</ColorRow>
  4869.             <ColorRow y="1">GB</ColorRow>
  4870. @@ -6889,7 +7679,7 @@
  4871.             <Vertical x="0" width="30"/>
  4872.         </BlackAreas>
  4873.     </Camera>
  4874. -   <Camera make="Canon" model="PowerShot A470" supported="no" mode="chdk">
  4875. +   <Camera make="Canon" model="PowerShot A470" mode="chdk">
  4876.         <CFA2 width="2" height="2">
  4877.             <ColorRow y="0">GR</ColorRow>
  4878.             <ColorRow y="1">BG</ColorRow>
  4879. @@ -6987,7 +7777,7 @@
  4880.             <Vertical x="3690" width="30"/>
  4881.         </BlackAreas>
  4882.     </Camera>
  4883. -   <Camera make="Canon" model="PowerShot SX120 IS" supported="no" mode="chdk">
  4884. +   <Camera make="Canon" model="PowerShot SX120 IS" mode="chdk">
  4885.         <CFA2 width="2" height="2">
  4886.             <ColorRow y="0">RG</ColorRow>
  4887.             <ColorRow y="1">GB</ColorRow>
  4888. @@ -7000,7 +7790,7 @@
  4889.             <Hint name="full_height" value="2778"/>
  4890.         </Hints>
  4891.     </Camera>
  4892. -   <Camera make="Canon" model="PowerShot SX20 IS" supported="no" mode="chdk">
  4893. +   <Camera make="Canon" model="PowerShot SX20 IS" mode="chdk">
  4894.         <CFA2 width="2" height="2">
  4895.             <ColorRow y="0">RG</ColorRow>
  4896.             <ColorRow y="1">GB</ColorRow>
  4897. @@ -7013,7 +7803,7 @@
  4898.             <Hint name="full_height" value="3048"/>
  4899.         </Hints>
  4900.     </Camera>
  4901. -   <Camera make="Canon" model="PowerShot SX220 HS" supported="no" mode="chdk">
  4902. +   <Camera make="Canon" model="PowerShot SX220 HS" mode="chdk">
  4903.         <CFA2 width="2" height="2">
  4904.             <ColorRow y="0">RG</ColorRow>
  4905.             <ColorRow y="1">GB</ColorRow>
  4906. @@ -7026,7 +7816,7 @@
  4907.             <Hint name="full_height" value="3060"/>
  4908.         </Hints>
  4909.     </Camera>
  4910. -   <Camera make="Canon" model="PowerShot SX30 IS" supported="no" mode="chdk">
  4911. +   <Camera make="Canon" model="PowerShot SX30 IS" mode="chdk">
  4912.         <CFA2 width="2" height="2">
  4913.             <ColorRow y="0">BG</ColorRow>
  4914.             <ColorRow y="1">GR</ColorRow>
  4915. @@ -7039,7 +7829,7 @@
  4916.             <Hint name="full_height" value="3276"/>
  4917.         </Hints>
  4918.     </Camera>
  4919. -   <Camera make="Canon" model="PowerShot A3300 IS" supported="no" mode="chdk">
  4920. +   <Camera make="Canon" model="PowerShot A3300 IS" mode="chdk">
  4921.         <CFA2 width="2" height="2">
  4922.             <ColorRow y="0">RG</ColorRow>
  4923.             <ColorRow y="1">GB</ColorRow>
  4924. @@ -7052,7 +7842,7 @@
  4925.             <Hint name="full_height" value="3504"/>
  4926.         </Hints>
  4927.     </Camera>
  4928. -   <Camera make="Casio" model="QV-2000UX" supported="no" mode="chdk">
  4929. +   <Camera make="Casio" model="QV-2000UX" mode="chdk">
  4930.         <CFA2 width="2" height="2">
  4931.             <ColorRow y="0">RG</ColorRow>
  4932.             <ColorRow y="1">GB</ColorRow>
  4933. @@ -7065,7 +7855,7 @@
  4934.             <Hint name="full_height" value="1211"/>
  4935.         </Hints>
  4936.     </Camera>
  4937. -   <Camera make="Casio" model="QV-3*00EX" supported="no" mode="chdk">
  4938. +   <Camera make="Casio" model="QV-3*00EX" mode="chdk">
  4939.         <CFA2 width="2" height="2">
  4940.             <ColorRow y="0">RG</ColorRow>
  4941.             <ColorRow y="1">GB</ColorRow>
  4942. @@ -7078,7 +7868,7 @@
  4943.             <Hint name="full_height" value="1547"/>
  4944.         </Hints>
  4945.     </Camera>
  4946. -   <Camera make="Casio" model="QV-5700" supported="no" mode="chdk">
  4947. +   <Camera make="Casio" model="QV-5700" mode="chdk">
  4948.         <CFA2 width="2" height="2">
  4949.             <ColorRow y="0">RG</ColorRow>
  4950.             <ColorRow y="1">GB</ColorRow>
  4951. @@ -7091,7 +7881,7 @@
  4952.             <Hint name="full_height" value="1924"/>
  4953.         </Hints>
  4954.     </Camera>
  4955. -   <Camera make="Casio" model="EX-Z60" supported="no" mode="chdk">
  4956. +   <Camera make="Casio" model="EX-Z60" mode="chdk">
  4957.         <CFA2 width="2" height="2">
  4958.             <ColorRow y="0">BG</ColorRow>
  4959.             <ColorRow y="1">GR</ColorRow>
  4960. @@ -7104,7 +7894,7 @@
  4961.             <Hint name="full_height" value="2181"/>
  4962.         </Hints>
  4963.     </Camera>
  4964. -   <Camera make="Casio" model="EX-S20" supported="no" mode="chdk">
  4965. +   <Camera make="Casio" model="EX-S20" mode="chdk">
  4966.         <CFA2 width="2" height="2">
  4967.             <ColorRow y="0">RG</ColorRow>
  4968.             <ColorRow y="1">GB</ColorRow>
  4969. @@ -7117,7 +7907,7 @@
  4970.             <Hint name="full_height" value="1208"/>
  4971.         </Hints>
  4972.     </Camera>
  4973. -   <Camera make="Casio" model="EX-S100" supported="no" mode="chdk">
  4974. +   <Camera make="Casio" model="EX-S100" mode="chdk">
  4975.         <CFA2 width="2" height="2">
  4976.             <ColorRow y="0">RG</ColorRow>
  4977.             <ColorRow y="1">GB</ColorRow>
  4978. @@ -7130,7 +7920,7 @@
  4979.             <Hint name="full_height" value="1578"/>
  4980.         </Hints>
  4981.     </Camera>
  4982. -   <Camera make="Casio" model="QV-R41" supported="no" mode="chdk">
  4983. +   <Camera make="Casio" model="QV-R41" mode="chdk">
  4984.         <CFA2 width="2" height="2">
  4985.             <ColorRow y="0">RG</ColorRow>
  4986.             <ColorRow y="1">GB</ColorRow>
  4987. @@ -7143,7 +7933,7 @@
  4988.             <Hint name="full_height" value="1720"/>
  4989.         </Hints>
  4990.     </Camera>
  4991. -   <Camera make="Casio" model="EX-P505" supported="no" mode="chdk">
  4992. +   <Camera make="Casio" model="EX-P505" mode="chdk">
  4993.         <CFA2 width="2" height="2">
  4994.             <ColorRow y="0">RG</ColorRow>
  4995.             <ColorRow y="1">GB</ColorRow>
  4996. @@ -7156,7 +7946,7 @@
  4997.             <Hint name="full_height" value="1928"/>
  4998.         </Hints>
  4999.     </Camera>
  5000. -   <Camera make="Casio" model="QV-R51" supported="no" mode="chdk">
  5001. +   <Camera make="Casio" model="QV-R51" mode="chdk">
  5002.         <CFA2 width="2" height="2">
  5003.             <ColorRow y="0">RG</ColorRow>
  5004.             <ColorRow y="1">GB</ColorRow>
  5005. @@ -7169,7 +7959,7 @@
  5006.             <Hint name="full_height" value="1929"/>
  5007.         </Hints>
  5008.     </Camera>
  5009. -   <Camera make="Casio" model="EX-Z50" supported="no" mode="chdk">
  5010. +   <Camera make="Casio" model="EX-Z50" mode="chdk">
  5011.         <CFA2 width="2" height="2">
  5012.             <ColorRow y="0">RG</ColorRow>
  5013.             <ColorRow y="1">GB</ColorRow>
  5014. @@ -7182,7 +7972,7 @@
  5015.             <Hint name="full_height" value="1932"/>
  5016.         </Hints>
  5017.     </Camera>
  5018. -   <Camera make="Casio" model="EX-Z500" supported="no" mode="chdk">
  5019. +   <Camera make="Casio" model="EX-Z500" mode="chdk">
  5020.         <CFA2 width="2" height="2">
  5021.             <ColorRow y="0">BG</ColorRow>
  5022.             <ColorRow y="1">GR</ColorRow>
  5023. @@ -7195,7 +7985,7 @@
  5024.             <Hint name="full_height" value="1937"/>
  5025.         </Hints>
  5026.     </Camera>
  5027. -   <Camera make="Casio" model="EX-Z55" supported="no" mode="chdk">
  5028. +   <Camera make="Casio" model="EX-Z55" mode="chdk">
  5029.         <CFA2 width="2" height="2">
  5030.             <ColorRow y="0">RG</ColorRow>
  5031.             <ColorRow y="1">GB</ColorRow>
  5032. @@ -7208,7 +7998,7 @@
  5033.             <Hint name="full_height" value="1986"/>
  5034.         </Hints>
  5035.     </Camera>
  5036. -   <Camera make="Casio" model="EX-P600" supported="no" mode="chdk">
  5037. +   <Camera make="Casio" model="EX-P600" mode="chdk">
  5038.         <CFA2 width="2" height="2">
  5039.             <ColorRow y="0">RG</ColorRow>
  5040.             <ColorRow y="1">GB</ColorRow>
  5041. @@ -7221,7 +8011,7 @@
  5042.             <Hint name="full_height" value="2172"/>
  5043.         </Hints>
  5044.     </Camera>
  5045. -   <Camera make="Casio" model="EX-Z750" supported="no" mode="chdk">
  5046. +   <Camera make="Casio" model="EX-Z750" mode="chdk">
  5047.         <CFA2 width="2" height="2">
  5048.             <ColorRow y="0">RG</ColorRow>
  5049.             <ColorRow y="1">GB</ColorRow>
  5050. @@ -7234,7 +8024,7 @@
  5051.             <Hint name="full_height" value="2319"/>
  5052.         </Hints>
  5053.     </Camera>
  5054. -   <Camera make="Casio" model="EX-Z75" supported="no" mode="chdk">
  5055. +   <Camera make="Casio" model="EX-Z75" mode="chdk">
  5056.         <CFA2 width="2" height="2">
  5057.             <ColorRow y="0">RG</ColorRow>
  5058.             <ColorRow y="1">GB</ColorRow>
  5059. @@ -7247,7 +8037,7 @@
  5060.             <Hint name="full_height" value="2321"/>
  5061.         </Hints>
  5062.     </Camera>
  5063. -   <Camera make="Casio" model="EX-P700" supported="no" mode="chdk">
  5064. +   <Camera make="Casio" model="EX-P700" mode="chdk">
  5065.         <CFA2 width="2" height="2">
  5066.             <ColorRow y="0">RG</ColorRow>
  5067.             <ColorRow y="1">GB</ColorRow>
  5068. @@ -7260,7 +8050,7 @@
  5069.             <Hint name="full_height" value="2350"/>
  5070.         </Hints>
  5071.     </Camera>
  5072. -   <Camera make="Casio" model="EX-Z850" supported="no" mode="chdk">
  5073. +   <Camera make="Casio" model="EX-Z850" mode="chdk">
  5074.         <CFA2 width="2" height="2">
  5075.             <ColorRow y="0">RG</ColorRow>
  5076.             <ColorRow y="1">GB</ColorRow>
  5077. @@ -7273,7 +8063,7 @@
  5078.             <Hint name="full_height" value="2498"/>
  5079.         </Hints>
  5080.     </Camera>
  5081. -   <Camera make="Casio" model="EX-Z8" supported="no" mode="chdk">
  5082. +   <Camera make="Casio" model="EX-Z8" mode="chdk">
  5083.         <CFA2 width="2" height="2">
  5084.             <ColorRow y="0">RG</ColorRow>
  5085.             <ColorRow y="1">GB</ColorRow>
  5086. @@ -7286,7 +8076,7 @@
  5087.             <Hint name="full_height" value="2502"/>
  5088.         </Hints>
  5089.     </Camera>
  5090. -   <Camera make="Casio" model="EX-Z1050" supported="no" mode="chdk">
  5091. +   <Camera make="Casio" model="EX-Z1050" mode="chdk">
  5092.         <CFA2 width="2" height="2">
  5093.             <ColorRow y="0">RG</ColorRow>
  5094.             <ColorRow y="1">GB</ColorRow>
  5095. @@ -7299,7 +8089,7 @@
  5096.             <Hint name="full_height" value="2752"/>
  5097.         </Hints>
  5098.     </Camera>
  5099. -   <Camera make="Casio" model="EX-ZR100" supported="no" mode="chdk">
  5100. +   <Camera make="Casio" model="EX-ZR100" mode="chdk">
  5101.         <CFA2 width="2" height="2">
  5102.             <ColorRow y="0">RG</ColorRow>
  5103.             <ColorRow y="1">GB</ColorRow>
  5104. @@ -7312,7 +8102,7 @@
  5105.             <Hint name="full_height" value="3044"/>
  5106.         </Hints>
  5107.     </Camera>
  5108. -   <Camera make="Casio" model="QV-4000" supported="no" mode="chdk">
  5109. +   <Camera make="Casio" model="QV-4000" mode="chdk">
  5110.         <CFA2 width="2" height="2">
  5111.             <ColorRow y="0">RG</ColorRow>
  5112.             <ColorRow y="1">GB</ColorRow>
  5113. @@ -7325,7 +8115,7 @@
  5114.             <Hint name="full_height" value="1700"/>
  5115.         </Hints>
  5116.     </Camera>
  5117. -   <Camera make="Creative" model="PC-CAM 600" supported="no" mode="chdk">
  5118. +   <Camera make="Creative" model="PC-CAM 600" mode="chdk">
  5119.         <CFA2 width="2" height="2">
  5120.             <ColorRow y="0">GR</ColorRow>
  5121.             <ColorRow y="1">BG</ColorRow>
  5122. @@ -7338,7 +8128,7 @@
  5123.             <Hint name="full_height" value="769"/>
  5124.         </Hints>
  5125.     </Camera>
  5126. -   <Camera make="DJI" model="" supported="no" mode="chdk">
  5127. +   <Camera make="DJI" model="" mode="chdk">
  5128.         <CFA2 width="2" height="2">
  5129.             <ColorRow y="0">GB</ColorRow>
  5130.             <ColorRow y="1">RG</ColorRow>
  5131. @@ -7351,7 +8141,7 @@
  5132.             <Hint name="full_height" value="3288"/>
  5133.         </Hints>
  5134.     </Camera>
  5135. -   <Camera make="Matrix" model="" supported="no" mode="chdk">
  5136. +   <Camera make="Matrix" model="" mode="chdk">
  5137.         <CFA2 width="2" height="2">
  5138.             <ColorRow y="0">RG</ColorRow>
  5139.             <ColorRow y="1">GB</ColorRow>
  5140. @@ -7364,7 +8154,7 @@
  5141.             <Hint name="full_height" value="3288"/>
  5142.         </Hints>
  5143.     </Camera>
  5144. -   <Camera make="Foculus" model="531C" supported="no" mode="chdk">
  5145. +   <Camera make="Foculus" model="531C" mode="chdk">
  5146.         <CFA2 width="2" height="2">
  5147.             <ColorRow y="0">GR</ColorRow>
  5148.             <ColorRow y="1">BG</ColorRow>
  5149. @@ -7377,7 +8167,7 @@
  5150.             <Hint name="full_height" value="1200"/>
  5151.         </Hints>
  5152.     </Camera>
  5153. -   <Camera make="Generic" model="" supported="no" mode="chdk">
  5154. +   <Camera make="Generic" model="" mode="chdk">
  5155.         <CFA2 width="2" height="2">
  5156.             <ColorRow y="0">RG</ColorRow>
  5157.             <ColorRow y="1">GB</ColorRow>
  5158. @@ -7390,7 +8180,7 @@
  5159.             <Hint name="full_height" value="480"/>
  5160.         </Hints>
  5161.     </Camera>
  5162. -   <Camera make="Kodak" model="DC20" supported="no" mode="chdk-a">
  5163. +   <Camera make="Kodak" model="DC20" mode="chdk-a">
  5164.         <CFA2 width="2" height="2">
  5165.             <ColorRow y="0">GR</ColorRow>
  5166.             <ColorRow y="1">GB</ColorRow>
  5167. @@ -7403,7 +8193,7 @@
  5168.             <Hint name="full_height" value="244"/>
  5169.         </Hints>
  5170.     </Camera>
  5171. -   <Camera make="Kodak" model="DC20" supported="no" mode="chdk-b">
  5172. +   <Camera make="Kodak" model="DC20" mode="chdk-b">
  5173.         <CFA2 width="2" height="2">
  5174.             <ColorRow y="0">GR</ColorRow>
  5175.             <ColorRow y="1">GB</ColorRow>
  5176. @@ -7416,7 +8206,7 @@
  5177.             <Hint name="full_height" value="244"/>
  5178.         </Hints>
  5179.     </Camera>
  5180. -   <Camera make="Kodak" model="DCS200" supported="no" mode="chdk">
  5181. +   <Camera make="Kodak" model="DCS200" mode="chdk">
  5182.         <CFA2 width="2" height="2">
  5183.             <ColorRow y="0">GB</ColorRow>
  5184.             <ColorRow y="1">RG</ColorRow>
  5185. @@ -7429,7 +8219,7 @@
  5186.             <Hint name="full_height" value="1076"/>
  5187.         </Hints>
  5188.     </Camera>
  5189. -   <Camera make="Kodak" model="C330" supported="no" mode="chdk-a">
  5190. +   <Camera make="Kodak" model="C330" mode="chdk-a">
  5191.         <CFA2 width="2" height="2">
  5192.             <ColorRow y="0">RG</ColorRow>
  5193.             <ColorRow y="1">GB</ColorRow>
  5194. @@ -7442,7 +8232,7 @@
  5195.             <Hint name="full_height" value="1779"/>
  5196.         </Hints>
  5197.     </Camera>
  5198. -   <Camera make="Kodak" model="C330" supported="no" mode="chdk-b">
  5199. +   <Camera make="Kodak" model="C330" mode="chdk-b">
  5200.         <CFA2 width="2" height="2">
  5201.             <ColorRow y="0">RG</ColorRow>
  5202.             <ColorRow y="1">GB</ColorRow>
  5203. @@ -7456,7 +8246,7 @@
  5204.             <Hint name="offset" value="3160"/>
  5205.         </Hints>
  5206.     </Camera>
  5207. -   <Camera make="Kodak" model="C603" supported="no" mode="chdk-a">
  5208. +   <Camera make="Kodak" model="C603" mode="chdk-a">
  5209.         <CFA2 width="2" height="2">
  5210.             <ColorRow y="0">RG</ColorRow>
  5211.             <ColorRow y="1">GB</ColorRow>
  5212. @@ -7469,7 +8259,7 @@
  5213.             <Hint name="full_height" value="2152"/>
  5214.         </Hints>
  5215.     </Camera>
  5216. -   <Camera make="Kodak" model="C603" supported="no" mode="chdk-b">
  5217. +   <Camera make="Kodak" model="C603" mode="chdk-b">
  5218.         <CFA2 width="2" height="2">
  5219.             <ColorRow y="0">RG</ColorRow>
  5220.             <ColorRow y="1">GB</ColorRow>
  5221. @@ -7483,7 +8273,7 @@
  5222.             <Hint name="offset" value="3160"/>
  5223.         </Hints>
  5224.     </Camera>
  5225. -   <Camera make="Kodak" model="C603" supported="no" mode="chdk-c">
  5226. +   <Camera make="Kodak" model="C603" mode="chdk-c">
  5227.         <Crop x="0" y="0" width="0" height="0"/>
  5228.         <Sensor black="0" white="4095"/>
  5229.         <Hints>
  5230. @@ -7492,7 +8282,7 @@
  5231.             <Hint name="full_height" value="480"/>
  5232.         </Hints>
  5233.     </Camera>
  5234. -   <Camera make="Kodak" model="C603" supported="no" mode="chdk-d">
  5235. +   <Camera make="Kodak" model="C603" mode="chdk-d">
  5236.         <Crop x="0" y="0" width="0" height="0"/>
  5237.         <Sensor black="0" white="4095"/>
  5238.         <Hints>
  5239. @@ -7501,7 +8291,7 @@
  5240.             <Hint name="full_height" value="2134"/>
  5241.         </Hints>
  5242.     </Camera>
  5243. -   <Camera make="Kodak" model="12MP" supported="no" mode="chdk-a">
  5244. +   <Camera make="Kodak" model="12MP" mode="chdk-a">
  5245.         <CFA2 width="2" height="2">
  5246.             <ColorRow y="0">GR</ColorRow>
  5247.             <ColorRow y="1">BG</ColorRow>
  5248. @@ -7514,7 +8304,7 @@
  5249.             <Hint name="full_height" value="3030"/>
  5250.         </Hints>
  5251.     </Camera>
  5252. -   <Camera make="Kodak" model="12MP" supported="no" mode="chdk-b">
  5253. +   <Camera make="Kodak" model="12MP" mode="chdk-b">
  5254.         <CFA2 width="2" height="2">
  5255.             <ColorRow y="0">GR</ColorRow>
  5256.             <ColorRow y="1">BG</ColorRow>
  5257. @@ -7528,7 +8318,7 @@
  5258.             <Hint name="offset" value="31556"/>
  5259.         </Hints>
  5260.     </Camera>
  5261. -   <Camera make="Kodak" model="12MP" supported="no" mode="chdk-c">
  5262. +   <Camera make="Kodak" model="12MP" mode="chdk-c">
  5263.         <Crop x="0" y="0" width="0" height="0"/>
  5264.         <Sensor black="0" white="4095"/>
  5265.         <Hints>
  5266. @@ -7537,7 +8327,7 @@
  5267.             <Hint name="full_height" value="3000"/>
  5268.         </Hints>
  5269.     </Camera>
  5270. -   <Camera make="Kodak" model="KAI-0340" supported="no" mode="chdk">
  5271. +   <Camera make="Kodak" model="KAI-0340" mode="chdk">
  5272.         <CFA2 width="2" height="2">
  5273.             <ColorRow y="0">RG</ColorRow>
  5274.             <ColorRow y="1">GB</ColorRow>
  5275. @@ -7550,7 +8340,7 @@
  5276.             <Hint name="full_height" value="480"/>
  5277.         </Hints>
  5278.     </Camera>
  5279. -   <Camera make="Micron" model="2010" supported="no" mode="chdk">
  5280. +   <Camera make="Micron" model="2010" mode="chdk">
  5281.         <CFA2 width="2" height="2">
  5282.             <ColorRow y="0">BG</ColorRow>
  5283.             <ColorRow y="1">GR</ColorRow>
  5284. @@ -7564,7 +8354,7 @@
  5285.             <Hint name="offset" value="3212"/>
  5286.         </Hints>
  5287.     </Camera>
  5288. -   <Camera make="Minolta" model="RD175" supported="no" mode="chdk">
  5289. +   <Camera make="Minolta" model="RD175" mode="chdk">
  5290.         <CFA2 width="2" height="2">
  5291.             <ColorRow y="0">GB</ColorRow>
  5292.             <ColorRow y="1">RG</ColorRow>
  5293. @@ -7578,7 +8368,7 @@
  5294.             <Hint name="offset" value="513"/>
  5295.         </Hints>
  5296.     </Camera>
  5297. -   <Camera make="Nikon" model="E900" supported="no" mode="chdk">
  5298. +   <Camera make="Nikon" model="E900" mode="chdk">
  5299.         <CFA2 width="2" height="2">
  5300.             <ColorRow y="0">BG</ColorRow>
  5301.             <ColorRow y="1">GR</ColorRow>
  5302. @@ -7591,7 +8381,7 @@
  5303.             <Hint name="full_height" value="969"/>
  5304.         </Hints>
  5305.     </Camera>
  5306. -   <Camera make="Nikon" model="E950" supported="no" mode="chdk">
  5307. +   <Camera make="Nikon" model="E950" mode="chdk">
  5308.         <CFA2 width="2" height="2">
  5309.             <ColorRow y="0">GR</ColorRow>
  5310.             <ColorRow y="1">BG</ColorRow>
  5311. @@ -7604,7 +8394,7 @@
  5312.             <Hint name="full_height" value="1204"/>
  5313.         </Hints>
  5314.     </Camera>
  5315. -   <Camera make="Nikon" model="E2100" supported="no" mode="chdk">
  5316. +   <Camera make="Nikon" model="E2100" mode="chdk">
  5317.         <CFA2 width="2" height="2">
  5318.             <ColorRow y="0">RG</ColorRow>
  5319.             <ColorRow y="1">GB</ColorRow>
  5320. @@ -7617,7 +8407,7 @@
  5321.             <Hint name="full_height" value="1213"/>
  5322.         </Hints>
  5323.     </Camera>
  5324. -   <Camera make="Nikon" model="E990" supported="no" mode="chdk">
  5325. +   <Camera make="Nikon" model="E990" mode="chdk">
  5326.         <CFA2 width="2" height="2">
  5327.             <ColorRow y="0">GB</ColorRow>
  5328.             <ColorRow y="1">RG</ColorRow>
  5329. @@ -7630,7 +8420,7 @@
  5330.             <Hint name="full_height" value="1541"/>
  5331.         </Hints>
  5332.     </Camera>
  5333. -   <Camera make="Nikon" model="E3700" supported="no" mode="chdk">
  5334. +   <Camera make="Nikon" model="E3700" mode="chdk">
  5335.         <CFA2 width="2" height="2">
  5336.             <ColorRow y="0">RG</ColorRow>
  5337.             <ColorRow y="1">GB</ColorRow>
  5338. @@ -7643,7 +8433,7 @@
  5339.             <Hint name="full_height" value="1542"/>
  5340.         </Hints>
  5341.     </Camera>
  5342. -   <Camera make="Nikon" model="E4500" supported="no" mode="chdk">
  5343. +   <Camera make="Nikon" model="E4500" mode="chdk">
  5344.         <CFA2 width="2" height="2">
  5345.             <ColorRow y="0">RG</ColorRow>
  5346.             <ColorRow y="1">GB</ColorRow>
  5347. @@ -7656,7 +8446,7 @@
  5348.             <Hint name="full_height" value="1709"/>
  5349.         </Hints>
  5350.     </Camera>
  5351. -   <Camera make="Nikon" model="E4300" supported="no" mode="chdk">
  5352. +   <Camera make="Nikon" model="E4300" mode="chdk">
  5353.         <CFA2 width="2" height="2">
  5354.             <ColorRow y="0">BG</ColorRow>
  5355.             <ColorRow y="1">GR</ColorRow>
  5356. @@ -7669,7 +8459,7 @@
  5357.             <Hint name="full_height" value="1710"/>
  5358.         </Hints>
  5359.     </Camera>
  5360. -   <Camera make="Nikon" model="E5000" supported="no" mode="chdk">
  5361. +   <Camera make="Nikon" model="E5000" mode="chdk">
  5362.         <CFA2 width="2" height="2">
  5363.             <ColorRow y="0">RG</ColorRow>
  5364.             <ColorRow y="1">GB</ColorRow>
  5365. @@ -7682,7 +8472,7 @@
  5366.             <Hint name="full_height" value="1925"/>
  5367.         </Hints>
  5368.     </Camera>
  5369. -   <Camera make="Nikon" model="COOLPIX S6" supported="no" mode="chdk">
  5370. +   <Camera make="Nikon" model="COOLPIX S6" mode="chdk">
  5371.         <CFA2 width="2" height="2">
  5372.             <ColorRow y="0">RG</ColorRow>
  5373.             <ColorRow y="1">GB</ColorRow>
  5374. @@ -7695,7 +8485,7 @@
  5375.             <Hint name="full_height" value="2118"/>
  5376.         </Hints>
  5377.     </Camera>
  5378. -   <Camera make="Olympus" model="C770UZ" supported="no" mode="chdk">
  5379. +   <Camera make="Olympus" model="C770UZ" mode="chdk">
  5380.         <CFA2 width="2" height="2">
  5381.             <ColorRow y="0">BG</ColorRow>
  5382.             <ColorRow y="1">GR</ColorRow>
  5383. @@ -7708,7 +8498,7 @@
  5384.             <Hint name="full_height" value="1718"/>
  5385.         </Hints>
  5386.     </Camera>
  5387. -   <Camera make="Pentax" model="Optio S" supported="no" mode="chdk-a">
  5388. +   <Camera make="Pentax" model="Optio S" mode="chdk-a">
  5389.         <CFA2 width="2" height="2">
  5390.             <ColorRow y="0">RG</ColorRow>
  5391.             <ColorRow y="1">GB</ColorRow>
  5392. @@ -7721,7 +8511,7 @@
  5393.             <Hint name="full_height" value="1540"/>
  5394.         </Hints>
  5395.     </Camera>
  5396. -   <Camera make="Pentax" model="Optio S" supported="no" mode="chdk-b">
  5397. +   <Camera make="Pentax" model="Optio S" mode="chdk-b">
  5398.         <CFA2 width="2" height="2">
  5399.             <ColorRow y="0">RG</ColorRow>
  5400.             <ColorRow y="1">GB</ColorRow>
  5401. @@ -7734,7 +8524,7 @@
  5402.             <Hint name="full_height" value="1544"/>
  5403.         </Hints>
  5404.     </Camera>
  5405. -   <Camera make="Pentax" model="Optio S4" supported="no" mode="chdk">
  5406. +   <Camera make="Pentax" model="Optio S4" mode="chdk">
  5407.         <CFA2 width="2" height="2">
  5408.             <ColorRow y="0">RG</ColorRow>
  5409.             <ColorRow y="1">GB</ColorRow>
  5410. @@ -7747,7 +8537,7 @@
  5411.             <Hint name="full_height" value="1737"/>
  5412.         </Hints>
  5413.     </Camera>
  5414. -   <Camera make="Pentax" model="Optio 750Z" supported="no" mode="chdk">
  5415. +   <Camera make="Pentax" model="Optio 750Z" mode="chdk">
  5416.         <CFA2 width="2" height="2">
  5417.             <ColorRow y="0">RG</ColorRow>
  5418.             <ColorRow y="1">GB</ColorRow>
  5419. @@ -7760,7 +8550,7 @@
  5420.             <Hint name="full_height" value="2322"/>
  5421.         </Hints>
  5422.     </Camera>
  5423. -   <Camera make="Pixelink" model="A782" supported="no" mode="chdk">
  5424. +   <Camera make="Pixelink" model="A782" mode="chdk">
  5425.         <CFA2 width="2" height="2">
  5426.             <ColorRow y="0">GB</ColorRow>
  5427.             <ColorRow y="1">RG</ColorRow>
  5428. @@ -7773,7 +8563,7 @@
  5429.             <Hint name="full_height" value="3000"/>
  5430.         </Hints>
  5431.     </Camera>
  5432. -   <Camera make="RoverShot" model="3320AF" supported="no" mode="chdk">
  5433. +   <Camera make="RoverShot" model="3320AF" mode="chdk">
  5434.         <CFA2 width="2" height="2">
  5435.             <ColorRow y="0">GB</ColorRow>
  5436.             <ColorRow y="1">RG</ColorRow>
  5437. @@ -7786,7 +8576,7 @@
  5438.             <Hint name="full_height" value="1536"/>
  5439.         </Hints>
  5440.     </Camera>
  5441. -   <Camera make="ST Micro" model="STV680 VGA" supported="no" mode="chdk">
  5442. +   <Camera make="ST Micro" model="STV680 VGA" mode="chdk">
  5443.         <CFA2 width="2" height="2">
  5444.             <ColorRow y="0">BG</ColorRow>
  5445.             <ColorRow y="1">GR</ColorRow>
  5446. @@ -7799,7 +8589,7 @@
  5447.             <Hint name="full_height" value="484"/>
  5448.         </Hints>
  5449.     </Camera>
  5450. -   <Camera make="Samsung" model="S85" supported="no" mode="chdk-a">
  5451. +   <Camera make="Samsung" model="S85" mode="chdk-a">
  5452.         <CFA2 width="2" height="2">
  5453.             <ColorRow y="0">RG</ColorRow>
  5454.             <ColorRow y="1">GB</ColorRow>
  5455. @@ -7812,7 +8602,7 @@
  5456.             <Hint name="full_height" value="2448"/>
  5457.         </Hints>
  5458.     </Camera>
  5459. -   <Camera make="Samsung" model="S85" supported="no" mode="chdk-b">
  5460. +   <Camera make="Samsung" model="S85" mode="chdk-b">
  5461.         <CFA2 width="2" height="2">
  5462.             <ColorRow y="0">RG</ColorRow>
  5463.             <ColorRow y="1">GB</ColorRow>
  5464. @@ -7825,7 +8615,7 @@
  5465.             <Hint name="full_height" value="2448"/>
  5466.         </Hints>
  5467.     </Camera>
  5468. -   <Camera make="Samsung" model="WB550" supported="no" mode="chdk-a">
  5469. +   <Camera make="Samsung" model="WB550" mode="chdk-a">
  5470.         <CFA2 width="2" height="2">
  5471.             <ColorRow y="0">RG</ColorRow>
  5472.             <ColorRow y="1">GB</ColorRow>
  5473. @@ -7838,7 +8628,7 @@
  5474.             <Hint name="full_height" value="2808"/>
  5475.         </Hints>
  5476.     </Camera>
  5477. -   <Camera make="Samsung" model="WB550" supported="no" mode="chdk-b">
  5478. +   <Camera make="Samsung" model="WB550" mode="chdk-b">
  5479.         <CFA2 width="2" height="2">
  5480.             <ColorRow y="0">RG</ColorRow>
  5481.             <ColorRow y="1">GB</ColorRow>
  5482. @@ -7851,7 +8641,7 @@
  5483.             <Hint name="full_height" value="3000"/>
  5484.         </Hints>
  5485.     </Camera>
  5486. -   <Camera make="Sinar" model="" supported="no" mode="chdk-a">
  5487. +   <Camera make="Sinar" model="" mode="chdk-a">
  5488.         <CFA2 width="2" height="2">
  5489.             <ColorRow y="0">GB</ColorRow>
  5490.             <ColorRow y="1">RG</ColorRow>
  5491. @@ -7865,7 +8655,7 @@
  5492.             <Hint name="offset" value="68"/>
  5493.         </Hints>
  5494.     </Camera>
  5495. -   <Camera make="Sinar" model="" supported="no" mode="chdk-b">
  5496. +   <Camera make="Sinar" model="" mode="chdk-b">
  5497.         <CFA2 width="2" height="2">
  5498.             <ColorRow y="0">GB</ColorRow>
  5499.             <ColorRow y="1">RG</ColorRow>
  5500. @@ -7879,7 +8669,7 @@
  5501.             <Hint name="offset" value="68"/>
  5502.         </Hints>
  5503.     </Camera>
  5504. -   <Camera make="Sinar" model="" supported="no" mode="chdk-c">
  5505. +   <Camera make="Sinar" model="" mode="chdk-c">
  5506.         <CFA2 width="2" height="2">
  5507.             <ColorRow y="0">GB</ColorRow>
  5508.             <ColorRow y="1">RG</ColorRow>
  5509. @@ -7893,7 +8683,7 @@
  5510.             <Hint name="offset" value="68"/>
  5511.         </Hints>
  5512.     </Camera>
  5513. -   <Camera make="Sony" model="XCD-SX910CR" supported="no" mode="chdk-a">
  5514. +   <Camera make="Sony" model="XCD-SX910CR" mode="chdk-a">
  5515.         <CFA2 width="2" height="2">
  5516.             <ColorRow y="0">GR</ColorRow>
  5517.             <ColorRow y="1">BG</ColorRow>
  5518. @@ -7906,7 +8696,7 @@
  5519.             <Hint name="full_height" value="1024"/>
  5520.         </Hints>
  5521.     </Camera>
  5522. -   <Camera make="Sony" model="XCD-SX910CR" supported="no" mode="chdk-b">
  5523. +   <Camera make="Sony" model="XCD-SX910CR" mode="chdk-b">
  5524.         <CFA2 width="2" height="2">
  5525.             <ColorRow y="0">GR</ColorRow>
  5526.             <ColorRow y="1">BG</ColorRow>
  5527. diff -urNr "darktable rawspeed/.gitattributes" rawspeed-develop/.gitattributes
  5528. --- "darktable rawspeed/.gitattributes" 1970-01-01 01:00:00.000000000 +0100
  5529. +++ rawspeed-develop/.gitattributes 2015-06-24 14:24:33.000000000 +0200
  5530. @@ -0,0 +1,18 @@
  5531. +# Set the default behavior, in case people don't have core.autocrlf set.
  5532. +* text=auto
  5533. +
  5534. +# Explicitly declare text files you want to always be normalized and converted
  5535. +# to native line endings on checkout.
  5536. +*.cpp text
  5537. +*.h text
  5538. +*.xml text
  5539. +*.xsl text
  5540. +*.md text
  5541. +*.txt text
  5542. +
  5543. +# Declare files that will always have CRLF line endings on checkout.
  5544. +*.sln text eol=crlf
  5545. +*.vcproj text eol=crlf
  5546. +
  5547. +# Denote all files that are truly binary and should not be modified.
  5548. +*.lib binary
  5549. \ Manca newline alla fine del file
  5550. diff -urNr "darktable rawspeed/.gitignore" rawspeed-develop/.gitignore
  5551. --- "darktable rawspeed/.gitignore" 1970-01-01 01:00:00.000000000 +0100
  5552. +++ rawspeed-develop/.gitignore 2015-06-24 14:24:33.000000000 +0200
  5553. @@ -0,0 +1,24 @@
  5554. +# Compiled Object files
  5555. +*.slo
  5556. +*.lo
  5557. +*.o
  5558. +*.obj
  5559. +
  5560. +# Compiled Dynamic libraries
  5561. +*.so
  5562. +*.dylib
  5563. +*.dll
  5564. +
  5565. +# Compiled Static libraries
  5566. +*.lai
  5567. +*.la
  5568. +*.a
  5569. +*.lib
  5570. +
  5571. +# Executables
  5572. +*.exe
  5573. +*.out
  5574. +*.app
  5575. +testimg
  5576. +Release-*
  5577. +Debug-*
  5578. diff -urNr "darktable rawspeed/RawSpeed/AriDecoder.cpp" rawspeed-develop/RawSpeed/AriDecoder.cpp
  5579. --- "darktable rawspeed/RawSpeed/AriDecoder.cpp"    1970-01-01 01:00:00.000000000 +0100
  5580. +++ rawspeed-develop/RawSpeed/AriDecoder.cpp    2015-06-24 14:24:33.000000000 +0200
  5581. @@ -0,0 +1,122 @@
  5582. +#include "StdAfx.h"
  5583. +#include "AriDecoder.h"
  5584. +#include "ByteStreamSwap.h"
  5585. +/*
  5586. +RawSpeed - RAW file decoder.
  5587. +
  5588. +Copyright (C) 2009-2015 Klaus Post
  5589. +
  5590. +This library is free software; you can redistribute it and/or
  5591. +modify it under the terms of the GNU Lesser General Public
  5592. +License as published by the Free Software Foundation; either
  5593. +version 2 of the License, or (at your option) any later version.
  5594. +
  5595. +This library is distributed in the hope that it will be useful,
  5596. +but WITHOUT ANY WARRANTY; without even the implied warranty of
  5597. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  5598. +Lesser General Public License for more details.
  5599. +
  5600. +You should have received a copy of the GNU Lesser General Public
  5601. +License along with this library; if not, write to the Free Software
  5602. +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  5603. +
  5604. +http://www.klauspost.com
  5605. +*/
  5606. +
  5607. +namespace RawSpeed {
  5608. +
  5609. +AriDecoder::AriDecoder(FileMap* file) : RawDecoder(file) {
  5610. +  if (mFile->getSize() < 4096) {
  5611. +    ThrowRDE("ARRI: File too small (no header)");
  5612. +  }
  5613. +  try {
  5614. +    ByteStream *s;
  5615. +    if (getHostEndianness() == little) {
  5616. +      s = new ByteStream(mFile->getData(8), mFile->getSize()- 8);
  5617. +    } else {
  5618. +      s = new ByteStreamSwap(mFile->getData(8), mFile->getSize()- 8);
  5619. +    }
  5620. +    mDataOffset = s->getInt();
  5621. +    uint32 someNumber = s->getInt(); // Value: 3?
  5622. +    uint32 segmentLength = s->getInt(); // Value: 0x3c = length
  5623. +   if (someNumber != 3 || segmentLength != 0x3c) {
  5624. +       ThrowRDE("Unknown values in ARRIRAW header, %d, %d", someNumber, segmentLength);
  5625. +   }
  5626. +    mWidth = s->getInt();
  5627. +    mHeight = s->getInt();
  5628. +    s->setAbsoluteOffset(0x40);
  5629. +    mDataSize = s->getInt();
  5630. +
  5631. +    // Smells like whitebalance
  5632. +    s->setAbsoluteOffset(0x5c);
  5633. +    mWB[0] = s->getFloat();  // 1.3667001 in sample
  5634. +    mWB[1] = s->getFloat();  // 1.0000000 in sample
  5635. +    mWB[2] = s->getFloat();  // 1.6450000 in sample
  5636. +
  5637. +    // Smells like iso
  5638. +    s->setAbsoluteOffset(0xb8);
  5639. +    mIso = s->getInt();  // 100 in sample
  5640. +
  5641. +    s->setAbsoluteOffset(0x29c-8);
  5642. +    mModel = s->getString();
  5643. +    s->setAbsoluteOffset(0x2a4-8);
  5644. +    mEncoder = s->getString();
  5645. +  } catch (IOException &e) {
  5646. +    ThrowRDE("ARRI: IO Exception:%s", e.what());
  5647. +  }
  5648. +}
  5649. +
  5650. +AriDecoder::~AriDecoder(void) {
  5651. +}
  5652. +
  5653. +RawImage AriDecoder::decodeRawInternal() {
  5654. +  mRaw->dim = iPoint2D(mWidth, mHeight);
  5655. +  mRaw->createData();
  5656. +
  5657. +  startThreads();
  5658. +
  5659. +  mRaw->whitePoint = 4095;
  5660. +  return mRaw;
  5661. +}
  5662. +
  5663. +void AriDecoder::decodeThreaded(RawDecoderThread * t) {
  5664. +  uchar8* data = mRaw->getData();
  5665. +  uint32 pitch = mRaw->pitch;
  5666. +  uint32 w = mRaw->dim.x;
  5667. +
  5668. +  uint32 startOff = mDataOffset + t->start_y * ((mWidth * 12) / 8);
  5669. +  BitPumpMSB32 bits(mFile->getData(startOff), mFile->getSize()-startOff);
  5670. +  
  5671. +  uint32 hw = mWidth >> 1;
  5672. +  for (uint32 y = t->start_y; y < t->end_y; y++) {
  5673. +    ushort16* dest = (ushort16*)mRaw->getData(0, y);
  5674. +    for (uint32 x = 0 ; x < hw; x++) {
  5675. +      uint32 a = bits.getBits(12);
  5676. +      uint32 b = bits.getBits(12);
  5677. +      dest[x*2] = b;
  5678. +      dest[x*2+1] = a;
  5679. +      bits.checkPos();
  5680. +    }
  5681. +  }
  5682. +}
  5683. +void AriDecoder::checkSupportInternal(CameraMetaData *meta) {
  5684. +  if (meta->hasCamera("ARRI", mModel, mEncoder)) {
  5685. +    this->checkCameraSupported(meta, "ARRI", mModel, mEncoder);
  5686. +  } else {
  5687. +    this->checkCameraSupported(meta, "ARRI", mModel, "");
  5688. +  }
  5689. +}
  5690. +
  5691. +void AriDecoder::decodeMetaDataInternal(CameraMetaData *meta) {
  5692. +  mRaw->cfa.setCFA(iPoint2D(2,2), CFA_GREEN, CFA_RED, CFA_BLUE, CFA_GREEN2);
  5693. +  mRaw->metadata.wbCoeffs[0] = mWB[0];
  5694. +  mRaw->metadata.wbCoeffs[1] = mWB[1];
  5695. +  mRaw->metadata.wbCoeffs[2] = mWB[2];
  5696. +  if (meta->hasCamera("ARRI", mModel, mEncoder)) {
  5697. +    setMetaData(meta, "ARRI", mModel, mEncoder, mIso);
  5698. +  } else {
  5699. +    setMetaData(meta, "ARRI", mModel, "", mIso);
  5700. +  }
  5701. +}
  5702. +
  5703. +} // namespace RawSpeed
  5704. diff -urNr "darktable rawspeed/RawSpeed/AriDecoder.h" rawspeed-develop/RawSpeed/AriDecoder.h
  5705. --- "darktable rawspeed/RawSpeed/AriDecoder.h"  1970-01-01 01:00:00.000000000 +0100
  5706. +++ rawspeed-develop/RawSpeed/AriDecoder.h  2015-06-24 14:24:33.000000000 +0200
  5707. @@ -0,0 +1,49 @@
  5708. +/*
  5709. +    RawSpeed - RAW file decoder.
  5710. +
  5711. +    Copyright (C) 2009-2015 Klaus Post
  5712. +
  5713. +    This library is free software; you can redistribute it and/or
  5714. +    modify it under the terms of the GNU Lesser General Public
  5715. +    License as published by the Free Software Foundation; either
  5716. +    version 2 of the License, or (at your option) any later version.
  5717. +
  5718. +    This library is distributed in the hope that it will be useful,
  5719. +    but WITHOUT ANY WARRANTY; without even the implied warranty of
  5720. +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  5721. +    Lesser General Public License for more details.
  5722. +
  5723. +    You should have received a copy of the GNU Lesser General Public
  5724. +    License along with this library; if not, write to the Free Software
  5725. +    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  5726. +
  5727. +    http://www.klauspost.com
  5728. +*/
  5729. +#ifndef ARI_DECODER_H
  5730. +#define ARI_DECODER_H
  5731. +
  5732. +#include "RawDecoder.h"
  5733. +
  5734. +namespace RawSpeed {
  5735. +
  5736. +class AriDecoder :
  5737. +  public RawDecoder
  5738. +{
  5739. +public:
  5740. +  AriDecoder(FileMap* file);
  5741. +  virtual ~AriDecoder(void);
  5742. +  virtual RawImage decodeRawInternal();
  5743. +  virtual void checkSupportInternal(CameraMetaData *meta);
  5744. +  virtual void decodeMetaDataInternal(CameraMetaData *meta);
  5745. +  virtual void decodeThreaded(RawDecoderThread * t);
  5746. +protected:
  5747. +  uint32 mWidth, mHeight, mIso;
  5748. +  string mModel;
  5749. +  string mEncoder;
  5750. +  uint32 mDataOffset, mDataSize;
  5751. +  float mWB[3];
  5752. +};
  5753. +
  5754. +} // namespace RawSpeed
  5755. +
  5756. +#endif
  5757. diff -urNr "darktable rawspeed/RawSpeed/ByteStream.cpp" rawspeed-develop/RawSpeed/ByteStream.cpp
  5758. --- "darktable rawspeed/RawSpeed/ByteStream.cpp"    2015-06-07 11:40:16.000000000 +0200
  5759. +++ rawspeed-develop/RawSpeed/ByteStream.cpp    2015-06-24 14:24:33.000000000 +0200
  5760. @@ -95,6 +95,17 @@
  5761.  //  _RPT1(0,"Skipped %u bytes.\n", c);
  5762.  }
  5763.  
  5764. +const char* ByteStream::getString() {
  5765. +  int start = off;
  5766. +  while (buffer[off] != 0x00) {
  5767. +    off++;
  5768. +    if (off >= size)
  5769. +      ThrowIOE("String not terminated inside rest of buffer");
  5770. +  }
  5771. +  off++;
  5772. +  return (const char*)&buffer[start];
  5773. +}
  5774. +
  5775.  float ByteStream::getFloat()
  5776.  {
  5777.    if (off + 4 > size)
  5778. @@ -103,6 +114,7 @@
  5779.    uchar8 *temp = (uchar8 *)&temp_f;
  5780.    for (int i = 0; i < 4; i++)
  5781.      temp[i] = buffer[off+i];
  5782. +  off+=4;
  5783.    return temp_f;
  5784.  }
  5785.  
  5786. diff -urNr "darktable rawspeed/RawSpeed/ByteStream.h" rawspeed-develop/RawSpeed/ByteStream.h
  5787. --- "darktable rawspeed/RawSpeed/ByteStream.h"  2015-06-07 11:40:16.000000000 +0200
  5788. +++ rawspeed-develop/RawSpeed/ByteStream.h  2015-06-24 14:24:33.000000000 +0200
  5789. @@ -45,6 +45,9 @@
  5790.    virtual int getInt();
  5791.    virtual uint32 getUInt();
  5792.    virtual float getFloat();
  5793. +  // Increments the stream to after the next zero byte and returns the bytes in between (not a copy).
  5794. +  // If the first byte is zero, stream is incremented one.
  5795. +  const char* getString();  
  5796.    void pushOffset() { offset_stack.push(off);}
  5797.    void popOffset();
  5798.  protected:
  5799. diff -urNr "darktable rawspeed/RawSpeed/Camera.cpp" rawspeed-develop/RawSpeed/Camera.cpp
  5800. --- "darktable rawspeed/RawSpeed/Camera.cpp"    2015-06-07 11:40:16.000000000 +0200
  5801. +++ rawspeed-develop/RawSpeed/Camera.cpp    2015-06-24 14:24:33.000000000 +0200
  5802. @@ -33,12 +33,14 @@
  5803.    pugi::xml_attribute key = camera.attribute("make");
  5804.    if (!key)
  5805.      ThrowCME("Camera XML Parser: \"make\" attribute not found.");
  5806. -  make = key.as_string();
  5807. +  make = canonical_make = key.as_string();
  5808.  
  5809.    key = camera.attribute("model");
  5810.    if (!key)
  5811.      ThrowCME("Camera XML Parser: \"model\" attribute not found.");
  5812. -  model = key.as_string();
  5813. +  model = canonical_model = canonical_alias = key.as_string();
  5814. +
  5815. +  canonical_id = make + " " + model;
  5816.  
  5817.    supported = true;
  5818.    key = camera.attribute("supported");
  5819. @@ -74,6 +76,10 @@
  5820.  
  5821.    make = camera->make;
  5822.    model = camera->aliases[alias_num];
  5823. +  canonical_make = camera->canonical_make;
  5824. +  canonical_model = camera->canonical_model;
  5825. +  canonical_alias = camera->canonical_aliases[alias_num];
  5826. +  canonical_id = camera->canonical_id;
  5827.    mode = camera->mode;
  5828.    cfa = camera->cfa;
  5829.    supported = camera->supported;
  5830. @@ -174,6 +180,11 @@
  5831.      }
  5832.      return;
  5833.    }
  5834. +
  5835. +  if (isTag(cur.name(), "ID")) {
  5836. +    parseID(cur);
  5837. +    return;
  5838. +  }
  5839.  }
  5840.  
  5841.  void Camera::parseCFA(xml_node &cur) {
  5842. @@ -286,6 +297,11 @@
  5843.  {
  5844.    if (isTag(cur.name(), "Alias")) {
  5845.      aliases.push_back(string(cur.first_child().value()));
  5846. +    pugi::xml_attribute key = cur.attribute("id");
  5847. +    if (key)
  5848. +      canonical_aliases.push_back(string(key.as_string()));
  5849. +    else
  5850. +      canonical_aliases.push_back(string(cur.first_child().value()));
  5851.    }
  5852.  }
  5853.  
  5854. @@ -309,6 +325,26 @@
  5855.    }
  5856.  }
  5857.  
  5858. +void Camera::parseID( xml_node &cur )
  5859. +{
  5860. +  if (isTag(cur.name(), "ID")) {
  5861. +    pugi::xml_attribute id_make = cur.attribute("make");
  5862. +    if (id_make) {
  5863. +      canonical_make = string(id_make.as_string());
  5864. +    } else
  5865. +      ThrowCME("CameraMetadata: Could not find make for ID for %s %s camera.", make.c_str(), model.c_str());
  5866. +
  5867. +    pugi::xml_attribute id_model = cur.attribute("model");
  5868. +    if (id_model) {
  5869. +      canonical_model = string(id_model.as_string());
  5870. +      canonical_alias = string(id_model.as_string());
  5871. +    } else
  5872. +      ThrowCME("CameraMetadata: Could not find model for ID for %s %s camera.", make.c_str(), model.c_str());
  5873. +
  5874. +    canonical_id = string(cur.first_child().value());
  5875. +  }
  5876. +}
  5877. +
  5878.  void Camera::parseSensorInfo( xml_node &cur )
  5879.  {
  5880.    int min_iso = cur.attribute("iso_min").as_int(0);
  5881. diff -urNr "darktable rawspeed/RawSpeed/Camera.h" rawspeed-develop/RawSpeed/Camera.h
  5882. --- "darktable rawspeed/RawSpeed/Camera.h"  2015-06-07 11:40:16.000000000 +0200
  5883. +++ rawspeed-develop/RawSpeed/Camera.h  2015-06-24 14:24:33.000000000 +0200
  5884. @@ -41,7 +41,12 @@
  5885.    string make;
  5886.    string model;
  5887.    string mode;
  5888. +  string canonical_make;
  5889. +  string canonical_model;
  5890. +  string canonical_alias;
  5891. +  string canonical_id;
  5892.    vector<string> aliases;
  5893. +  vector<string> canonical_aliases;
  5894.    ColorFilterArray cfa;
  5895.    bool supported;
  5896.    iPoint2D cropSize;
  5897. @@ -54,6 +59,7 @@
  5898.    void parseCFA( pugi::xml_node &node );
  5899.    void parseAlias( pugi::xml_node &node );
  5900.    void parseHint( pugi::xml_node &node );
  5901. +  void parseID( pugi::xml_node &node );
  5902.    void parseBlackAreas( pugi::xml_node &node );
  5903.    void parseSensorInfo( pugi::xml_node &node );
  5904.    vector<int> MultipleStringToInt(const char *in, const char *tag, const char* attribute);
  5905. diff -urNr "darktable rawspeed/RawSpeed/CrwDecoder.cpp" rawspeed-develop/RawSpeed/CrwDecoder.cpp
  5906. --- "darktable rawspeed/RawSpeed/CrwDecoder.cpp"    2015-06-07 11:40:16.000000000 +0200
  5907. +++ rawspeed-develop/RawSpeed/CrwDecoder.cpp    2015-06-24 14:24:33.000000000 +0200
  5908. @@ -218,7 +218,7 @@
  5909.      mHuff[n] = NULL;
  5910.    }
  5911.  
  5912. -  ushort16* huff = (ushort16 *) _aligned_malloc((1 + (1 << max)* sizeof(ushort16)), 16);
  5913. +  ushort16* huff = (ushort16 *) _aligned_malloc((1 + (1 << max)) * sizeof(ushort16), 16);
  5914.    
  5915.    if (!huff)
  5916.      ThrowRDE("CRW: Couldn't allocate table");
  5917. diff -urNr "darktable rawspeed/RawSpeed/DngDecoder.cpp" rawspeed-develop/RawSpeed/DngDecoder.cpp
  5918. --- "darktable rawspeed/RawSpeed/DngDecoder.cpp"    2015-06-07 11:40:16.000000000 +0200
  5919. +++ rawspeed-develop/RawSpeed/DngDecoder.cpp    2015-06-24 14:24:33.000000000 +0200
  5920. @@ -496,6 +496,7 @@
  5921.        mRaw->whitePoint = 65535;
  5922.      }
  5923.    }
  5924. +
  5925.    return mRaw;
  5926.  }
  5927.  
  5928. @@ -503,6 +504,33 @@
  5929.    if (mRootIFD->hasEntryRecursive(ISOSPEEDRATINGS))
  5930.      mRaw->metadata.isoSpeed = mRootIFD->getEntryRecursive(ISOSPEEDRATINGS)->getInt();
  5931.  
  5932. +  // Set the make and model
  5933. +  if (mRootIFD->hasEntryRecursive(MAKE) && mRootIFD->hasEntryRecursive(MODEL)) {
  5934. +    string make = mRootIFD->getEntryRecursive(MAKE)->getString();
  5935. +    string model = mRootIFD->getEntryRecursive(MODEL)->getString();
  5936. +    TrimSpaces(make);
  5937. +    TrimSpaces(model);
  5938. +    mRaw->metadata.make = make;
  5939. +    mRaw->metadata.model = model;
  5940. +
  5941. +    Camera *cam = meta->getCamera(make, model, "dng");
  5942. +    if (!cam) //Also look for non-DNG cameras in case it's a converted file
  5943. +      cam = meta->getCamera(make, model, "");
  5944. +    if (cam) {
  5945. +      mRaw->metadata.canonical_make = cam->canonical_make;
  5946. +      mRaw->metadata.canonical_model = cam->canonical_model;
  5947. +      mRaw->metadata.canonical_alias = cam->canonical_alias;
  5948. +      mRaw->metadata.canonical_id = cam->canonical_id;
  5949. +    } else {
  5950. +      mRaw->metadata.canonical_make = make;
  5951. +      mRaw->metadata.canonical_model = mRaw->metadata.canonical_alias = model;
  5952. +      if (mRootIFD->hasEntryRecursive(UNIQUECAMERAMODEL)) {
  5953. +        mRaw->metadata.canonical_id = mRootIFD->getEntryRecursive(UNIQUECAMERAMODEL)->getString();
  5954. +      } else {
  5955. +        mRaw->metadata.canonical_id = make + " " + model;
  5956. +      }
  5957. +    }
  5958. +  }
  5959.  }
  5960.  
  5961.  /* DNG Images are assumed to be decodable unless explicitly set so */
  5962. diff -urNr "darktable rawspeed/RawSpeed/LJpegPlain.cpp" rawspeed-develop/RawSpeed/LJpegPlain.cpp
  5963. --- "darktable rawspeed/RawSpeed/LJpegPlain.cpp"    2015-06-07 11:40:16.000000000 +0200
  5964. +++ rawspeed-develop/RawSpeed/LJpegPlain.cpp    2015-06-24 14:24:33.000000000 +0200
  5965. @@ -766,7 +766,6 @@
  5966.  #define COMPS 4
  5967.  
  5968.  void LJpegPlain::decodeScanLeft4Comps() {
  5969. -  uchar8 *draw = mRaw->getData();
  5970.    // First line
  5971.    HuffmanTable *dctbl1 = &huff[frame.compInfo[0].dcTblNo];
  5972.    HuffmanTable *dctbl2 = &huff[frame.compInfo[1].dcTblNo];
  5973. @@ -779,6 +778,7 @@
  5974.      mRaw->destroyData();
  5975.      mRaw->createData();
  5976.    }
  5977. +  uchar8 *draw = mRaw->getData();
  5978.  
  5979.    //Prepare slices (for CR2)
  5980.    uint32 slices = (uint32)slicesW.size() * (frame.h - skipY);
  5981. diff -urNr "darktable rawspeed/RawSpeed/MosDecoder.cpp" rawspeed-develop/RawSpeed/MosDecoder.cpp
  5982. --- "darktable rawspeed/RawSpeed/MosDecoder.cpp"    2015-06-07 11:40:16.000000000 +0200
  5983. +++ rawspeed-develop/RawSpeed/MosDecoder.cpp    2015-06-24 14:24:33.000000000 +0200
  5984. @@ -28,47 +28,32 @@
  5985.  MosDecoder::MosDecoder(TiffIFD *rootIFD, FileMap* file)  :
  5986.      RawDecoder(file), mRootIFD(rootIFD) {
  5987.    decoderVersion = 0;
  5988. +  black_level = 0;
  5989.  
  5990.    vector<TiffIFD*> data = mRootIFD->getIFDsWithTag(MAKE);
  5991.    if (!data.empty()) {
  5992. -    make = (const char *) data[0]->getEntry(MAKE)->getDataWrt();
  5993. -    model = (const char *) data[0]->getEntry(MODEL)->getDataWrt();
  5994. +    make = data[0]->getEntry(MAKE)->getString();
  5995. +    model = data[0]->getEntry(MODEL)->getString();
  5996.    } else {
  5997.      TiffEntry *xmp = mRootIFD->getEntryRecursive(XMP);
  5998.      if (!xmp)
  5999.        ThrowRDE("MOS Decoder: Couldn't find the XMP");
  6000. -
  6001. -    parseXMP(xmp);
  6002. +    string xmpText = xmp->getString();
  6003. +    make = getXMPTag(xmpText, "Make");
  6004. +    model = getXMPTag(xmpText, "Model");
  6005.    }
  6006.  }
  6007.  
  6008.  MosDecoder::~MosDecoder(void) {
  6009.  }
  6010.  
  6011. -void MosDecoder::parseXMP(TiffEntry *xmp) {
  6012. -  if (xmp->count <= 0)
  6013. -    ThrowRDE("MOS Decoder: Empty XMP");
  6014. -
  6015. -  uchar8 *xmpText = xmp->getDataWrt();
  6016. -  xmpText[xmp->count - 1] = 0; // Make sure the string is NUL terminated
  6017. -
  6018. -  char *makeEnd;
  6019. -  make = strstr((char *) xmpText, "<tiff:Make>");
  6020. -  makeEnd = strstr((char *) xmpText, "</tiff:Make>");
  6021. -  if (!make || !makeEnd)
  6022. -    ThrowRDE("MOS Decoder: Couldn't find the Make in the XMP");
  6023. -  make += 11; // Advance to the end of the start tag
  6024. -
  6025. -  char *modelEnd;
  6026. -  model = strstr((char *) xmpText, "<tiff:Model>");
  6027. -  modelEnd = strstr((char *) xmpText, "</tiff:Model>");
  6028. -  if (!model || !modelEnd)
  6029. -    ThrowRDE("MOS Decoder: Couldn't find the Model in the XMP");
  6030. -  model += 12; // Advance to the end of the start tag
  6031. -
  6032. -  // NUL terminate the strings in place
  6033. -  *makeEnd = 0;
  6034. -  *modelEnd = 0;
  6035. +string MosDecoder::getXMPTag(string xmp, string tag) {
  6036. +  string::size_type start = xmp.find("<tiff:"+tag+">");
  6037. +  string::size_type end = xmp.find("</tiff:"+tag+">");
  6038. +  if (start == string::npos || end == string::npos || end <= start)
  6039. +    ThrowRDE("MOS Decoder: Couldn't find tag '%s' in the XMP", tag.c_str());
  6040. +  int startlen = tag.size()+7;
  6041. +  return xmp.substr(start+startlen, end-start-startlen);
  6042.  }
  6043.  
  6044.  RawImage MosDecoder::decodeRawInternal() {
  6045. @@ -76,30 +61,47 @@
  6046.    TiffIFD* raw = NULL;
  6047.    uint32 off = 0;
  6048.  
  6049. -  const uchar8 *insideTiff = mFile->getData(8);
  6050. -  uint32 insideTiffHeader = *((uint32 *) insideTiff);
  6051. -  if (insideTiffHeader == 0x49494949) {
  6052. -    // We're inside a wacky phase_one tiff
  6053. -    //    0x108:  raw_width     = data;
  6054. -    //    0x109:  raw_height    = data;
  6055. -    //    0x10a:  left_margin   = data;
  6056. -    //    0x10b:  top_margin    = data;
  6057. -    //    0x10c:  width         = data;
  6058. -    //    0x10d:  height        = data;
  6059. -    //    0x10e:  ph1.format    = data;
  6060. -    //    0x10f:  data_offset   = data+base;
  6061. -    //    0x110:  meta_offset   = data+base;
  6062. -    //            meta_length   = len;
  6063. -    //    0x112:  ph1.key_off   = save - 4;
  6064. -    //    0x210:  ph1.tag_210   = int_to_float(data);
  6065. -    //    0x21a:  ph1.tag_21a   = data;
  6066. -    //    0x21c:  strip_offset  = data+base;
  6067. -    //    0x21d:  ph1.black     = data;
  6068. -    //    0x222:  ph1.split_col = data;
  6069. -    //    0x223:  ph1.black_col = data+base;
  6070. -    //    0x224:  ph1.split_row = data;
  6071. -    //    0x225:  ph1.black_row = data+base;
  6072. -    ThrowRDE("MOS Decoder: unfinished support for PhaseOneC encoding");
  6073. +  uint32 base = 8;
  6074. +  const uchar8 *insideTiff = mFile->getData(base);
  6075. +  if (get4LE(insideTiff, 0) == 0x49494949) {
  6076. +    uint32 offset = get4LE(insideTiff, 8);
  6077. +    if (offset+base+4 > mFile->getSize())
  6078. +      ThrowRDE("MOS: PhaseOneC offset out of bounds");
  6079. +
  6080. +    uint32 entries = get4LE(insideTiff, offset);
  6081. +    uint32 pos = 8; // Skip another 4 bytes
  6082. +
  6083. +    uint32 width=0, height=0, strip_offset=0, data_offset=0;
  6084. +    while (entries--) {
  6085. +      if (offset+base+pos+16 > mFile->getSize())
  6086. +        ThrowRDE("MOS: PhaseOneC offset out of bounds");
  6087. +
  6088. +      uint32 tag  = get4LE(insideTiff, offset+pos);
  6089. +      //uint32 type = get4LE(insideTiff, offset+pos+4);
  6090. +      //uint32 len  = get4LE(insideTiff, offset+pos+8);
  6091. +      uint32 data = get4LE(insideTiff, offset+pos+12);
  6092. +      pos += 16;
  6093. +      switch(tag) {
  6094. +      case 0x108: width        = data;      break;
  6095. +      case 0x109: height       = data;      break;
  6096. +      case 0x10f: data_offset  = data+base; break;
  6097. +      case 0x21c: strip_offset = data+base; break;
  6098. +      case 0x21d: black_level  = data>>2;   break;
  6099. +      }
  6100. +    }
  6101. +    if (width <= 0 || height <= 0)
  6102. +      ThrowRDE("MOS: PhaseOneC couldn't find width and height");
  6103. +    if (strip_offset+height*4 > mFile->getSize())
  6104. +      ThrowRDE("MOS: PhaseOneC strip offsets out of bounds");
  6105. +    if (data_offset > mFile->getSize())
  6106. +      ThrowRDE("MOS: PhaseOneC data offset out of bounds");
  6107. +
  6108. +    mRaw->dim = iPoint2D(width, height);
  6109. +    mRaw->createData();
  6110. +
  6111. +    DecodePhaseOneC(data_offset, strip_offset, width, height);
  6112. +
  6113. +    return mRaw;
  6114.    } else {
  6115.      data = mRootIFD->getIFDsWithTag(TILEOFFSETS);
  6116.      if (!data.empty()) {
  6117. @@ -117,11 +119,10 @@
  6118.    
  6119.    uint32 width = raw->getEntry(IMAGEWIDTH)->getInt();
  6120.    uint32 height = raw->getEntry(IMAGELENGTH)->getInt();
  6121. -
  6122.    mRaw->dim = iPoint2D(width, height);
  6123.    mRaw->createData();
  6124. -  ByteStream input(mFile->getData(off), mFile->getSize()-off);
  6125.  
  6126. +  ByteStream input(mFile->getData(off), mFile->getSize()-off);
  6127.    int compression = raw->getEntry(COMPRESSION)->getInt();
  6128.    if (1 == compression) {
  6129.      if (mRootIFD->endian == big)
  6130. @@ -139,62 +140,34 @@
  6131.    return mRaw;
  6132.  }
  6133.  
  6134. -void MosDecoder::DecodePhaseOneC(ByteStream &input, uint32 width, uint32 height)
  6135. +void MosDecoder::DecodePhaseOneC(uint32 data_offset, uint32 strip_offset, uint32 width, uint32 height)
  6136.  {
  6137. -//  static const int length[] = { 8,7,6,9,11,10,5,12,14,13 };
  6138. -//  int *offset, len[2], pred[2], row, col, i, j;
  6139. -//  ushort *pixel;
  6140. -//  short (*cblack)[2], (*rblack)[2];
  6141. -
  6142. -//  pixel = (ushort *) calloc (width*3 + height*4, 2);
  6143. -//  //merror (pixel, "phase_one_load_raw_c()");
  6144. -//  offset = (int *) (pixel + width);
  6145. -
  6146. -//  fseek (ifp, strip_offset, SEEK_SET);
  6147. -
  6148. -//  for (row=0; row < raw_height; row++)
  6149. -//    offset[row] = get4();
  6150. -//  cblack = (short (*)[2]) (offset + raw_height);
  6151. -//  fseek (ifp, ph1.black_col, SEEK_SET);
  6152. -//  if (ph1.black_col)
  6153. -//    read_shorts ((ushort *) cblack[0], raw_height*2);
  6154. -//  rblack = cblack + raw_height;
  6155. -//  fseek (ifp, ph1.black_row, SEEK_SET);
  6156. -//  if (ph1.black_row)
  6157. -//    read_shorts ((ushort *) rblack[0], raw_width*2);
  6158. -//  for (i=0; i < 256; i++)
  6159. -//    curve[i] = i*i / 3.969 + 0.5;
  6160. -//  for (row=0; row < raw_height; row++) {
  6161. -//    fseek (ifp, data_offset + offset[row], SEEK_SET);
  6162. -//    ph1_bits(-1);
  6163. -//    pred[0] = pred[1] = 0;
  6164. -//    for (col=0; col < raw_width; col++) {
  6165. -//      if (col >= (raw_width & -8))
  6166. -//        len[0] = len[1] = 14;
  6167. -//      else if ((col & 7) == 0)
  6168. -//        for (i=0; i < 2; i++) {
  6169. -//          for (j=0; j < 5 && !ph1_bits(1); j++);
  6170. -//          if (j--) len[i] = length[j*2 + ph1_bits(1)];
  6171. -//        }
  6172. -//      if ((i = len[col & 1]) == 14)
  6173. -//        pixel[col] = pred[col & 1] = ph1_bits(16);
  6174. -//      else
  6175. -//        pixel[col] = pred[col & 1] += ph1_bits(i) + 1 - (1 << (i - 1));
  6176. -//      if (pred[col & 1] >> 16) derror();
  6177. -//      if (ph1.format == 5 && pixel[col] < 256)
  6178. -//        pixel[col] = curve[pixel[col]];
  6179. -//    }
  6180. -//    for (col=0; col < raw_width; col++) {
  6181. -//      i = (pixel[col] << 2) - ph1.black
  6182. -//        + cblack[row][col >= ph1.split_col]
  6183. -//        + rblack[col][row >= ph1.split_row];
  6184. -//      if (i > 0) RAW(row,col) = i;
  6185. -//    }
  6186. -//  }
  6187. -//  free (pixel);
  6188. -//  maximum = 0xfffc - ph1.black;
  6189. -}
  6190. +  const int length[] = { 8,7,6,9,11,10,5,12,14,13 };
  6191.  
  6192. +  for (uint32 row=0; row < height; row++) {
  6193. +    uint32 off = data_offset + get4LE(mFile->getData(strip_offset), row*4);
  6194. +
  6195. +    BitPumpMSB32 pump(mFile->getData(off),mFile->getSize()-off);
  6196. +    uint32 pred[2], len[2];
  6197. +    pred[0] = pred[1] = 0;
  6198. +    ushort16* img = (ushort16*)mRaw->getData(0, row);
  6199. +    for (uint32 col=0; col < width; col++) {
  6200. +      if (col >= (width & -8))
  6201. +        len[0] = len[1] = 14;
  6202. +      else if ((col & 7) == 0)
  6203. +        for (uint32 i=0; i < 2; i++) {
  6204. +          uint32 j = 0;
  6205. +          for (; j < 5 && !pump.getBitsSafe(1); j++);
  6206. +          if (j--) len[i] = length[j*2 + pump.getBitsSafe(1)];
  6207. +        }
  6208. +      int i = len[col & 1];
  6209. +      if (i == 14)
  6210. +        img[col] = pred[col & 1] = pump.getBitsSafe(16);
  6211. +      else
  6212. +        img[col] = pred[col & 1] += pump.getBitsSafe(i) + 1 - (1 << (i - 1));
  6213. +    }
  6214. +  }
  6215. +}
  6216.  
  6217.  void MosDecoder::checkSupportInternal(CameraMetaData *meta) {
  6218.    this->checkCameraSupported(meta, make, model, "");
  6219. @@ -206,22 +179,27 @@
  6220.    // Fetch the white balance (see dcraw.c parse_mos for more metadata that can be gotten)
  6221.    if (mRootIFD->hasEntryRecursive(LEAFMETADATA)) {
  6222.      TiffEntry *meta = mRootIFD->getEntryRecursive(LEAFMETADATA);
  6223. -    char *text = (char *) meta->getDataWrt();
  6224. +    uchar8 *buffer = meta->getDataWrt();
  6225.      uint32 size = meta->count;
  6226. -    text[size-1] = 0; //Make sure the data is NUL terminated so that scanf never reads beyond limits
  6227. +    //Make sure the data is NUL terminated so that scanf never reads beyond limits
  6228. +    //This is not a string though, it will have other NUL's in the middle
  6229. +    buffer[size-1] = 0;
  6230.  
  6231.      // dcraw does actual parsing, since we just want one field we bruteforce it
  6232. -    char *neutobj = (char *) memmem(text, size, "NeutObj_neutrals", 16);
  6233. -    if (neutobj) {
  6234. +    uchar8 *neutobj = (uchar8 *) memmem(buffer, size, "NeutObj_neutrals", 16);
  6235. +    if (neutobj && neutobj+44 < buffer+size) {
  6236.        uint32 tmp[4] = {0};
  6237.        sscanf((const char *)neutobj+44, "%u %u %u %u", &tmp[0], &tmp[1], &tmp[2], &tmp[3]);
  6238. -      mRaw->metadata.wbCoeffs[0] = (float) tmp[0]/tmp[1];
  6239. -      mRaw->metadata.wbCoeffs[1] = (float) tmp[0]/tmp[2];
  6240. -      mRaw->metadata.wbCoeffs[2] = (float) tmp[0]/tmp[3];
  6241. +      if (tmp[0] > 0 && tmp[1] > 0 && tmp[2] > 0 && tmp[3] > 0) {
  6242. +        mRaw->metadata.wbCoeffs[0] = (float) tmp[0]/tmp[1];
  6243. +        mRaw->metadata.wbCoeffs[1] = (float) tmp[0]/tmp[2];
  6244. +        mRaw->metadata.wbCoeffs[2] = (float) tmp[0]/tmp[3];
  6245. +      }
  6246.      }
  6247. -    if (text)
  6248. -      delete text;
  6249.    }
  6250. +
  6251. +  if (black_level)
  6252. +    mRaw->blackLevel = black_level;
  6253.  }
  6254.  
  6255.  } // namespace RawSpeed
  6256. diff -urNr "darktable rawspeed/RawSpeed/MosDecoder.h" rawspeed-develop/RawSpeed/MosDecoder.h
  6257. --- "darktable rawspeed/RawSpeed/MosDecoder.h"  2015-06-07 11:40:16.000000000 +0200
  6258. +++ rawspeed-develop/RawSpeed/MosDecoder.h  2015-06-24 14:24:33.000000000 +0200
  6259. @@ -39,10 +39,11 @@
  6260.    virtual void checkSupportInternal(CameraMetaData *meta);
  6261.    virtual void decodeMetaDataInternal(CameraMetaData *meta);
  6262.  protected:
  6263. +  uint32 black_level;
  6264.    TiffIFD *mRootIFD;
  6265. -  const char *make, *model;
  6266. -  void parseXMP(TiffEntry *xmp);
  6267. -  void DecodePhaseOneC(ByteStream &input, uint32 width, uint32 height);
  6268. +  string make, model;
  6269. +  string getXMPTag(string xmp, string tag);
  6270. +  void DecodePhaseOneC(uint32 data_offset, uint32 strip_offset, uint32 width, uint32 height);
  6271.  };
  6272.  
  6273.  } // namespace RawSpeed
  6274. diff -urNr "darktable rawspeed/RawSpeed/MrwDecoder.cpp" rawspeed-develop/RawSpeed/MrwDecoder.cpp
  6275. --- "darktable rawspeed/RawSpeed/MrwDecoder.cpp"    2015-06-07 11:40:16.000000000 +0200
  6276. +++ rawspeed-develop/RawSpeed/MrwDecoder.cpp    2015-06-24 14:24:33.000000000 +0200
  6277. @@ -27,10 +27,13 @@
  6278.  
  6279.  MrwDecoder::MrwDecoder(FileMap* file) :
  6280.      RawDecoder(file) {
  6281. +  tiff_meta = NULL;
  6282.    parseHeader();
  6283.  }
  6284.  
  6285.  MrwDecoder::~MrwDecoder(void) {
  6286. +  if (tiff_meta)
  6287. +    delete tiff_meta;
  6288.  }
  6289.  
  6290.  int MrwDecoder::isMRW(FileMap* input) {
  6291. @@ -40,23 +43,6 @@
  6292.    const uchar8* data = input->getData(0);
  6293.    return data[0] == 0x00 && data[1] == 0x4D && data[2] == 0x52 && data[3] == 0x4D;
  6294.  }
  6295. -                        
  6296. -/* This table includes all cameras that have ever had official MRW raw support.
  6297. -   There were also a few compacts (G400, G500, G530 and G600) that had a raw
  6298. -   mode in a hidden menu with MRW format written to JPG named files. It should
  6299. -   be easy to support them given example files but chances are it was more of a
  6300. -   novelty than something people actually used. */
  6301. -static mrw_camera_t mrw_camera_table[] = {
  6302. -  {"27820001", "DIMAGE A1"},
  6303. -  {"27200001", "DIMAGE A2"},
  6304. -  {"27470002", "DIMAGE A200"},
  6305. -  {"27730001", "DIMAGE 5"},
  6306. -  {"27660001", "DIMAGE 7"},
  6307. -  {"27790001", "DIMAGE 7I"},
  6308. -  {"27780001", "DIMAGE 7HI"},
  6309. -  {"21810002", "DYNAX 7D"},
  6310. -  {"21860002", "DYNAX 5D"},
  6311. -};
  6312.  
  6313.  void MrwDecoder::parseHeader() {
  6314.    const unsigned char* data = mFile->getData(0);
  6315. @@ -68,27 +54,39 @@
  6316.      ThrowRDE("This isn't actually a MRW file, why are you calling me?");
  6317.      
  6318.    data_offset = get4BE(data,4)+8;
  6319. -  
  6320. -  // Let's just get all we need from the PRD block and be done with it
  6321. -  raw_height = get2BE(data,24);
  6322. -  raw_width = get2BE(data,26);
  6323. -  packed = (data[32] == 12);
  6324. -  cameraid = get8LE(data,16);
  6325. -  cameraName = modelName(cameraid);
  6326. -  if (!cameraName) {
  6327. -    uchar8 cameracode[9] = {0};
  6328. -    *((uint64 *) cameracode) = cameraid;
  6329. -    ThrowRDE("MRW decoder: Unknown camera with ID %s", cameracode);
  6330. -  }
  6331. -}
  6332.  
  6333. -const char* MrwDecoder::modelName(uint64 cameraid) {
  6334. -  for (uint32 i=0; i<sizeof(mrw_camera_table)/sizeof(mrw_camera_table[0]); i++) {
  6335. -    if (*((uint64*) mrw_camera_table[i].code) == cameraid) {
  6336. -        return mrw_camera_table[i].name;
  6337. +  if (!mFile->isValid(data_offset))
  6338. +    ThrowRDE("MRW: Data offset is invalid");
  6339. +
  6340. +  // Make sure all values have at least been initialized
  6341. +  raw_width = raw_height = packed = 0;
  6342. +  wb_coeffs[0] = wb_coeffs[1] = wb_coeffs[2] = wb_coeffs[3] = NAN;
  6343. +
  6344. +  uint32 currpos = 8;
  6345. +  while (currpos < data_offset) {
  6346. +    uint32 tag = get4BE(data,currpos);
  6347. +    uint32 len = get4BE(data,currpos+4);
  6348. +    switch(tag) {
  6349. +    case 0x505244: // PRD
  6350. +      raw_height = get2BE(data,currpos+16);
  6351. +      raw_width = get2BE(data,currpos+18);
  6352. +      packed = (data[currpos+24] == 12);
  6353. +    case 0x574247: // WBG
  6354. +      for(uint32 i=0; i<4; i++)
  6355. +        wb_coeffs[i] = (float)get2BE(data, currpos+12+i*2);
  6356. +      break;
  6357. +    case 0x545457: // TTW
  6358. +      // Base value for offsets needs to be at the beginning of the TIFF block, not the file
  6359. +      FileMap *f = new FileMap(mFile->getDataWrt(currpos+8), mFile->getSize()-currpos-8);
  6360. +      if (little == getHostEndianness())
  6361. +        tiff_meta = new TiffIFDBE(f, 8);
  6362. +      else
  6363. +        tiff_meta = new TiffIFD(f, 8);
  6364. +      delete f;
  6365. +      break;
  6366.      }
  6367. +    currpos += MAX(len+8,1); // MAX(,1) to make sure we make progress
  6368.    }
  6369. -  return NULL;
  6370.  }
  6371.  
  6372.  RawImage MrwDecoder::decodeRawInternal() {
  6373. @@ -123,35 +121,34 @@
  6374.  }
  6375.  
  6376.  void MrwDecoder::checkSupportInternal(CameraMetaData *meta) {
  6377. -  this->checkCameraSupported(meta, "MINOLTA", cameraName, "");
  6378. +  if (!tiff_meta->hasEntry(MAKE) || !tiff_meta->hasEntry(MODEL))
  6379. +    ThrowRDE("MRW: Couldn't find make and model");
  6380. +
  6381. +  string make = tiff_meta->getEntry(MAKE)->getString();
  6382. +  string model = tiff_meta->getEntry(MODEL)->getString();
  6383. +  this->checkCameraSupported(meta, make, model, "");
  6384.  }
  6385.  
  6386.  void MrwDecoder::decodeMetaDataInternal(CameraMetaData *meta) {
  6387.    //Default
  6388.    int iso = 0;
  6389.  
  6390. -  setMetaData(meta, "MINOLTA", cameraName, "", iso);
  6391. +  if (!tiff_meta->hasEntry(MAKE) || !tiff_meta->hasEntry(MODEL))
  6392. +    ThrowRDE("MRW: Couldn't find make and model");
  6393.  
  6394. -  uint32 currpos = 8;
  6395. -  const unsigned char* data = mFile->getData(0);
  6396. -  while (currpos < data_offset) {
  6397. -    uint32 tag = get4BE(data,currpos);
  6398. -    uint32 len = get4BE(data,currpos+4);
  6399. -    if (tag == 0x574247) { /* WBG */
  6400. -      ushort16 tmp[4];
  6401. -      for(uint32 i=0; i<4; i++)
  6402. -        tmp[i] = get2BE(data, currpos+12+i*2);
  6403. -      if (!strcmp(cameraName,"DIMAGE A200")) {
  6404. -        mRaw->metadata.wbCoeffs[0] = (float) tmp[2];
  6405. -        mRaw->metadata.wbCoeffs[1] = (float) tmp[0];
  6406. -        mRaw->metadata.wbCoeffs[2] = (float) tmp[1];
  6407. -      } else {
  6408. -        mRaw->metadata.wbCoeffs[0] = (float) tmp[0];
  6409. -        mRaw->metadata.wbCoeffs[1] = (float) tmp[1];
  6410. -        mRaw->metadata.wbCoeffs[2] = (float) tmp[3];
  6411. -      }
  6412. -    }
  6413. -    currpos += MAX(len+8,1); // MAX(,1) to make sure we make progress
  6414. +  string make = tiff_meta->getEntry(MAKE)->getString();
  6415. +  string model = tiff_meta->getEntry(MODEL)->getString();
  6416. +
  6417. +  setMetaData(meta, make, model, "", iso);
  6418. +
  6419. +  if (hints.find("swapped_wb") != hints.end()) {
  6420. +    mRaw->metadata.wbCoeffs[0] = (float) wb_coeffs[2];
  6421. +    mRaw->metadata.wbCoeffs[1] = (float) wb_coeffs[0];
  6422. +    mRaw->metadata.wbCoeffs[2] = (float) wb_coeffs[1];
  6423. +  } else {
  6424. +    mRaw->metadata.wbCoeffs[0] = (float) wb_coeffs[0];
  6425. +    mRaw->metadata.wbCoeffs[1] = (float) wb_coeffs[1];
  6426. +    mRaw->metadata.wbCoeffs[2] = (float) wb_coeffs[3];
  6427.    }
  6428.  }
  6429.  
  6430. diff -urNr "darktable rawspeed/RawSpeed/MrwDecoder.h" rawspeed-develop/RawSpeed/MrwDecoder.h
  6431. --- "darktable rawspeed/RawSpeed/MrwDecoder.h"  2015-06-07 11:40:16.000000000 +0200
  6432. +++ rawspeed-develop/RawSpeed/MrwDecoder.h  2015-06-24 14:24:33.000000000 +0200
  6433. @@ -24,6 +24,7 @@
  6434.  #define MRW_DECODER_H
  6435.  
  6436.  #include "RawDecoder.h"
  6437. +#include "TiffIFDBE.h"
  6438.  
  6439.  namespace RawSpeed {
  6440.  
  6441. @@ -45,9 +46,8 @@
  6442.  protected:
  6443.    virtual void parseHeader();
  6444.    uint32 raw_width, raw_height, data_offset, packed;
  6445. -  uint64 cameraid;
  6446. -  const char* cameraName;
  6447. -  static const char* modelName(uint64 cameraid);
  6448. +  TiffIFD *tiff_meta;
  6449. +  float wb_coeffs[4];
  6450.  };
  6451.  
  6452.  } // namespace RawSpeed
  6453. diff -urNr "darktable rawspeed/RawSpeed/pugixml.cpp" rawspeed-develop/RawSpeed/pugixml.cpp
  6454. --- "darktable rawspeed/RawSpeed/pugixml.cpp"   2015-06-07 11:40:16.000000000 +0200
  6455. +++ rawspeed-develop/RawSpeed/pugixml.cpp   2015-06-24 14:24:33.000000000 +0200
  6456. @@ -22,9 +22,9 @@
  6457.  #include <stdlib.h>
  6458.  #include <stdio.h>
  6459.  #include <string.h>
  6460. -#include <assert.h>
  6461.  #include <wchar.h>
  6462.  */
  6463. +#include <assert.h>
  6464.  #ifndef PUGIXML_NO_XPATH
  6465.  #  include <math.h>
  6466.  #  include <float.h>
  6467. diff -urNr "darktable rawspeed/RawSpeed/RafDecoder.cpp" rawspeed-develop/RawSpeed/RafDecoder.cpp
  6468. --- "darktable rawspeed/RawSpeed/RafDecoder.cpp"    2015-06-07 11:40:16.000000000 +0200
  6469. +++ rawspeed-develop/RawSpeed/RafDecoder.cpp    2015-06-24 14:24:33.000000000 +0200
  6470. @@ -216,6 +216,12 @@
  6471.    mRaw->whitePoint = sensor->mWhiteLevel;
  6472.    mRaw->blackAreas = cam->blackAreas;
  6473.    mRaw->cfa = cam->cfa;
  6474. +  mRaw->metadata.canonical_make = cam->canonical_make;
  6475. +  mRaw->metadata.canonical_model = cam->canonical_model;
  6476. +  mRaw->metadata.canonical_alias = cam->canonical_alias;
  6477. +  mRaw->metadata.canonical_id = cam->canonical_id;
  6478. +  mRaw->metadata.make = make;
  6479. +  mRaw->metadata.model = model;
  6480.  
  6481.    if (mRootIFD->hasEntryRecursive(FUJI_WB_GRBLEVELS)) {
  6482.      TiffEntry *wb = mRootIFD->getEntryRecursive(FUJI_WB_GRBLEVELS);
  6483. diff -urNr "darktable rawspeed/RawSpeed/RawDecoder.cpp" rawspeed-develop/RawSpeed/RawDecoder.cpp
  6484. --- "darktable rawspeed/RawSpeed/RawDecoder.cpp"    2015-06-07 11:40:16.000000000 +0200
  6485. +++ rawspeed-develop/RawSpeed/RawDecoder.cpp    2015-06-24 14:24:33.000000000 +0200
  6486. @@ -511,6 +511,14 @@
  6487.    }
  6488.  
  6489.    mRaw->cfa = cam->cfa;
  6490. +  mRaw->metadata.canonical_make = cam->canonical_make;
  6491. +  mRaw->metadata.canonical_model = cam->canonical_model;
  6492. +  mRaw->metadata.canonical_alias = cam->canonical_alias;
  6493. +  mRaw->metadata.canonical_id = cam->canonical_id;
  6494. +  mRaw->metadata.make = make;
  6495. +  mRaw->metadata.model = model;
  6496. +  mRaw->metadata.mode = mode;
  6497. +
  6498.    if (applyCrop) {
  6499.      iPoint2D new_size = cam->cropSize;
  6500.  
  6501. diff -urNr "darktable rawspeed/RawSpeed/RawImage.cpp" rawspeed-develop/RawSpeed/RawImage.cpp
  6502. --- "darktable rawspeed/RawSpeed/RawImage.cpp"  2015-06-07 11:40:16.000000000 +0200
  6503. +++ rawspeed-develop/RawSpeed/RawImage.cpp  2015-06-24 14:24:33.000000000 +0200
  6504. @@ -412,13 +412,6 @@
  6505.      memset(getData(area.getLeft(),y), val, area.getWidth() * bpp);
  6506.  }
  6507.  
  6508. -RawImageData* RawImage::operator->() {
  6509. -  return p_;
  6510. -}
  6511. -
  6512. -RawImageData& RawImage::operator*() {
  6513. -  return *p_;
  6514. -}
  6515.  
  6516.  RawImage& RawImage::operator=(const RawImage & p) {
  6517.    if (this == &p)      // Same object?
  6518. diff -urNr "darktable rawspeed/RawSpeed/RawImage.h" rawspeed-develop/RawSpeed/RawImage.h
  6519. --- "darktable rawspeed/RawSpeed/RawImage.h"    2015-06-07 11:40:16.000000000 +0200
  6520. +++ rawspeed-develop/RawSpeed/RawImage.h    2015-06-24 14:24:33.000000000 +0200
  6521. @@ -84,6 +84,11 @@
  6522.    string model;
  6523.    string mode;
  6524.  
  6525. +  string canonical_make;
  6526. +  string canonical_model;
  6527. +  string canonical_alias;
  6528. +  string canonical_id;
  6529. +
  6530.    // ISO speed. If known the value is set, otherwise it will be '0'.
  6531.    int isoSpeed;
  6532.  
  6533. @@ -202,8 +207,8 @@
  6534.   public:
  6535.     static RawImage create(RawImageType type = TYPE_USHORT16);
  6536.     static RawImage create(iPoint2D dim, RawImageType type = TYPE_USHORT16, uint32 componentsPerPixel = 1);
  6537. -   RawImageData* operator-> ();
  6538. -   RawImageData& operator* ();
  6539. +   RawImageData* operator-> (){ return p_; };
  6540. +   RawImageData& operator* (){ return *p_; };
  6541.     RawImage(RawImageData* p);  // p must not be NULL
  6542.    ~RawImage();
  6543.     RawImage(const RawImage& p);
  6544. diff -urNr "darktable rawspeed/RawSpeed/RawParser.cpp" rawspeed-develop/RawSpeed/RawParser.cpp
  6545. --- "darktable rawspeed/RawSpeed/RawParser.cpp" 2015-06-07 11:40:16.000000000 +0200
  6546. +++ rawspeed-develop/RawSpeed/RawParser.cpp 2015-06-24 14:24:33.000000000 +0200
  6547. @@ -5,6 +5,7 @@
  6548.  #include "CiffParserException.h"
  6549.  #include "CiffParser.h"
  6550.  #include "X3fParser.h"
  6551. +#include "AriDecoder.h"
  6552.  #include "ByteStreamSwap.h"
  6553.  #include "TiffEntryBE.h"
  6554.  #include "MrwDecoder.h"
  6555. @@ -56,6 +57,13 @@
  6556.      } catch (RawDecoderException) {
  6557.      }
  6558.    }
  6559. +
  6560. +  if (0 == memcmp(&data[0], "ARRI\x12\x34\x56\x78", 8)) {
  6561. +    try {
  6562. +      return new AriDecoder(mInput);
  6563. +    } catch (RawDecoderException) {
  6564. +    }
  6565. +  }
  6566.  
  6567.    // FUJI has pointers to IFD's at fixed byte offsets
  6568.    // So if camera is FUJI, we cannot use ordinary TIFF parser
  6569. diff -urNr "darktable rawspeed/RawSpeed/RawSpeed.vcproj" rawspeed-develop/RawSpeed/RawSpeed.vcproj
  6570. --- "darktable rawspeed/RawSpeed/RawSpeed.vcproj"   1970-01-01 01:00:00.000000000 +0100
  6571. +++ rawspeed-develop/RawSpeed/RawSpeed.vcproj   2015-06-24 14:24:33.000000000 +0200
  6572. @@ -0,0 +1,813 @@
  6573. +<?xml version="1.0" encoding="Windows-1252"?>
  6574. +<VisualStudioProject
  6575. +   ProjectType="Visual C++"
  6576. +   Version="8.00"
  6577. +   Name="RawSpeed"
  6578. +   ProjectGUID="{482A0ABF-1AE3-4EE4-815A-428880DAE0C6}"
  6579. +   RootNamespace="CR2reader"
  6580. +   Keyword="Win32Proj"
  6581. +   >
  6582. +   <Platforms>
  6583. +       <Platform
  6584. +           Name="Win32"
  6585. +       />
  6586. +   </Platforms>
  6587. +   <ToolFiles>
  6588. +   </ToolFiles>
  6589. +   <Configurations>
  6590. +       <Configuration
  6591. +           Name="Debug|Win32"
  6592. +           OutputDirectory="$(SolutionDir)$(ConfigurationName)"
  6593. +           IntermediateDirectory="$(ConfigurationName)"
  6594. +           ConfigurationType="1"
  6595. +           CharacterSet="1"
  6596. +           >
  6597. +           <Tool
  6598. +               Name="VCPreBuildEventTool"
  6599. +           />
  6600. +           <Tool
  6601. +               Name="VCCustomBuildTool"
  6602. +           />
  6603. +           <Tool
  6604. +               Name="VCXMLDataGeneratorTool"
  6605. +           />
  6606. +           <Tool
  6607. +               Name="VCWebServiceProxyGeneratorTool"
  6608. +           />
  6609. +           <Tool
  6610. +               Name="VCMIDLTool"
  6611. +           />
  6612. +           <Tool
  6613. +               Name="VCCLCompilerTool"
  6614. +               Optimization="0"
  6615. +               AdditionalIncludeDirectories="..\include;..\include\libjpeg"
  6616. +               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
  6617. +               MinimalRebuild="true"
  6618. +               BasicRuntimeChecks="3"
  6619. +               RuntimeLibrary="1"
  6620. +               UsePrecompiledHeader="2"
  6621. +               WarningLevel="3"
  6622. +               Detect64BitPortabilityProblems="true"
  6623. +               DebugInformationFormat="4"
  6624. +           />
  6625. +           <Tool
  6626. +               Name="VCManagedResourceCompilerTool"
  6627. +           />
  6628. +           <Tool
  6629. +               Name="VCResourceCompilerTool"
  6630. +           />
  6631. +           <Tool
  6632. +               Name="VCPreLinkEventTool"
  6633. +           />
  6634. +           <Tool
  6635. +               Name="VCLinkerTool"
  6636. +               AdditionalDependencies="kernel32.lib $(NoInherit) User32.lib pthreadVC2.lib turbojpeg-static.lib"
  6637. +               LinkIncremental="2"
  6638. +               AdditionalLibraryDirectories="..\lib"
  6639. +               IgnoreAllDefaultLibraries="false"
  6640. +               IgnoreDefaultLibraryNames="libcmt.lib;msvcrtd.lib"
  6641. +               GenerateDebugInformation="true"
  6642. +               SubSystem="1"
  6643. +               TargetMachine="1"
  6644. +           />
  6645. +           <Tool
  6646. +               Name="VCALinkTool"
  6647. +           />
  6648. +           <Tool
  6649. +               Name="VCManifestTool"
  6650. +           />
  6651. +           <Tool
  6652. +               Name="VCXDCMakeTool"
  6653. +           />
  6654. +           <Tool
  6655. +               Name="VCBscMakeTool"
  6656. +           />
  6657. +           <Tool
  6658. +               Name="VCFxCopTool"
  6659. +           />
  6660. +           <Tool
  6661. +               Name="VCAppVerifierTool"
  6662. +           />
  6663. +           <Tool
  6664. +               Name="VCWebDeploymentTool"
  6665. +           />
  6666. +           <Tool
  6667. +               Name="VCPostBuildEventTool"
  6668. +           />
  6669. +       </Configuration>
  6670. +       <Configuration
  6671. +           Name="Release|Win32"
  6672. +           OutputDirectory="$(SolutionDir)$(ConfigurationName)"
  6673. +           IntermediateDirectory="$(ConfigurationName)"
  6674. +           ConfigurationType="1"
  6675. +           CharacterSet="1"
  6676. +           WholeProgramOptimization="1"
  6677. +           >
  6678. +           <Tool
  6679. +               Name="VCPreBuildEventTool"
  6680. +           />
  6681. +           <Tool
  6682. +               Name="VCCustomBuildTool"
  6683. +           />
  6684. +           <Tool
  6685. +               Name="VCXMLDataGeneratorTool"
  6686. +           />
  6687. +           <Tool
  6688. +               Name="VCWebServiceProxyGeneratorTool"
  6689. +           />
  6690. +           <Tool
  6691. +               Name="VCMIDLTool"
  6692. +           />
  6693. +           <Tool
  6694. +               Name="VCCLCompilerTool"
  6695. +               Optimization="2"
  6696. +               InlineFunctionExpansion="2"
  6697. +               EnableIntrinsicFunctions="true"
  6698. +               FavorSizeOrSpeed="1"
  6699. +               OmitFramePointers="false"
  6700. +               EnableFiberSafeOptimizations="true"
  6701. +               WholeProgramOptimization="false"
  6702. +               AdditionalIncludeDirectories="..\include;..\include\libjpeg"
  6703. +               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
  6704. +               RuntimeLibrary="0"
  6705. +               BufferSecurityCheck="true"
  6706. +               EnableEnhancedInstructionSet="1"
  6707. +               FloatingPointModel="2"
  6708. +               UsePrecompiledHeader="2"
  6709. +               AssemblerOutput="2"
  6710. +               WarningLevel="3"
  6711. +               Detect64BitPortabilityProblems="true"
  6712. +               DebugInformationFormat="3"
  6713. +           />
  6714. +           <Tool
  6715. +               Name="VCManagedResourceCompilerTool"
  6716. +           />
  6717. +           <Tool
  6718. +               Name="VCResourceCompilerTool"
  6719. +           />
  6720. +           <Tool
  6721. +               Name="VCPreLinkEventTool"
  6722. +           />
  6723. +           <Tool
  6724. +               Name="VCLinkerTool"
  6725. +               AdditionalDependencies="kernel32.lib $(NoInherit) User32.lib pthreadVC2.lib turbojpeg-static.lib"
  6726. +               LinkIncremental="1"
  6727. +               AdditionalLibraryDirectories="..\lib"
  6728. +               GenerateDebugInformation="true"
  6729. +               SubSystem="1"
  6730. +               OptimizeReferences="2"
  6731. +               EnableCOMDATFolding="2"
  6732. +               LinkTimeCodeGeneration="0"
  6733. +               TargetMachine="1"
  6734. +           />
  6735. +           <Tool
  6736. +               Name="VCALinkTool"
  6737. +           />
  6738. +           <Tool
  6739. +               Name="VCManifestTool"
  6740. +           />
  6741. +           <Tool
  6742. +               Name="VCXDCMakeTool"
  6743. +           />
  6744. +           <Tool
  6745. +               Name="VCBscMakeTool"
  6746. +           />
  6747. +           <Tool
  6748. +               Name="VCFxCopTool"
  6749. +           />
  6750. +           <Tool
  6751. +               Name="VCAppVerifierTool"
  6752. +           />
  6753. +           <Tool
  6754. +               Name="VCWebDeploymentTool"
  6755. +           />
  6756. +           <Tool
  6757. +               Name="VCPostBuildEventTool"
  6758. +           />
  6759. +       </Configuration>
  6760. +   </Configurations>
  6761. +   <References>
  6762. +   </References>
  6763. +   <Files>
  6764. +       <Filter
  6765. +           Name="Source Files"
  6766. +           Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
  6767. +           UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
  6768. +           >
  6769. +           <File
  6770. +               RelativePath=".\RawSpeed.cpp"
  6771. +               >
  6772. +           </File>
  6773. +           <File
  6774. +               RelativePath=".\stdafx.cpp"
  6775. +               >
  6776. +               <FileConfiguration
  6777. +                   Name="Debug|Win32"
  6778. +                   >
  6779. +                   <Tool
  6780. +                       Name="VCCLCompilerTool"
  6781. +                       UsePrecompiledHeader="1"
  6782. +                   />
  6783. +               </FileConfiguration>
  6784. +               <FileConfiguration
  6785. +                   Name="Release|Win32"
  6786. +                   >
  6787. +                   <Tool
  6788. +                       Name="VCCLCompilerTool"
  6789. +                       UsePrecompiledHeader="1"
  6790. +                   />
  6791. +               </FileConfiguration>
  6792. +           </File>
  6793. +           <Filter
  6794. +               Name="Parsers"
  6795. +               >
  6796. +               <File
  6797. +                   RelativePath=".\CiffEntry.cpp"
  6798. +                   >
  6799. +               </File>
  6800. +               <File
  6801. +                   RelativePath=".\CiffIFD.cpp"
  6802. +                   >
  6803. +               </File>
  6804. +               <File
  6805. +                   RelativePath=".\CiffParser.cpp"
  6806. +                   >
  6807. +               </File>
  6808. +               <File
  6809. +                   RelativePath=".\CiffParserException.cpp"
  6810. +                   >
  6811. +               </File>
  6812. +               <File
  6813. +                   RelativePath=".\RawParser.cpp"
  6814. +                   >
  6815. +               </File>
  6816. +               <File
  6817. +                   RelativePath=".\TiffEntry.cpp"
  6818. +                   >
  6819. +               </File>
  6820. +               <File
  6821. +                   RelativePath=".\TiffEntryBE.cpp"
  6822. +                   >
  6823. +               </File>
  6824. +               <File
  6825. +                   RelativePath=".\TiffIFD.cpp"
  6826. +                   >
  6827. +               </File>
  6828. +               <File
  6829. +                   RelativePath=".\TiffIFDBE.cpp"
  6830. +                   >
  6831. +               </File>
  6832. +               <File
  6833. +                   RelativePath=".\TiffParser.cpp"
  6834. +                   >
  6835. +               </File>
  6836. +               <File
  6837. +                   RelativePath=".\TiffParserException.cpp"
  6838. +                   >
  6839. +               </File>
  6840. +               <File
  6841. +                   RelativePath=".\TiffParserHeaderless.cpp"
  6842. +                   >
  6843. +               </File>
  6844. +               <File
  6845. +                   RelativePath=".\X3fParser.cpp"
  6846. +                   >
  6847. +               </File>
  6848. +           </Filter>
  6849. +           <Filter
  6850. +               Name="Decompressors"
  6851. +               >
  6852. +               <File
  6853. +                   RelativePath=".\DngDecoderSlices.cpp"
  6854. +                   >
  6855. +               </File>
  6856. +               <File
  6857. +                   RelativePath=".\HasselbladDecompressor.cpp"
  6858. +                   >
  6859. +               </File>
  6860. +               <File
  6861. +                   RelativePath=".\LJpegDecompressor.cpp"
  6862. +                   >
  6863. +               </File>
  6864. +               <File
  6865. +                   RelativePath=".\LJpegPlain.cpp"
  6866. +                   >
  6867. +               </File>
  6868. +               <File
  6869. +                   RelativePath=".\NikonDecompressor.cpp"
  6870. +                   >
  6871. +               </File>
  6872. +               <File
  6873. +                   RelativePath=".\PentaxDecompressor.cpp"
  6874. +                   >
  6875. +               </File>
  6876. +           </Filter>
  6877. +           <Filter
  6878. +               Name="Tools"
  6879. +               >
  6880. +               <File
  6881. +                   RelativePath=".\BitPumpJPEG.cpp"
  6882. +                   >
  6883. +               </File>
  6884. +               <File
  6885. +                   RelativePath=".\BitPumpMSB.cpp"
  6886. +                   >
  6887. +               </File>
  6888. +               <File
  6889. +                   RelativePath=".\BitPumpMSB16.cpp"
  6890. +                   >
  6891. +               </File>
  6892. +               <File
  6893. +                   RelativePath=".\BitPumpMSB32.cpp"
  6894. +                   >
  6895. +               </File>
  6896. +               <File
  6897. +                   RelativePath=".\BitPumpPlain.cpp"
  6898. +                   >
  6899. +               </File>
  6900. +               <File
  6901. +                   RelativePath=".\ByteStream.cpp"
  6902. +                   >
  6903. +               </File>
  6904. +               <File
  6905. +                   RelativePath=".\ByteStreamSwap.cpp"
  6906. +                   >
  6907. +               </File>
  6908. +               <File
  6909. +                   RelativePath=".\Common.cpp"
  6910. +                   >
  6911. +               </File>
  6912. +               <File
  6913. +                   RelativePath=".\DngOpcodes.cpp"
  6914. +                   >
  6915. +               </File>
  6916. +               <File
  6917. +                   RelativePath=".\FileIOException.cpp"
  6918. +                   >
  6919. +               </File>
  6920. +               <File
  6921. +                   RelativePath=".\FileMap.cpp"
  6922. +                   >
  6923. +               </File>
  6924. +               <File
  6925. +                   RelativePath=".\FileReader.cpp"
  6926. +                   >
  6927. +               </File>
  6928. +               <File
  6929. +                   RelativePath=".\FileWriter.cpp"
  6930. +                   >
  6931. +               </File>
  6932. +               <File
  6933. +                   RelativePath=".\IOException.cpp"
  6934. +                   >
  6935. +               </File>
  6936. +               <File
  6937. +                   RelativePath=".\pugixml.cpp"
  6938. +                   >
  6939. +               </File>
  6940. +           </Filter>
  6941. +           <Filter
  6942. +               Name="Decoders"
  6943. +               >
  6944. +               <File
  6945. +                   RelativePath=".\AriDecoder.cpp"
  6946. +                   >
  6947. +               </File>
  6948. +               <File
  6949. +                   RelativePath=".\ARWDecoder.cpp"
  6950. +                   >
  6951. +               </File>
  6952. +               <File
  6953. +                   RelativePath=".\Cr2Decoder.cpp"
  6954. +                   >
  6955. +               </File>
  6956. +               <File
  6957. +                   RelativePath=".\CrwDecoder.cpp"
  6958. +                   >
  6959. +               </File>
  6960. +               <File
  6961. +                   RelativePath=".\DcrDecoder.cpp"
  6962. +                   >
  6963. +               </File>
  6964. +               <File
  6965. +                   RelativePath=".\DngDecoder.cpp"
  6966. +                   >
  6967. +               </File>
  6968. +               <File
  6969. +                   RelativePath=".\ErfDecoder.cpp"
  6970. +                   >
  6971. +               </File>
  6972. +               <File
  6973. +                   RelativePath=".\KdcDecoder.cpp"
  6974. +                   >
  6975. +               </File>
  6976. +               <File
  6977. +                   RelativePath=".\MefDecoder.cpp"
  6978. +                   >
  6979. +               </File>
  6980. +               <File
  6981. +                   RelativePath=".\MosDecoder.cpp"
  6982. +                   >
  6983. +               </File>
  6984. +               <File
  6985. +                   RelativePath=".\MrwDecoder.cpp"
  6986. +                   >
  6987. +               </File>
  6988. +               <File
  6989. +                   RelativePath=".\NakedDecoder.cpp"
  6990. +                   >
  6991. +               </File>
  6992. +               <File
  6993. +                   RelativePath=".\NefDecoder.cpp"
  6994. +                   >
  6995. +               </File>
  6996. +               <File
  6997. +                   RelativePath=".\OrfDecoder.cpp"
  6998. +                   >
  6999. +               </File>
  7000. +               <File
  7001. +                   RelativePath=".\PefDecoder.cpp"
  7002. +                   >
  7003. +               </File>
  7004. +               <File
  7005. +                   RelativePath=".\RafDecoder.cpp"
  7006. +                   >
  7007. +               </File>
  7008. +               <File
  7009. +                   RelativePath=".\RawDecoder.cpp"
  7010. +                   >
  7011. +               </File>
  7012. +               <File
  7013. +                   RelativePath=".\RawDecoderException.cpp"
  7014. +                   >
  7015. +               </File>
  7016. +               <File
  7017. +                   RelativePath=".\Rw2Decoder.cpp"
  7018. +                   >
  7019. +               </File>
  7020. +               <File
  7021. +                   RelativePath=".\SrwDecoder.cpp"
  7022. +                   >
  7023. +               </File>
  7024. +               <File
  7025. +                   RelativePath=".\ThreefrDecoder.cpp"
  7026. +                   >
  7027. +               </File>
  7028. +               <File
  7029. +                   RelativePath=".\X3fDecoder.cpp"
  7030. +                   >
  7031. +               </File>
  7032. +           </Filter>
  7033. +           <Filter
  7034. +               Name="CameraMetadata"
  7035. +               >
  7036. +               <File
  7037. +                   RelativePath=".\BlackArea.cpp"
  7038. +                   >
  7039. +               </File>
  7040. +               <File
  7041. +                   RelativePath=".\Camera.cpp"
  7042. +                   >
  7043. +               </File>
  7044. +               <File
  7045. +                   RelativePath=".\CameraMetaData.cpp"
  7046. +                   >
  7047. +               </File>
  7048. +               <File
  7049. +                   RelativePath=".\CameraMetadataException.cpp"
  7050. +                   >
  7051. +               </File>
  7052. +               <File
  7053. +                   RelativePath=".\CameraSensorInfo.cpp"
  7054. +                   >
  7055. +               </File>
  7056. +               <File
  7057. +                   RelativePath=".\ColorFilterArray.cpp"
  7058. +                   >
  7059. +               </File>
  7060. +           </Filter>
  7061. +           <Filter
  7062. +               Name="RawImage"
  7063. +               >
  7064. +               <File
  7065. +                   RelativePath=".\RawImage.cpp"
  7066. +                   >
  7067. +               </File>
  7068. +               <File
  7069. +                   RelativePath=".\RawImageDataFloat.cpp"
  7070. +                   >
  7071. +               </File>
  7072. +               <File
  7073. +                   RelativePath=".\RawImageDataU16.cpp"
  7074. +                   >
  7075. +               </File>
  7076. +           </Filter>
  7077. +       </Filter>
  7078. +       <Filter
  7079. +           Name="Header Files"
  7080. +           Filter="h;hpp;hxx;hm;inl;inc;xsd"
  7081. +           UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
  7082. +           >
  7083. +           <File
  7084. +               RelativePath=".\stdafx.h"
  7085. +               >
  7086. +           </File>
  7087. +           <Filter
  7088. +               Name="Tools"
  7089. +               >
  7090. +               <File
  7091. +                   RelativePath=".\BitPumpJPEG.h"
  7092. +                   >
  7093. +               </File>
  7094. +               <File
  7095. +                   RelativePath=".\BitPumpMSB.h"
  7096. +                   >
  7097. +               </File>
  7098. +               <File
  7099. +                   RelativePath=".\BitPumpMSB16.h"
  7100. +                   >
  7101. +               </File>
  7102. +               <File
  7103. +                   RelativePath=".\BitPumpMSB32.h"
  7104. +                   >
  7105. +               </File>
  7106. +               <File
  7107. +                   RelativePath=".\BitPumpPlain.h"
  7108. +                   >
  7109. +               </File>
  7110. +               <File
  7111. +                   RelativePath=".\ByteStream.h"
  7112. +                   >
  7113. +               </File>
  7114. +               <File
  7115. +                   RelativePath=".\ByteStreamSwap.h"
  7116. +                   >
  7117. +               </File>
  7118. +               <File
  7119. +                   RelativePath=".\Common.h"
  7120. +                   >
  7121. +               </File>
  7122. +               <File
  7123. +                   RelativePath=".\DngOpcodes.h"
  7124. +                   >
  7125. +               </File>
  7126. +               <File
  7127. +                   RelativePath=".\FileIOException.h"
  7128. +                   >
  7129. +               </File>
  7130. +               <File
  7131. +                   RelativePath=".\FileMap.h"
  7132. +                   >
  7133. +               </File>
  7134. +               <File
  7135. +                   RelativePath=".\FileReader.h"
  7136. +                   >
  7137. +               </File>
  7138. +               <File
  7139. +                   RelativePath=".\FileWriter.h"
  7140. +                   >
  7141. +               </File>
  7142. +               <File
  7143. +                   RelativePath=".\IOException.h"
  7144. +                   >
  7145. +               </File>
  7146. +               <File
  7147. +                   RelativePath=".\Point.h"
  7148. +                   >
  7149. +               </File>
  7150. +           </Filter>
  7151. +           <Filter
  7152. +               Name="Decompressors"
  7153. +               >
  7154. +               <File
  7155. +                   RelativePath=".\DngDecoderSlices.h"
  7156. +                   >
  7157. +               </File>
  7158. +               <File
  7159. +                   RelativePath=".\HasselbladDecompressor.h"
  7160. +                   >
  7161. +               </File>
  7162. +               <File
  7163. +                   RelativePath=".\LJpegDecompressor.h"
  7164. +                   >
  7165. +               </File>
  7166. +               <File
  7167. +                   RelativePath=".\LJpegPlain.h"
  7168. +                   >
  7169. +               </File>
  7170. +               <File
  7171. +                   RelativePath=".\NikonDecompressor.h"
  7172. +                   >
  7173. +               </File>
  7174. +               <File
  7175. +                   RelativePath=".\PentaxDecompressor.h"
  7176. +                   >
  7177. +               </File>
  7178. +           </Filter>
  7179. +           <Filter
  7180. +               Name="Decoders"
  7181. +               >
  7182. +               <File
  7183. +                   RelativePath=".\AriDecoder.h"
  7184. +                   >
  7185. +               </File>
  7186. +               <File
  7187. +                   RelativePath=".\ARWDecoder.h"
  7188. +                   >
  7189. +               </File>
  7190. +               <File
  7191. +                   RelativePath=".\Cr2Decoder.h"
  7192. +                   >
  7193. +               </File>
  7194. +               <File
  7195. +                   RelativePath=".\CrwDecoder.h"
  7196. +                   >
  7197. +               </File>
  7198. +               <File
  7199. +                   RelativePath=".\DcrDecoder.h"
  7200. +                   >
  7201. +               </File>
  7202. +               <File
  7203. +                   RelativePath=".\DngDecoder.h"
  7204. +                   >
  7205. +               </File>
  7206. +               <File
  7207. +                   RelativePath=".\ErfDecoder.h"
  7208. +                   >
  7209. +               </File>
  7210. +               <File
  7211. +                   RelativePath=".\KdcDecoder.h"
  7212. +                   >
  7213. +               </File>
  7214. +               <File
  7215. +                   RelativePath=".\MefDecoder.h"
  7216. +                   >
  7217. +               </File>
  7218. +               <File
  7219. +                   RelativePath=".\MosDecoder.h"
  7220. +                   >
  7221. +               </File>
  7222. +               <File
  7223. +                   RelativePath=".\MrwDecoder.h"
  7224. +                   >
  7225. +               </File>
  7226. +               <File
  7227. +                   RelativePath=".\NakedDecoder.h"
  7228. +                   >
  7229. +               </File>
  7230. +               <File
  7231. +                   RelativePath=".\NefDecoder.h"
  7232. +                   >
  7233. +               </File>
  7234. +               <File
  7235. +                   RelativePath=".\OrfDecoder.h"
  7236. +                   >
  7237. +               </File>
  7238. +               <File
  7239. +                   RelativePath=".\PefDecoder.h"
  7240. +                   >
  7241. +               </File>
  7242. +               <File
  7243. +                   RelativePath=".\RafDecoder.h"
  7244. +                   >
  7245. +               </File>
  7246. +               <File
  7247. +                   RelativePath=".\RawDecoder.h"
  7248. +                   >
  7249. +               </File>
  7250. +               <File
  7251. +                   RelativePath=".\RawDecoderException.h"
  7252. +                   >
  7253. +               </File>
  7254. +               <File
  7255. +                   RelativePath=".\Rw2Decoder.h"
  7256. +                   >
  7257. +               </File>
  7258. +               <File
  7259. +                   RelativePath=".\SrwDecoder.h"
  7260. +                   >
  7261. +               </File>
  7262. +               <File
  7263. +                   RelativePath=".\ThreefrDecoder.h"
  7264. +                   >
  7265. +               </File>
  7266. +               <File
  7267. +                   RelativePath=".\X3fDecoder.h"
  7268. +                   >
  7269. +               </File>
  7270. +           </Filter>
  7271. +           <Filter
  7272. +               Name="CameraMetadata"
  7273. +               >
  7274. +               <File
  7275. +                   RelativePath=".\BlackArea.h"
  7276. +                   >
  7277. +               </File>
  7278. +               <File
  7279. +                   RelativePath=".\Camera.h"
  7280. +                   >
  7281. +               </File>
  7282. +               <File
  7283. +                   RelativePath=".\CameraMetaData.h"
  7284. +                   >
  7285. +               </File>
  7286. +               <File
  7287. +                   RelativePath=".\CameraMetadataException.h"
  7288. +                   >
  7289. +               </File>
  7290. +               <File
  7291. +                   RelativePath=".\CameraSensorInfo.h"
  7292. +                   >
  7293. +               </File>
  7294. +               <File
  7295. +                   RelativePath=".\ColorFilterArray.h"
  7296. +                   >
  7297. +               </File>
  7298. +           </Filter>
  7299. +           <Filter
  7300. +               Name="Parsers"
  7301. +               >
  7302. +               <File
  7303. +                   RelativePath=".\CiffEntry.h"
  7304. +                   >
  7305. +               </File>
  7306. +               <File
  7307. +                   RelativePath=".\CiffIFD.h"
  7308. +                   >
  7309. +               </File>
  7310. +               <File
  7311. +                   RelativePath=".\CiffParser.h"
  7312. +                   >
  7313. +               </File>
  7314. +               <File
  7315. +                   RelativePath=".\CiffParserException.h"
  7316. +                   >
  7317. +               </File>
  7318. +               <File
  7319. +                   RelativePath=".\CiffTag.h"
  7320. +                   >
  7321. +               </File>
  7322. +               <File
  7323. +                   RelativePath=".\RawParser.h"
  7324. +                   >
  7325. +               </File>
  7326. +               <File
  7327. +                   RelativePath=".\TiffEntry.h"
  7328. +                   >
  7329. +               </File>
  7330. +               <File
  7331. +                   RelativePath=".\TiffEntryBE.h"
  7332. +                   >
  7333. +               </File>
  7334. +               <File
  7335. +                   RelativePath=".\TiffIFD.h"
  7336. +                   >
  7337. +               </File>
  7338. +               <File
  7339. +                   RelativePath=".\TiffIFDBE.h"
  7340. +                   >
  7341. +               </File>
  7342. +               <File
  7343. +                   RelativePath=".\TiffParser.h"
  7344. +                   >
  7345. +               </File>
  7346. +               <File
  7347. +                   RelativePath=".\TiffParserException.h"
  7348. +                   >
  7349. +               </File>
  7350. +               <File
  7351. +                   RelativePath=".\TiffParserHeaderless.h"
  7352. +                   >
  7353. +               </File>
  7354. +               <File
  7355. +                   RelativePath=".\TiffParserOlympus.h"
  7356. +                   >
  7357. +               </File>
  7358. +               <File
  7359. +                   RelativePath=".\TiffTag.h"
  7360. +                   >
  7361. +               </File>
  7362. +               <File
  7363. +                   RelativePath=".\X3fParser.h"
  7364. +                   >
  7365. +               </File>
  7366. +           </Filter>
  7367. +           <Filter
  7368. +               Name="RawImage"
  7369. +               >
  7370. +               <File
  7371. +                   RelativePath=".\RawImage.h"
  7372. +                   >
  7373. +               </File>
  7374. +           </Filter>
  7375. +       </Filter>
  7376. +       <Filter
  7377. +           Name="Resource Files"
  7378. +           Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
  7379. +           UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
  7380. +           >
  7381. +       </Filter>
  7382. +   </Files>
  7383. +   <Globals>
  7384. +   </Globals>
  7385. +</VisualStudioProject>
  7386. diff -urNr "darktable rawspeed/RawSpeed/RawSpeed.vcproj.KLAUSPOST.klaus.user" rawspeed-develop/RawSpeed/RawSpeed.vcproj.KLAUSPOST.klaus.user
  7387. --- "darktable rawspeed/RawSpeed/RawSpeed.vcproj.KLAUSPOST.klaus.user"  1970-01-01 01:00:00.000000000 +0100
  7388. +++ rawspeed-develop/RawSpeed/RawSpeed.vcproj.KLAUSPOST.klaus.user  2015-06-24 14:24:33.000000000 +0200
  7389. @@ -0,0 +1,65 @@
  7390. +<?xml version="1.0" encoding="Windows-1252"?>
  7391. +<VisualStudioUserFile
  7392. +   ProjectType="Visual C++"
  7393. +   Version="8.00"
  7394. +   ShowAllFiles="false"
  7395. +   >
  7396. +   <Configurations>
  7397. +       <Configuration
  7398. +           Name="Debug|Win32"
  7399. +           >
  7400. +           <DebugSettings
  7401. +               Command="$(TargetPath)"
  7402. +               WorkingDirectory="$(Outdir)"
  7403. +               CommandArguments=""
  7404. +               Attach="false"
  7405. +               DebuggerType="3"
  7406. +               Remote="1"
  7407. +               RemoteMachine="KLAUSPOST"
  7408. +               RemoteCommand=""
  7409. +               HttpUrl=""
  7410. +               PDBPath=""
  7411. +               SQLDebugging=""
  7412. +               Environment=""
  7413. +               EnvironmentMerge="true"
  7414. +               DebuggerFlavor="0"
  7415. +               MPIRunCommand=""
  7416. +               MPIRunArguments=""
  7417. +               MPIRunWorkingDirectory=""
  7418. +               ApplicationCommand=""
  7419. +               ApplicationArguments=""
  7420. +               ShimCommand=""
  7421. +               MPIAcceptMode=""
  7422. +               MPIAcceptFilter=""
  7423. +           />
  7424. +       </Configuration>
  7425. +       <Configuration
  7426. +           Name="Release|Win32"
  7427. +           >
  7428. +           <DebugSettings
  7429. +               Command="$(TargetPath)"
  7430. +               WorkingDirectory="$(Outdir)"
  7431. +               CommandArguments=""
  7432. +               Attach="false"
  7433. +               DebuggerType="3"
  7434. +               Remote="1"
  7435. +               RemoteMachine="KLAUSPOST"
  7436. +               RemoteCommand=""
  7437. +               HttpUrl=""
  7438. +               PDBPath=""
  7439. +               SQLDebugging=""
  7440. +               Environment=""
  7441. +               EnvironmentMerge="true"
  7442. +               DebuggerFlavor="0"
  7443. +               MPIRunCommand=""
  7444. +               MPIRunArguments=""
  7445. +               MPIRunWorkingDirectory=""
  7446. +               ApplicationCommand=""
  7447. +               ApplicationArguments=""
  7448. +               ShimCommand=""
  7449. +               MPIAcceptMode=""
  7450. +               MPIAcceptFilter=""
  7451. +           />
  7452. +       </Configuration>
  7453. +   </Configurations>
  7454. +</VisualStudioUserFile>
  7455. diff -urNr "darktable rawspeed/RawSpeed/RawSpeed.vcxproj" rawspeed-develop/RawSpeed/RawSpeed.vcxproj
  7456. --- "darktable rawspeed/RawSpeed/RawSpeed.vcxproj"  1970-01-01 01:00:00.000000000 +0100
  7457. +++ rawspeed-develop/RawSpeed/RawSpeed.vcxproj  2015-06-24 14:24:33.000000000 +0200
  7458. @@ -0,0 +1,404 @@
  7459. +<?xml version="1.0" encoding="utf-8"?>
  7460. +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  7461. +  <ItemGroup Label="ProjectConfigurations">
  7462. +    <ProjectConfiguration Include="Debug-X64|Win32">
  7463. +      <Configuration>Debug-X64</Configuration>
  7464. +      <Platform>Win32</Platform>
  7465. +    </ProjectConfiguration>
  7466. +    <ProjectConfiguration Include="Debug-X64|x64">
  7467. +      <Configuration>Debug-X64</Configuration>
  7468. +      <Platform>x64</Platform>
  7469. +    </ProjectConfiguration>
  7470. +    <ProjectConfiguration Include="Debug|Win32">
  7471. +      <Configuration>Debug</Configuration>
  7472. +      <Platform>Win32</Platform>
  7473. +    </ProjectConfiguration>
  7474. +    <ProjectConfiguration Include="Debug|x64">
  7475. +      <Configuration>Debug</Configuration>
  7476. +      <Platform>x64</Platform>
  7477. +    </ProjectConfiguration>
  7478. +    <ProjectConfiguration Include="Release|Win32">
  7479. +      <Configuration>Release</Configuration>
  7480. +      <Platform>Win32</Platform>
  7481. +    </ProjectConfiguration>
  7482. +    <ProjectConfiguration Include="Release|x64">
  7483. +      <Configuration>Release</Configuration>
  7484. +      <Platform>x64</Platform>
  7485. +    </ProjectConfiguration>
  7486. +  </ItemGroup>
  7487. +  <PropertyGroup Label="Globals">
  7488. +    <ProjectGuid>{482A0ABF-1AE3-4EE4-815A-428880DAE0C6}</ProjectGuid>
  7489. +    <RootNamespace>CR2reader</RootNamespace>
  7490. +    <Keyword>Win32Proj</Keyword>
  7491. +  </PropertyGroup>
  7492. +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  7493. +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
  7494. +    <ConfigurationType>Application</ConfigurationType>
  7495. +    <CharacterSet>Unicode</CharacterSet>
  7496. +    <WholeProgramOptimization>true</WholeProgramOptimization>
  7497. +    <PlatformToolset>Windows7.1SDK</PlatformToolset>
  7498. +  </PropertyGroup>
  7499. +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
  7500. +    <ConfigurationType>Application</ConfigurationType>
  7501. +    <CharacterSet>Unicode</CharacterSet>
  7502. +    <WholeProgramOptimization>true</WholeProgramOptimization>
  7503. +    <PlatformToolset>Windows7.1SDK</PlatformToolset>
  7504. +  </PropertyGroup>
  7505. +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
  7506. +    <ConfigurationType>Application</ConfigurationType>
  7507. +    <CharacterSet>Unicode</CharacterSet>
  7508. +    <PlatformToolset>Windows7.1SDK</PlatformToolset>
  7509. +  </PropertyGroup>
  7510. +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
  7511. +    <ConfigurationType>Application</ConfigurationType>
  7512. +    <CharacterSet>Unicode</CharacterSet>
  7513. +    <PlatformToolset>Windows7.1SDK</PlatformToolset>
  7514. +  </PropertyGroup>
  7515. +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-X64|Win32'" Label="Configuration">
  7516. +    <ConfigurationType>Application</ConfigurationType>
  7517. +    <CharacterSet>Unicode</CharacterSet>
  7518. +    <PlatformToolset>Windows7.1SDK</PlatformToolset>
  7519. +  </PropertyGroup>
  7520. +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-X64|x64'" Label="Configuration">
  7521. +    <ConfigurationType>Application</ConfigurationType>
  7522. +    <CharacterSet>Unicode</CharacterSet>
  7523. +  </PropertyGroup>
  7524. +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  7525. +  <ImportGroup Label="ExtensionSettings">
  7526. +  </ImportGroup>
  7527. +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
  7528. +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  7529. +  </ImportGroup>
  7530. +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
  7531. +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  7532. +  </ImportGroup>
  7533. +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
  7534. +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  7535. +  </ImportGroup>
  7536. +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
  7537. +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  7538. +  </ImportGroup>
  7539. +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-X64|Win32'" Label="PropertySheets">
  7540. +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  7541. +  </ImportGroup>
  7542. +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-X64|x64'" Label="PropertySheets">
  7543. +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  7544. +  </ImportGroup>
  7545. +  <PropertyGroup Label="UserMacros" />
  7546. +  <PropertyGroup>
  7547. +    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
  7548. +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)-$(Platform)\</OutDir>
  7549. +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)-$(Platform)\</OutDir>
  7550. +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug-X64|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
  7551. +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug-X64|x64'">$(SolutionDir)$(Configuration)\</OutDir>
  7552. +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)-$(Platform)\</IntDir>
  7553. +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)-$(Platform)\</IntDir>
  7554. +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug-X64|Win32'">$(Configuration)-$(Platform)\</IntDir>
  7555. +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug-X64|x64'">$(Configuration)-$(Platform)\</IntDir>
  7556. +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
  7557. +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
  7558. +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug-X64|Win32'">false</LinkIncremental>
  7559. +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug-X64|x64'">false</LinkIncremental>
  7560. +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)-$(Platform)\</OutDir>
  7561. +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)-$(Platform)\</OutDir>
  7562. +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)-$(Platform)\</IntDir>
  7563. +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)-$(Platform)\</IntDir>
  7564. +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
  7565. +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
  7566. +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)</TargetName>
  7567. +  </PropertyGroup>
  7568. +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
  7569. +    <ClCompile>
  7570. +      <Optimization>Disabled</Optimization>
  7571. +      <AdditionalIncludeDirectories>..\include;..\include\libjpeg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  7572. +      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  7573. +      <MinimalRebuild>true</MinimalRebuild>
  7574. +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
  7575. +      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
  7576. +      <PrecompiledHeader>Use</PrecompiledHeader>
  7577. +      <WarningLevel>Level3</WarningLevel>
  7578. +      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
  7579. +    </ClCompile>
  7580. +    <Link>
  7581. +      <AdditionalDependencies>kernel32.lib;User32.lib;pthreadVC2.lib;turbojpeg-static.lib</AdditionalDependencies>
  7582. +      <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  7583. +      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
  7584. +      <IgnoreSpecificDefaultLibraries>libcmt.lib;msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
  7585. +      <GenerateDebugInformation>true</GenerateDebugInformation>
  7586. +      <SubSystem>Console</SubSystem>
  7587. +      <TargetMachine>MachineX86</TargetMachine>
  7588. +    </Link>
  7589. +  </ItemDefinitionGroup>
  7590. +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
  7591. +    <ClCompile>
  7592. +      <Optimization>Disabled</Optimization>
  7593. +      <AdditionalIncludeDirectories>..\include;..\include\libjpeg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  7594. +      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  7595. +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
  7596. +      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
  7597. +      <PrecompiledHeader>Use</PrecompiledHeader>
  7598. +      <WarningLevel>Level3</WarningLevel>
  7599. +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
  7600. +    </ClCompile>
  7601. +    <Link>
  7602. +      <AdditionalDependencies>kernel32.lib;User32.lib;pthreadVC2.lib;turbojpeg-static.lib</AdditionalDependencies>
  7603. +      <AdditionalLibraryDirectories>..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  7604. +      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
  7605. +      <IgnoreSpecificDefaultLibraries>libcmt.lib;msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
  7606. +      <GenerateDebugInformation>true</GenerateDebugInformation>
  7607. +      <SubSystem>Console</SubSystem>
  7608. +    </Link>
  7609. +  </ItemDefinitionGroup>
  7610. +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-X64|Win32'">
  7611. +    <ClCompile>
  7612. +      <Optimization>Disabled</Optimization>
  7613. +      <AdditionalIncludeDirectories>..\include;..\include\libjpeg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  7614. +      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  7615. +      <MinimalRebuild>true</MinimalRebuild>
  7616. +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
  7617. +      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
  7618. +      <PrecompiledHeader>Use</PrecompiledHeader>
  7619. +      <WarningLevel>Level3</WarningLevel>
  7620. +      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
  7621. +    </ClCompile>
  7622. +    <Link>
  7623. +      <AdditionalDependencies>kernel32.lib;User32.lib;pthreadVC2.lib;turbojpeg-static.lib</AdditionalDependencies>
  7624. +      <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  7625. +      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
  7626. +      <IgnoreSpecificDefaultLibraries>libcmt.lib;msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
  7627. +      <GenerateDebugInformation>true</GenerateDebugInformation>
  7628. +      <SubSystem>Console</SubSystem>
  7629. +      <TargetMachine>MachineX64</TargetMachine>
  7630. +    </Link>
  7631. +  </ItemDefinitionGroup>
  7632. +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-X64|x64'">
  7633. +    <ClCompile>
  7634. +      <Optimization>Disabled</Optimization>
  7635. +      <AdditionalIncludeDirectories>..\include;..\include\libjpeg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  7636. +      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  7637. +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
  7638. +      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
  7639. +      <PrecompiledHeader>Use</PrecompiledHeader>
  7640. +      <WarningLevel>Level3</WarningLevel>
  7641. +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
  7642. +    </ClCompile>
  7643. +    <Link>
  7644. +      <AdditionalDependencies>kernel32.lib;User32.lib;pthreadVC2.lib;turbojpeg-static.lib</AdditionalDependencies>
  7645. +      <AdditionalLibraryDirectories>..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  7646. +      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
  7647. +      <IgnoreSpecificDefaultLibraries>libcmt.lib;msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
  7648. +      <GenerateDebugInformation>true</GenerateDebugInformation>
  7649. +      <SubSystem>Console</SubSystem>
  7650. +    </Link>
  7651. +  </ItemDefinitionGroup>
  7652. +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
  7653. +    <ClCompile>
  7654. +      <Optimization>MaxSpeed</Optimization>
  7655. +      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
  7656. +      <IntrinsicFunctions>true</IntrinsicFunctions>
  7657. +      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
  7658. +      <OmitFramePointers>false</OmitFramePointers>
  7659. +      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
  7660. +      <WholeProgramOptimization>true</WholeProgramOptimization>
  7661. +      <AdditionalIncludeDirectories>..\include;..\include\libjpeg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  7662. +      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  7663. +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
  7664. +      <BufferSecurityCheck>true</BufferSecurityCheck>
  7665. +      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
  7666. +      <FloatingPointModel>Fast</FloatingPointModel>
  7667. +      <PrecompiledHeader>Use</PrecompiledHeader>
  7668. +      <AssemblerOutput>All</AssemblerOutput>
  7669. +      <WarningLevel>Level3</WarningLevel>
  7670. +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
  7671. +    </ClCompile>
  7672. +    <Link>
  7673. +      <AdditionalDependencies>kernel32.lib;User32.lib;pthreadVC2.lib;turbojpeg-static.lib</AdditionalDependencies>
  7674. +      <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  7675. +      <GenerateDebugInformation>true</GenerateDebugInformation>
  7676. +      <SubSystem>Console</SubSystem>
  7677. +      <OptimizeReferences>true</OptimizeReferences>
  7678. +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
  7679. +      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
  7680. +      <TargetMachine>MachineX86</TargetMachine>
  7681. +    </Link>
  7682. +  </ItemDefinitionGroup>
  7683. +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
  7684. +    <ClCompile>
  7685. +      <Optimization>MaxSpeed</Optimization>
  7686. +      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
  7687. +      <IntrinsicFunctions>true</IntrinsicFunctions>
  7688. +      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
  7689. +      <OmitFramePointers>false</OmitFramePointers>
  7690. +      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
  7691. +      <WholeProgramOptimization>false</WholeProgramOptimization>
  7692. +      <AdditionalIncludeDirectories>..\include;..\include\libjpeg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  7693. +      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  7694. +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
  7695. +      <BufferSecurityCheck>true</BufferSecurityCheck>
  7696. +      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
  7697. +      <FloatingPointModel>Fast</FloatingPointModel>
  7698. +      <PrecompiledHeader>Use</PrecompiledHeader>
  7699. +      <AssemblerOutput>All</AssemblerOutput>
  7700. +      <WarningLevel>Level3</WarningLevel>
  7701. +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
  7702. +    </ClCompile>
  7703. +    <Link>
  7704. +      <AdditionalDependencies>kernel32.lib;User32.lib;pthreadVC2.lib;turbojpeg-static.lib</AdditionalDependencies>
  7705. +      <AdditionalLibraryDirectories>..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  7706. +      <GenerateDebugInformation>true</GenerateDebugInformation>
  7707. +      <SubSystem>Console</SubSystem>
  7708. +      <OptimizeReferences>true</OptimizeReferences>
  7709. +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
  7710. +      <LinkTimeCodeGeneration>
  7711. +      </LinkTimeCodeGeneration>
  7712. +    </Link>
  7713. +  </ItemDefinitionGroup>
  7714. +  <ItemGroup>
  7715. +    <ClCompile Include="AriDecoder.cpp" />
  7716. +    <ClCompile Include="RawSpeed.cpp" />
  7717. +    <ClCompile Include="stdafx.cpp">
  7718. +      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
  7719. +      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
  7720. +      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug-X64|Win32'">Create</PrecompiledHeader>
  7721. +      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug-X64|x64'">Create</PrecompiledHeader>
  7722. +      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
  7723. +      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
  7724. +    </ClCompile>
  7725. +    <ClCompile Include="CiffEntry.cpp" />
  7726. +    <ClCompile Include="CiffIFD.cpp" />
  7727. +    <ClCompile Include="CiffParser.cpp" />
  7728. +    <ClCompile Include="CiffParserException.cpp" />
  7729. +    <ClCompile Include="RawParser.cpp" />
  7730. +    <ClCompile Include="TiffEntry.cpp" />
  7731. +    <ClCompile Include="TiffEntryBE.cpp" />
  7732. +    <ClCompile Include="TiffIFD.cpp" />
  7733. +    <ClCompile Include="TiffIFDBE.cpp" />
  7734. +    <ClCompile Include="TiffParser.cpp" />
  7735. +    <ClCompile Include="TiffParserException.cpp" />
  7736. +    <ClCompile Include="TiffParserHeaderless.cpp" />
  7737. +    <ClCompile Include="X3fParser.cpp" />
  7738. +    <ClCompile Include="DngDecoderSlices.cpp" />
  7739. +    <ClCompile Include="HasselbladDecompressor.cpp" />
  7740. +    <ClCompile Include="LJpegDecompressor.cpp" />
  7741. +    <ClCompile Include="LJpegPlain.cpp" />
  7742. +    <ClCompile Include="NikonDecompressor.cpp" />
  7743. +    <ClCompile Include="PentaxDecompressor.cpp" />
  7744. +    <ClCompile Include="BitPumpJPEG.cpp" />
  7745. +    <ClCompile Include="BitPumpMSB.cpp" />
  7746. +    <ClCompile Include="BitPumpMSB16.cpp" />
  7747. +    <ClCompile Include="BitPumpMSB32.cpp" />
  7748. +    <ClCompile Include="BitPumpPlain.cpp" />
  7749. +    <ClCompile Include="ByteStream.cpp" />
  7750. +    <ClCompile Include="ByteStreamSwap.cpp" />
  7751. +    <ClCompile Include="Common.cpp" />
  7752. +    <ClCompile Include="DngOpcodes.cpp" />
  7753. +    <ClCompile Include="FileIOException.cpp" />
  7754. +    <ClCompile Include="FileMap.cpp" />
  7755. +    <ClCompile Include="FileReader.cpp" />
  7756. +    <ClCompile Include="FileWriter.cpp" />
  7757. +    <ClCompile Include="IOException.cpp" />
  7758. +    <ClCompile Include="pugixml.cpp" />
  7759. +    <ClCompile Include="ARWDecoder.cpp" />
  7760. +    <ClCompile Include="Cr2Decoder.cpp" />
  7761. +    <ClCompile Include="CrwDecoder.cpp" />
  7762. +    <ClCompile Include="DcrDecoder.cpp" />
  7763. +    <ClCompile Include="DngDecoder.cpp" />
  7764. +    <ClCompile Include="ErfDecoder.cpp" />
  7765. +    <ClCompile Include="KdcDecoder.cpp" />
  7766. +    <ClCompile Include="MefDecoder.cpp" />
  7767. +    <ClCompile Include="MosDecoder.cpp" />
  7768. +    <ClCompile Include="MrwDecoder.cpp" />
  7769. +    <ClCompile Include="NakedDecoder.cpp" />
  7770. +    <ClCompile Include="NefDecoder.cpp" />
  7771. +    <ClCompile Include="OrfDecoder.cpp" />
  7772. +    <ClCompile Include="PefDecoder.cpp" />
  7773. +    <ClCompile Include="RafDecoder.cpp" />
  7774. +    <ClCompile Include="RawDecoder.cpp" />
  7775. +    <ClCompile Include="RawDecoderException.cpp" />
  7776. +    <ClCompile Include="Rw2Decoder.cpp" />
  7777. +    <ClCompile Include="SrwDecoder.cpp" />
  7778. +    <ClCompile Include="ThreefrDecoder.cpp" />
  7779. +    <ClCompile Include="X3fDecoder.cpp" />
  7780. +    <ClCompile Include="BlackArea.cpp" />
  7781. +    <ClCompile Include="Camera.cpp" />
  7782. +    <ClCompile Include="CameraMetaData.cpp" />
  7783. +    <ClCompile Include="CameraMetadataException.cpp" />
  7784. +    <ClCompile Include="CameraSensorInfo.cpp" />
  7785. +    <ClCompile Include="ColorFilterArray.cpp" />
  7786. +    <ClCompile Include="RawImage.cpp" />
  7787. +    <ClCompile Include="RawImageDataFloat.cpp" />
  7788. +    <ClCompile Include="RawImageDataU16.cpp" />
  7789. +  </ItemGroup>
  7790. +  <ItemGroup>
  7791. +    <ClInclude Include="AriDecoder.h" />
  7792. +    <ClInclude Include="stdafx.h" />
  7793. +    <ClInclude Include="BitPumpJPEG.h" />
  7794. +    <ClInclude Include="BitPumpMSB.h" />
  7795. +    <ClInclude Include="BitPumpMSB16.h" />
  7796. +    <ClInclude Include="BitPumpMSB32.h" />
  7797. +    <ClInclude Include="BitPumpPlain.h" />
  7798. +    <ClInclude Include="ByteStream.h" />
  7799. +    <ClInclude Include="ByteStreamSwap.h" />
  7800. +    <ClInclude Include="Common.h" />
  7801. +    <ClInclude Include="DngOpcodes.h" />
  7802. +    <ClInclude Include="FileIOException.h" />
  7803. +    <ClInclude Include="FileMap.h" />
  7804. +    <ClInclude Include="FileReader.h" />
  7805. +    <ClInclude Include="FileWriter.h" />
  7806. +    <ClInclude Include="IOException.h" />
  7807. +    <ClInclude Include="Point.h" />
  7808. +    <ClInclude Include="DngDecoderSlices.h" />
  7809. +    <ClInclude Include="HasselbladDecompressor.h" />
  7810. +    <ClInclude Include="LJpegDecompressor.h" />
  7811. +    <ClInclude Include="LJpegPlain.h" />
  7812. +    <ClInclude Include="NikonDecompressor.h" />
  7813. +    <ClInclude Include="PentaxDecompressor.h" />
  7814. +    <ClInclude Include="ARWDecoder.h" />
  7815. +    <ClInclude Include="Cr2Decoder.h" />
  7816. +    <ClInclude Include="CrwDecoder.h" />
  7817. +    <ClInclude Include="DcrDecoder.h" />
  7818. +    <ClInclude Include="DngDecoder.h" />
  7819. +    <ClInclude Include="ErfDecoder.h" />
  7820. +    <ClInclude Include="KdcDecoder.h" />
  7821. +    <ClInclude Include="MefDecoder.h" />
  7822. +    <ClInclude Include="MosDecoder.h" />
  7823. +    <ClInclude Include="MrwDecoder.h" />
  7824. +    <ClInclude Include="NakedDecoder.h" />
  7825. +    <ClInclude Include="NefDecoder.h" />
  7826. +    <ClInclude Include="OrfDecoder.h" />
  7827. +    <ClInclude Include="PefDecoder.h" />
  7828. +    <ClInclude Include="RafDecoder.h" />
  7829. +    <ClInclude Include="RawDecoder.h" />
  7830. +    <ClInclude Include="RawDecoderException.h" />
  7831. +    <ClInclude Include="Rw2Decoder.h" />
  7832. +    <ClInclude Include="SrwDecoder.h" />
  7833. +    <ClInclude Include="ThreefrDecoder.h" />
  7834. +    <ClInclude Include="X3fDecoder.h" />
  7835. +    <ClInclude Include="BlackArea.h" />
  7836. +    <ClInclude Include="Camera.h" />
  7837. +    <ClInclude Include="CameraMetaData.h" />
  7838. +    <ClInclude Include="CameraMetadataException.h" />
  7839. +    <ClInclude Include="CameraSensorInfo.h" />
  7840. +    <ClInclude Include="ColorFilterArray.h" />
  7841. +    <ClInclude Include="CiffEntry.h" />
  7842. +    <ClInclude Include="CiffIFD.h" />
  7843. +    <ClInclude Include="CiffParser.h" />
  7844. +    <ClInclude Include="CiffParserException.h" />
  7845. +    <ClInclude Include="CiffTag.h" />
  7846. +    <ClInclude Include="RawParser.h" />
  7847. +    <ClInclude Include="TiffEntry.h" />
  7848. +    <ClInclude Include="TiffEntryBE.h" />
  7849. +    <ClInclude Include="TiffIFD.h" />
  7850. +    <ClInclude Include="TiffIFDBE.h" />
  7851. +    <ClInclude Include="TiffParser.h" />
  7852. +    <ClInclude Include="TiffParserException.h" />
  7853. +    <ClInclude Include="TiffParserHeaderless.h" />
  7854. +    <ClInclude Include="TiffParserOlympus.h" />
  7855. +    <ClInclude Include="TiffTag.h" />
  7856. +    <ClInclude Include="X3fParser.h" />
  7857. +    <ClInclude Include="RawImage.h" />
  7858. +  </ItemGroup>
  7859. +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  7860. +  <ImportGroup Label="ExtensionTargets">
  7861. +  </ImportGroup>
  7862. +</Project>
  7863. \ Manca newline alla fine del file
  7864. diff -urNr "darktable rawspeed/RawSpeed/TiffEntry.cpp" rawspeed-develop/RawSpeed/TiffEntry.cpp
  7865. --- "darktable rawspeed/RawSpeed/TiffEntry.cpp" 2015-06-07 11:40:16.000000000 +0200
  7866. +++ rawspeed-develop/RawSpeed/TiffEntry.cpp 2015-06-24 14:24:33.000000000 +0200
  7867. @@ -172,8 +172,8 @@
  7868.  }
  7869.  
  7870.  string TiffEntry::getString() {
  7871. -  if (type != TIFF_ASCII)
  7872. -    ThrowTPE("TIFF, getString: Wrong type 0x%x encountered. Expected Ascii", type);
  7873. +  if (type != TIFF_ASCII && type != TIFF_BYTE)
  7874. +    ThrowTPE("TIFF, getString: Wrong type 0x%x encountered. Expected Ascii or Byte", type);
  7875.    if (!own_data) {
  7876.      own_data = new uchar8[count];
  7877.      memcpy(own_data, data, count);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!