Revision: 38965
http://brlcad.svn.sourceforge.net/brlcad/?rev=38965&view=rev
Author: erikgreenwald
Date: 2010-05-04 21:53:56 +0000 (Tue, 04 May 2010)
Log Message:
-----------
pthread wrapping fixes
Modified Paths:
--------------
brlcad/trunk/src/adrt/librender/camera.c
brlcad/trunk/src/adrt/librender/camera.h
Modified: brlcad/trunk/src/adrt/librender/camera.c
===================================================================
--- brlcad/trunk/src/adrt/librender/camera.c 2010-05-04 21:53:18 UTC (rev
38964)
+++ brlcad/trunk/src/adrt/librender/camera.c 2010-05-04 21:53:56 UTC (rev
38965)
@@ -71,9 +71,9 @@
render_normal_init(&camera->render, NULL);
camera->rm = RENDER_METHOD_PHONG;
+#ifdef HAVE_PTHREAD_H
render_tlist = NULL;
-#ifdef HAVE_PTHREAD_H
- if (camera->thread_num > 1) {
+ if (camera->thread_num > 1) {
bu_log("Allocating thread memory\n");
render_tlist = (pthread_t *)bu_malloc(sizeof(pthread_t) *
camera->thread_num, "render_tlist");
if(render_tlist == NULL) {
@@ -88,8 +88,10 @@
void
render_camera_free(render_camera_t *camera)
{
+#ifdef HAVE_PTHREAD_H
if (camera->thread_num > 1)
bu_free(render_tlist, "render_tlist");
+#endif
}
Modified: brlcad/trunk/src/adrt/librender/camera.h
===================================================================
--- brlcad/trunk/src/adrt/librender/camera.h 2010-05-04 21:53:18 UTC (rev
38964)
+++ brlcad/trunk/src/adrt/librender/camera.h 2010-05-04 21:53:56 UTC (rev
38965)
@@ -85,7 +85,9 @@
camera_tile_t *tile;
void *res_buf;
unsigned int *scanline;
+#ifdef HAVE_PTHREAD_H
pthread_mutex_t mut;
+#endif
} render_camera_thread_data_t;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
