summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJosh Andler <scislac@gmail.com>2010-07-21 19:41:17 +0000
committerJosh Andler <scislac@gmail.com>2010-07-21 19:41:17 +0000
commit7eb61c4a3051f8135cae707883a0ea7219a9350b (patch)
tree1a37f2a6bfa67f2705f773716861444a23dc8c1c /src
parent- do not use shift to disable snapping while holding shift to rotate a guide (diff)
downloadinkscape-7eb61c4a3051f8135cae707883a0ea7219a9350b.tar.gz
inkscape-7eb61c4a3051f8135cae707883a0ea7219a9350b.zip
OpenMP fix for Linux & OS X
(bzr r9606.1.16)
Diffstat (limited to 'src')
-rw-r--r--src/display/nr-filter-gaussian.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/display/nr-filter-gaussian.cpp b/src/display/nr-filter-gaussian.cpp
index 9509eaef7..a45e838da 100644
--- a/src/display/nr-filter-gaussian.cpp
+++ b/src/display/nr-filter-gaussian.cpp
@@ -590,7 +590,8 @@ int FilterGaussian::render(FilterSlot &slot, FilterUnits const &units)
double const deviation_y_org = _deviation_y * trans.expansionY();
int const PC = NR_PIXBLOCK_BPP(in);
#if HAVE_OPENMP
- int const NTHREADS = std::max(1,std::min(8, Inkscape::Preferences::get()->getInt("/options/threading/numthreads", omp_get_num_procs())));
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ int const NTHREADS = prefs->getIntLimited("/options/threading/numthreads", omp_get_num_procs(), 1, 256);
#else
int const NTHREADS = 1;
#endif // HAVE_OPENMP