[Rawstudio-commit] r3892 - trunk/plugins/load-rawspeed

[Klaus Post]

Author: post
Date: 2011-03-19 20:43:15 +0100 (Sat, 19 Mar 2011)
New Revision: 3892

Modified:
   trunk/plugins/load-rawspeed/rawstudio-plugin-api.cpp
Log:
Adjust to reflect changes.

Modified: trunk/plugins/load-rawspeed/rawstudio-plugin-api.cpp
===================================================================
--- trunk/plugins/load-rawspeed/rawstudio-plugin-api.cpp        2011-03-19 
19:40:07 UTC (rev 3891)
+++ trunk/plugins/load-rawspeed/rawstudio-plugin-api.cpp        2011-03-19 
19:43:15 UTC (rev 3892)
@@ -125,10 +125,20 @@
                        else if (cpp == 3) 
                                image = rs_image16_new(r->dim.x, r->dim.y, 3, 
4);
                        else {
+                               if (d) delete d;
+                               if (m) delete m;
                                g_warning("RawSpeed: Unsupported component per 
pixel count\n");
                                return rs_filter_response_new();
                        }
 
+                       if (!r->getDataType() == TYPE_USHORT16)
+                       {
+                               g_warning("RawSpeed: Unsupported data type\n");
+                               if (d) delete d;
+                               if (m) delete m;
+                               return rs_filter_response_new();
+                       }
+
                        if (r->isCFA)
                                image->filters = r->cfa.getDcrawFilter();
 
@@ -136,7 +146,7 @@
       if (cpp == 1) 
       {
         BitBlt((uchar8 *)(GET_PIXEL(image,0,0)),image->pitch*2,
-          r->getData(0,0), r->pitch, r->bpp*r->dim.x, r->dim.y);
+          r->getData(0,0), r->pitch, r->getBpp()*r->dim.x, r->dim.y);
       } else 
       {
         for(row=0;row<image->h;row++)


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