[Rawstudio-commit] rawspeed r173 - /

Wed, 16 Dec 2009 02:16:05 -0800 

Author: post
Date: 2009-12-16 11:15:54 +0100 (Wed, 16 Dec 2009)
New Revision: 173

Modified:
   cameras.xml
   showcameras.xsl
Log:


Modified: cameras.xml
===================================================================
--- cameras.xml 2009-12-12 12:12:58 UTC (rev 172)
+++ cameras.xml 2009-12-16 10:15:54 UTC (rev 173)
@@ -32,6 +32,7 @@
     </CFA>
     <Crop x="42" y="14" width="3474" height="2314"/>
     <Sensor black="255" white="4095"/>
+    <Aliases><Alias>Canon EOS DIGITAL REBEL XT</Alias></Aliases>
   </Camera>
   <Camera make="Canon" model="Canon EOS 40D">
     <CFA width="2" height="2">
@@ -56,6 +57,7 @@
     </CFA>
     <Crop x="22" y="18" width="4290" height="2856"/>
     <Sensor black="1020" white="16000"/>
+    <Aliases><Alias>Canon EOS DIGITAL REBEL XSi</Alias></Aliases>
   </Camera>
   <Camera make="Canon" model="Canon EOS 50D">
     <CFA width="2" height="2">
@@ -84,17 +86,8 @@
     </CFA>
     <Crop x="62" y="30" width="4722" height="3142"/>
     <Sensor black="1020" white="16000"/>
+    <Aliases><Alias>Canon EOS REBEL T1i</Alias></Aliases>
   </Camera>
-  <Camera make="Canon" model="Canon EOS REBEL T1i">
-    <CFA width="2" height="2">
-      <Color x="0" y="0">RED</Color>
-      <Color x="1" y="0">GREEN</Color>
-      <Color x="0" y="1">GREEN</Color>
-      <Color x="1" y="1">BLUE</Color>
-    </CFA>
-    <Crop x="62" y="30" width="4722" height="3142"/>
-    <Sensor black="1020" white="16000"/>
-  </Camera>
   <Camera make="Canon" model="Canon EOS 5D">
     <CFA width="2" height="2">
       <Color x="0" y="0">RED</Color>
@@ -133,16 +126,6 @@
     <Crop x="158" y="52" width="5202" height="3464"/>
     <Sensor black="2000" white="16300"/>
   </Camera>
-  <Camera make="Canon" model="Canon EOS DIGITAL REBEL XS">
-    <CFA width="2" height="2">
-      <Color x="0" y="0">RED</Color>
-      <Color x="1" y="0">GREEN</Color>
-      <Color x="0" y="1">GREEN</Color>
-      <Color x="1" y="1">BLUE</Color>
-    </CFA>
-    <Crop x="42" y="18" width="3906" height="2602"/>
-    <Sensor black="255" white="4030"/>
-  </Camera>
   <Camera make="Canon" model="Canon EOS 1000D">
     <CFA width="2" height="2">
       <Color x="0" y="0">RED</Color>
@@ -152,27 +135,8 @@
     </CFA>
     <Crop x="42" y="18" width="3906" height="2602"/>
     <Sensor black="255" white="4030"/>
+    <Aliases><Alias>Canon EOS DIGITAL REBEL XS</Alias></Aliases>
   </Camera>
-  <Camera make="Canon" model="Canon EOS DIGITAL REBEL XSi">
-    <CFA width="2" height="2">
-      <Color x="0" y="0">RED</Color>
-      <Color x="1" y="0">GREEN</Color>
-      <Color x="0" y="1">GREEN</Color>
-      <Color x="1" y="1">BLUE</Color>
-    </CFA>
-    <Crop x="22" y="18" width="4290" height="2856"/>
-    <Sensor black="1021" white="16000"/>
-  </Camera>
-  <Camera make="Canon" model="Canon EOS DIGITAL REBEL XTi">
-    <CFA width="2" height="2">
-      <Color x="0" y="0">RED</Color>
-      <Color x="1" y="0">GREEN</Color>
-      <Color x="0" y="1">GREEN</Color>
-      <Color x="1" y="1">BLUE</Color>
-    </CFA>
-    <Crop x="42" y="18" width="3906" height="2602"/>
-    <Sensor black="255" white="3726"/>
-  </Camera>
   <Camera make="Canon" model="Canon EOS 400D DIGITAL">
     <CFA width="2" height="2">
       <Color x="0" y="0">RED</Color>
@@ -182,6 +146,7 @@
     </CFA>
     <Crop x="42" y="18" width="3906" height="2602"/>
     <Sensor black="255" white="3726"/>
+    <Aliases><Alias>Canon EOS DIGITAL REBEL XTi</Alias></Aliases>
   </Camera>
   <Camera make="Canon" model="Canon EOS-1D Mark II">
     <CFA width="2" height="2">

Modified: showcameras.xsl
===================================================================
--- showcameras.xsl     2009-12-12 12:12:58 UTC (rev 172)
+++ showcameras.xsl     2009-12-16 10:15:54 UTC (rev 173)
@@ -36,6 +36,10 @@
                                <xsl:if test="@mode != ''">, Mode: <span 
style="font-style:italic;"><xsl:value-of select="@mode"/></span></xsl:if>
                        </h2>
                        <div class="text">
+         <xsl:for-each select="Aliases/Alias">
+            <p>Also known as: <span class="param">&quot;<xsl:value-of 
select="."/>&quot;</span></p>
+         </xsl:for-each>
+
                                <xsl:variable name = "supported" ><xsl:value-of 
select="@supported"/></xsl:variable>
                                <xsl:if test ="$supported = 'no'">Supported: 
<span style="color:red;font-style:italic;">No.</span></xsl:if>
                                        <xsl:if test ="not($supported = 
'no')">Supported: <span style="color:green;font-style:italic;">Yes.</span>
@@ -61,6 +65,10 @@
                                                <xsl:if test ="$color = 
'GREEN'"><span class="param" style="color:green;">[<xsl:copy-of select="$color" 
/>]</span></xsl:if>
                                                <xsl:if test ="$color = 
'BLUE'"><span class="param" style="color:blue;">[<xsl:copy-of select="$color" 
/>]</span></xsl:if>
                                        </xsl:for-each>
+                                       <xsl:for-each select="Hints/Hint">
+                                         <br/>
+            Decoder Hint: <span class="param">&quot;<xsl:value-of 
select="@name"/>&quot;</span>:<span class="param">&quot;<xsl:value-of 
select="@value"/>&quot;</span> 
+          </xsl:for-each>
                                 </xsl:if>
                        </div>
                 <br/>


_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit

Reply via email to