aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2011-09-29 17:29:27 +0200
committerThomas White <taw@physics.org>2012-02-22 15:27:38 +0100
commit36972a358fb091d4be716fae33237e3711f926ec (patch)
tree9dfac63234534a82aef5138ec62d3ff91b62045a /src
parentc61bb4faabafb8fd7d132a431a37057bee1cb109 (diff)
Fix stack corruption
Diffstat (limited to 'src')
-rw-r--r--src/hrs-scaling.h2
-rw-r--r--src/partialator.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/src/hrs-scaling.h b/src/hrs-scaling.h
index a18d3a0b..70157f3f 100644
--- a/src/hrs-scaling.h
+++ b/src/hrs-scaling.h
@@ -21,7 +21,7 @@
#include "image.h"
extern RefList *scale_intensities(struct image *images, int n,
- RefList *reference);
+ RefList *reference, int n_threads);
#endif /* HRS_SCALING_H */
diff --git a/src/partialator.c b/src/partialator.c
index 06e23861..6b4719eb 100644
--- a/src/partialator.c
+++ b/src/partialator.c
@@ -492,7 +492,8 @@ int main(int argc, char *argv[])
/* Make initial estimates */
STATUS("Performing initial scaling.\n");
- full = scale_intensities(images, n_usable_patterns, reference);
+ full = scale_intensities(images, n_usable_patterns, reference,
+ nthreads);
sr = sr_titlepage(images, n_usable_patterns, "scaling-report.pdf",
infile, cmdline);
@@ -530,7 +531,7 @@ int main(int argc, char *argv[])
/* Re-estimate all the full intensities */
reflist_free(full);
full = scale_intensities(images, n_usable_patterns,
- reference);
+ reference, nthreads);
sr_iteration(sr, i+1, images, n_usable_patterns, full);