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
COMPILE.txt
View File

@@ -121,7 +121,7 @@ WINDOWS
INSTALL THE TOOLCHAIN INSTALL THE TOOLCHAIN
- TDM-GCC On-Demand Installer - TDM-GCC On-Demand Installer
http://tdm-gcc.tdragon.net/download http://tdm-gcc.tdragon.net/download
GCC 4.7 is recommended, as under some conditions older GCC 4.9 is recommended for Win64 builds, as under some conditions older
versions of GCC can cause artifacts. versions of GCC can cause artifacts.
Download the "tdm-gcc-webdl" option. Run it, select "Create a new Download the "tdm-gcc-webdl" option. Run it, select "Create a new
TDM-GCC installation" and choose the appropriate option for your TDM-GCC installation" and choose the appropriate option for your

2
rtengine/simpleprocess.cc
View File

@@ -1195,7 +1195,7 @@ void batchProcessingThread (ProcessingJob* job, BatchProcessingListener* bpl, bo
void startBatchProcessing (ProcessingJob* job, BatchProcessingListener* bpl, bool tunnelMetaData) { void startBatchProcessing (ProcessingJob* job, BatchProcessingListener* bpl, bool tunnelMetaData) {
if (bpl) if (bpl)
#if __GNUC__ == 4 && __GNUC_MINOR__ >= 8 && defined( WIN32 ) && defined(__x86_64__) #if __GNUC__ == 4 && __GNUC_MINOR__ == 8 && defined( WIN32 ) && defined(__x86_64__)
// See Issue 2384 "Very bad response time on win7/64 using gcc 4.8 when queue is running" // See Issue 2384 "Very bad response time on win7/64 using gcc 4.8 when queue is running"
Glib::Thread::create(sigc::bind(sigc::ptr_fun(batchProcessingThread), job, bpl, tunnelMetaData), 0, true, true, Glib::THREAD_PRIORITY_NORMAL); Glib::Thread::create(sigc::bind(sigc::ptr_fun(batchProcessingThread), job, bpl, tunnelMetaData), 0, true, true, Glib::THREAD_PRIORITY_NORMAL);
#else #else

2
rtgui/bqentryupdater.cc
View File

@@ -68,7 +68,7 @@ void BatchQueueEntryUpdater::process (guint8* oimg, int ow, int oh, int newh, BQ
stopped = false; stopped = false;
tostop = 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 #undef THREAD_PRIORITY_NORMAL
// See Issue 2384 comment #3 // 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); 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->img = img;
param->scale = scale; param->scale = scale;
param->cropParams = cropParams; 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); g_idle_add_full (G_PRIORITY_DEFAULT, updateImageUI, param, NULL);
#else #else
g_idle_add_full (G_PRIORITY_LOW, updateImageUI, param, NULL); g_idle_add_full (G_PRIORITY_LOW, updateImageUI, param, NULL);

2
rtgui/thumbimageupdater.cc
View File

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