Support for Canon A630 and SX110IS CHDK RAW

(cherry picked from commit 9358693)

src/external/rawspeed/data/cameras.xml

@@ -1235,6 +1235,22 @@
 		</BlackAreas>
 		<Sensor black="0" white="1023"/>
 	</Camera>
+	<Camera make="Canon" model="PowerShot A630">
+		<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="12" y="6" width="-44" height="-6"/>
+		<Hints>
+			<Hint name="override_whitebalance" value="1593248,957204,1460876"/>
+		</Hints>
+		<BlackAreas>
+			<Vertical x="0" width="30"/>
+		</BlackAreas>
+		<Sensor black="0" white="1023"/>
+	</Camera>
 	<Camera make="Canon" model="PowerShot A640">
 		<CFA width="2" height="2">
 			<Color x="0" y="0">RED</Color>
@@ -1274,6 +1290,22 @@
 			<Vertical x="-30" width="30"/>
 		</BlackAreas>
 	</Camera>
+	<Camera make="Canon" model="PowerShot SX110 IS">
+		<CFA width="2" height="2">
+			<Color x="0" y="0">RED</Color>
+			<Color x="1" y="0">GREEN</Color>
+			<Color x="0" y="1">GREEN</Color>
+			<Color x="1" y="1">BLUE</Color>
+		</CFA>
+		<Crop x="6" y="12" width="-30" height="0"/>
+		<Sensor black="0" white="4095"/>
+		<Hints>
+			<Hint name="override_whitebalance" value="1614148,979180,2115417"/>
+		</Hints>
+		<BlackAreas>
+			<Vertical x="-30" width="30"/>
+		</BlackAreas>
+	</Camera>
 	<Camera make="NIKON CORPORATION" model="NIKON D100">
 		<CFA width="2" height="2">
 			<Color x="0" y="0">GREEN</Color>