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

remove some gcc4.8/windows special code as minimum gcc version to build rt is 4.9

Browse Source
This commit is contained in:
heckflosse
2017-06-21 01:09:16 +02:00
parent 34bdc9e0eb
commit 41d3179f2c
5 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/helpersse2.h
View File

@@ -30,7 +30,7 @@ typedef __m128i vint2;
// //
#ifdef __GNUC__ #ifdef __GNUC__
#if ((__GNUC__ == 4 && __GNUC_MINOR__ >= 9) || __GNUC__ > 4) && (!defined(WIN32) || defined( __x86_64__ )) #if (!defined(WIN32) || defined( __x86_64__ ))
#define LVF(x) _mm_load_ps((float*)&x) #define LVF(x) _mm_load_ps((float*)&x)
#define LVFU(x) _mm_loadu_ps(&x) #define LVFU(x) _mm_loadu_ps(&x)
#define STVF(x,y) _mm_store_ps(&x,y) #define STVF(x,y) _mm_store_ps(&x,y)

2
rtengine/opthelper.h
View File

@@ -55,7 +55,7 @@
#define RESTRICT __restrict__ #define RESTRICT __restrict__
#define LIKELY(x) __builtin_expect (!!(x), 1) #define LIKELY(x) __builtin_expect (!!(x), 1)
#define UNLIKELY(x) __builtin_expect (!!(x), 0) #define UNLIKELY(x) __builtin_expect (!!(x), 0)
#if ((__GNUC__ == 4 && __GNUC_MINOR__ >= 9) || __GNUC__ > 4) && (!defined(WIN32) || defined( __x86_64__ )) #if (!defined(WIN32) || defined( __x86_64__ ))
#define ALIGNED64 __attribute__ ((aligned (64))) #define ALIGNED64 __attribute__ ((aligned (64)))
#define ALIGNED16 __attribute__ ((aligned (16))) #define ALIGNED16 __attribute__ ((aligned (16)))
#else // there is a bug in gcc 4.7.x when using openmp and aligned memory and -O3, also needed for WIN32 builds #else // there is a bug in gcc 4.7.x when using openmp and aligned memory and -O3, also needed for WIN32 builds

6
rtengine/simpleprocess.cc
View File

@@ -1571,13 +1571,7 @@ void startBatchProcessing (ProcessingJob* job, BatchProcessingListener* bpl, boo
{ {
if (bpl) if (bpl)
#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"
Glib::Thread::create(sigc::bind(sigc::ptr_fun(batchProcessingThread), job, bpl, tunnelMetaData), 0, true, true, Glib::THREAD_PRIORITY_NORMAL);
#else
Glib::Thread::create(sigc::bind(sigc::ptr_fun(batchProcessingThread), job, bpl, tunnelMetaData), 0, true, true, Glib::THREAD_PRIORITY_LOW); Glib::Thread::create(sigc::bind(sigc::ptr_fun(batchProcessingThread), job, bpl, tunnelMetaData), 0, true, true, Glib::THREAD_PRIORITY_LOW);
#endif
} }

4
rtgui/filebrowserentry.cc
View File

@@ -205,11 +205,7 @@ void FileBrowserEntry::updateImage (rtengine::IImage8* img, double scale, rtengi
cropParams cropParams
}; };
#if __GNUC__ == 4 && __GNUC_MINOR__ == 8 && defined( WIN32 ) && defined(__x86_64__)
const gint priority = G_PRIORITY_DEFAULT;
#else
const gint priority = G_PRIORITY_LOW; const gint priority = G_PRIORITY_LOW;
#endif
const auto func = [](gpointer data) -> gboolean { const auto func = [](gpointer data) -> gboolean {
tiupdate* const params = static_cast<tiupdate*>(data); tiupdate* const params = static_cast<tiupdate*>(data);

3
rtgui/thumbimageupdater.cc
View File

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