[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34790] trunk/blender/source/blender: - resource leak in pointcache, opendir without closedir()

[Campbell Barton]

Revision: 34790
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34790
Author:   campbellbarton
Date:     2011-02-12 09:09:52 +0000 (Sat, 12 Feb 2011)
Log Message:
-----------
- resource leak in pointcache, opendir without closedir()
- reading pointcache was using an incorrect, always NULL variable.
- commented NDof code, was giving warnings and isnt used now.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/pointcache.c
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
    trunk/blender/source/blender/imbuf/IMB_thumbs.h

Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c	2011-02-12 08:12:00 UTC (rev 34789)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c	2011-02-12 09:09:52 UTC (rev 34790)
@@ -2863,6 +2863,7 @@
 			}
 		}
 	}
+	closedir(dir);
 
 	strcpy(pid->cache->name, old_name);
 }

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2011-02-12 08:12:00 UTC (rev 34789)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2011-02-12 09:09:52 UTC (rev 34790)
@@ -2981,9 +2981,8 @@
 
 static void direct_link_pointcache_list(FileData *fd, ListBase *ptcaches, PointCache **ocache, int force_disk)
 {
-	PointCache *cache= NULL;
-
 	if(ptcaches->first) {
+		PointCache *cache= NULL;
 		link_list(fd, ptcaches);
 		for(cache=ptcaches->first; cache; cache=cache->next) {
 			direct_link_pointcache(fd, cache);
@@ -3001,7 +3000,7 @@
 		direct_link_pointcache(fd, *ocache);
 		if(force_disk) {
 			(*ocache)->flag |= PTCACHE_DISK_CACHE;
-			cache->step = 1;
+			(*ocache)->step = 1;
 		}
 
 		ptcaches->first = ptcaches->last = *ocache;

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2011-02-12 08:12:00 UTC (rev 34789)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2011-02-12 09:09:52 UTC (rev 34790)
@@ -2799,6 +2799,7 @@
 			sbval[i]=0.0;
 }
 
+#if 0
 // statics for controlling rv3d->dist corrections.
 // viewmoveNDOF zeros and adjusts rv3d->ofs.
 // viewmove restores based on dz_flag state.
@@ -3139,6 +3140,7 @@
 	 */
 // XXX    scrarea_do_windraw(curarea);
 }
+#endif // if 0, unused NDof code
 
 /* give a 4x4 matrix from a perspective view, only needs viewquat, ofs and dist
  * basically the same as...

Modified: trunk/blender/source/blender/imbuf/IMB_thumbs.h
===================================================================
--- trunk/blender/source/blender/imbuf/IMB_thumbs.h	2011-02-12 08:12:00 UTC (rev 34789)
+++ trunk/blender/source/blender/imbuf/IMB_thumbs.h	2011-02-12 09:09:52 UTC (rev 34790)
@@ -75,6 +75,9 @@
 ImBuf *IMB_loadblend_thumb(const char *path);
 void IMB_overlayblend_thumb(unsigned int *thumb, int width, int height, float aspect);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
 
 #endif /* _IMB_THUMBS_H */