liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverted some Win64 gcc 4.8 related stuff as we are on gcc4.9 now, Issue 2708

Browse Source
This commit is contained in:
Ingo
2015-03-09 15:01:37 +01:00
parent b5a7896aca
commit 1aa2ae3903
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtgui/bqentryupdater.cc
View File

@@ -68,7 +68,7 @@ void BatchQueueEntryUpdater::process (guint8* oimg, int ow, int oh, int newh, BQ
stopped = false;
tostop = false;
#if __GNUC__ == 4 && __GNUC_MINOR__ >= 8 && defined( WIN32 ) && defined(__x86_64__)
#if __GNUC__ == 4 && __GNUC_MINOR__ == 8 && defined( WIN32 ) && defined(__x86_64__)
#undef THREAD_PRIORITY_NORMAL
// See Issue 2384 comment #3
thread = Glib::Thread::create(sigc::mem_fun(*this, &BatchQueueEntryUpdater::processThread), (unsigned long int)0, true, true, Glib::THREAD_PRIORITY_NORMAL);

2
rtgui/filebrowserentry.cc
View File

@@ -206,7 +206,7 @@ void FileBrowserEntry::updateImage (rtengine::IImage8* img, double scale, rtengi
param->img = img;
param->scale = scale;
param->cropParams = cropParams;
#if __GNUC__ == 4 && __GNUC_MINOR__ >= 8 && defined( WIN32 ) && defined(__x86_64__)
#if __GNUC__ == 4 && __GNUC_MINOR__ == 8 && defined( WIN32 ) && defined(__x86_64__)
g_idle_add_full (G_PRIORITY_DEFAULT, updateImageUI, param, NULL);
#else
g_idle_add_full (G_PRIORITY_LOW, updateImageUI, param, NULL);

6
rtgui/thumbimageupdater.cc
View File

@@ -68,11 +68,11 @@ public:
active_(0),
inactive_waiting_(false)
{
int threadCount=1;
#if !(defined( WIN32 ) && defined( __x86_64__ ))
int threadCount = 1;
#if !(__GNUC__ == 4 && __GNUC_MINOR__ == 8 && defined( WIN32 ) && defined(__x86_64__))
// See Issue 2431 for explanation
#ifdef _OPENMP
threadCount=omp_get_num_procs();
threadCount = omp_get_num_procs();
#endif
#endif