Merge branch 'master' into gtk3-merge-master-b8eb349
This commit is contained in:
@@ -29,7 +29,8 @@
|
||||
#define DEBUG(format,args...)
|
||||
//#define DEBUG(format,args...) printf("PreviewLoader::%s: " format "\n", __FUNCTION__, ## args)
|
||||
|
||||
class PreviewLoader::Impl
|
||||
class PreviewLoader::Impl :
|
||||
public rtengine::NonCopyable
|
||||
{
|
||||
public:
|
||||
struct Job {
|
||||
@@ -72,9 +73,10 @@ public:
|
||||
|
||||
Impl(): nConcurrentThreads(0)
|
||||
{
|
||||
int threadCount = 2;
|
||||
#ifdef _OPENMP
|
||||
threadCount = omp_get_num_procs();
|
||||
int threadCount = omp_get_num_procs();
|
||||
#else
|
||||
int threadCount = 2;
|
||||
#endif
|
||||
|
||||
threadPool_ = new Glib::ThreadPool(threadCount, 0);
|
||||
|
Reference in New Issue
Block a user