[Rawstudio-commit] rawspeed r574 - RawSpeed

[Klaus Post]

Author: post
Date: 2013-09-11 20:56:30 +0200 (Wed, 11 Sep 2013)
New Revision: 574

Modified:
   RawSpeed/Camera.cpp
Log:
Just mark camera as unsupported if CFA size isn't 2x2.

Modified: RawSpeed/Camera.cpp
===================================================================
--- RawSpeed/Camera.cpp 2013-09-11 14:44:33 UTC (rev 573)
+++ RawSpeed/Camera.cpp 2013-09-11 18:56:30 UTC (rev 574)
@@ -100,21 +100,19 @@
 }
 
 void Camera::parseCameraChild(xmlDocPtr doc, xmlNodePtr cur) {
-  if (!xmlStrcmp(cur->name, (const xmlChar *) "CFA")) {
-    if (2 != getAttributeAsInt(cur, cur->name, "width"))
-      ThrowCME("Unsupported CFA size in camera %s %s", make.c_str(), 
model.c_str());
-    if (2 != getAttributeAsInt(cur, cur->name, "height"))
-      ThrowCME("Unsupported CFA size in camera %s %s", make.c_str(), 
model.c_str());
 
-    cur = cur->xmlChildrenNode;
-    while (cur != NULL) {
-      parseCFA(doc, cur);
-      cur = cur->next;
+  if (!xmlStrcmp(cur->name, (const xmlChar *) "CFA")) {    
+    if (2 != getAttributeAsInt(cur, cur->name, "width") || 2 != 
getAttributeAsInt(cur, cur->name, "height")) {
+      supported = FALSE;
+    } else {
+      cur = cur->xmlChildrenNode;
+      while (cur != NULL) {
+        parseCFA(doc, cur);
+        cur = cur->next;
+      }
     }
-
     return;
   }
-
   if (!xmlStrcmp(cur->name, (const xmlChar *) "Crop")) {
     cropPos.x = getAttributeAsInt(cur, cur->name, "x");
     cropPos.y = getAttributeAsInt(cur, cur->name, "y");


_______________________________________________
Rawstudio-commit mailing list
Rawstudio-commit@rawstudio.org
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit