summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars-Dominik Braun <lars@6xq.net>2015-02-09 17:09:20 +0100
committerLars-Dominik Braun <lars@6xq.net>2015-05-02 21:36:44 +0200
commit9cdac5c8de53244dcd19aa15d646c022a2614c24 (patch)
treee06ee0abf4e9ddfb4fdb55298992f9b72a98d883
parentb2dfbdf4d9644c684c938cb2730deab66aa06d9b (diff)
downloadpucket-9cdac5c8de53244dcd19aa15d646c022a2614c24.tar.gz
pucket-9cdac5c8de53244dcd19aa15d646c022a2614c24.tar.bz2
pucket-9cdac5c8de53244dcd19aa15d646c022a2614c24.zip
Fix crash
For some reason filter is overwritten by pthread_join, removing its second argument fixes the problem. It is unused anyway.
-rw-r--r--rect.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/rect.c b/rect.c
index ddea9cf..d08247d 100644
--- a/rect.c
+++ b/rect.c
@@ -31,7 +31,6 @@
* image = filter(accum)
*/
-
/* allow this many iterations for settling into attractor */
#define FUSE_27 15
#define FUSE_28 100
@@ -902,7 +901,7 @@ static int render_rectangle(flam3_frame *spec, void *out,
/* Wait for them to return */
for (thi=0; thi < spec->nthreads; thi++)
- pthread_join(myThreads[thi], (void **)&thread_status);
+ pthread_join(myThreads[thi], NULL);
#if defined(USE_LOCKS)
pthread_mutex_destroy(&fic.bucket_mutex);
@@ -1033,7 +1032,7 @@ static int render_rectangle(flam3_frame *spec, void *out,
/* Wait for them to return */
for (thi=0; thi < spec->nthreads; thi++)
- pthread_join(myThreads[thi], (void **)&thread_status);
+ pthread_join(myThreads[thi], NULL);
free(myThreads);
#else