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

[Klaus Post]

Author: post
Date: 2012-01-22 16:15:56 +0100 (Sun, 22 Jan 2012)
New Revision: 4110

Modified:
   trunk/plugins/load-rawspeed/rawstudio-plugin-api.cpp
Log:
Free file memory before creating Rawstudio image. Reduces peak memory usage.

Modified: trunk/plugins/load-rawspeed/rawstudio-plugin-api.cpp
===================================================================
--- trunk/plugins/load-rawspeed/rawstudio-plugin-api.cpp        2012-01-22 
15:04:58 UTC (rev 4109)
+++ trunk/plugins/load-rawspeed/rawstudio-plugin-api.cpp        2012-01-22 
15:15:56 UTC (rev 4110)
@@ -111,6 +111,9 @@
                                g_warning("RawSpeed: Error Encountered:%s\n", 
d->errors[i]);
 
                        RawImage r = d->mRaw;
+                       delete d; d = NULL;
+                       delete m; m = NULL;
+
       r->scaleBlackWhite();
 
 #ifdef TIME_LOAD
@@ -124,8 +127,6 @@
                        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();
                        }
@@ -133,8 +134,6 @@
                        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();
                        }
 


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