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

RT 4.0.11.177 Segfault on start with 32-bit Linux, Issue 2118

Browse Source
This commit is contained in:
Ingo
2013-12-12 18:35:15 +01:00
parent ce6b2c031d
commit 74f0ab594c
2 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtengine/LUT.h
View File

@@ -81,7 +81,7 @@ private:
unsigned int maxs;
T * data;
unsigned int clip, size, owner;
#if defined( __SSE2__ ) && ((defined( WIN32 ) && defined( __x86_64__ )) || !defined( WIN32 ))
#if defined( __SSE2__ ) && defined( __x86_64__ )
__m128 maxsv __attribute__ ((aligned (16)));
__m128 sizev __attribute__ ((aligned (16)));
__m128i maxsiv __attribute__ ((aligned (16)));
@@ -104,7 +104,7 @@ public:
owner = 1;
size = s;
maxs=size-2;
#if defined( __SSE2__ ) && ((defined( WIN32 ) && defined( __x86_64__ )) || !defined( WIN32 ))
#if defined( __SSE2__ ) && defined( __x86_64__ )
maxsv = _mm_set1_ps( maxs );
maxsiv = _mm_cvttps_epi32( maxsv );
sizeiv = _mm_set1_epi32( (int)(size-1) );
@@ -125,7 +125,7 @@ public:
owner = 1;
size = s;
maxs=size-2;
#if defined( __SSE2__ ) && ((defined( WIN32 ) && defined( __x86_64__ )) || !defined( WIN32 ))
#if defined( __SSE2__ ) && defined( __x86_64__ )
maxsv = _mm_set1_ps( maxs );
maxsiv = _mm_cvttps_epi32( maxsv );
sizeiv = _mm_set1_epi32( (int)(size-1) );
@@ -148,7 +148,7 @@ public:
owner = 1;
size = s;
maxs=size-2;
#if defined( __SSE2__ ) && ((defined( WIN32 ) && defined( __x86_64__ )) || !defined( WIN32 ))
#if defined( __SSE2__ ) && defined( __x86_64__ )
maxsv = _mm_set1_ps( size - 2);
maxsiv = _mm_cvttps_epi32( maxsv );
sizeiv = _mm_set1_epi32( (int)(size-1) );
@@ -190,7 +190,7 @@ public:
memcpy(this->data,rhs.data,rhs.size*sizeof(T));
this->size=rhs.size;
this->maxs=this->size-2;
#if defined( __SSE2__ ) && ((defined( WIN32 ) && defined( __x86_64__ )) || !defined( WIN32 ))
#if defined( __SSE2__ ) && defined( __x86_64__ )
this->maxsv = _mm_set1_ps( this->size - 2);
this->maxsiv = _mm_cvttps_epi32( this->maxsv );
this->sizeiv = _mm_set1_epi32( (int)(this->size-1) );
@@ -213,7 +213,7 @@ public:
}
#if defined( __SSE2__ ) && ((defined( WIN32 ) && defined( __x86_64__ )) || !defined( WIN32 ))
#if defined( __SSE2__ ) && defined( __x86_64__ )
__m128 operator[](__m128 indexv ) const {
printf("don't use this operator. It's not ready for production");
return _mm_setzero_ps();

8
rtengine/shmap.cc
View File

@@ -192,7 +192,7 @@ void SHMap::dirpyr_shmap(float ** data_fine, float ** data_coarse, int width, in
#pragma omp parallel
#endif
{
#if defined( __SSE2__ ) && ((defined( WIN32 ) && defined( __x86_64__ )) || !defined( WIN32 ))
#if defined( __SSE2__ ) && defined( __x86_64__ )
__m128 dirwtv, valv, normv;
#endif // __SSE2__
int j;
@@ -215,7 +215,7 @@ void SHMap::dirpyr_shmap(float ** data_fine, float ** data_coarse, int width, in
}
data_coarse[i][j] = val/norm; // low pass filter
}
#if defined( __SSE2__ ) && ((defined( WIN32 ) && defined( __x86_64__ )) || !defined( WIN32 ))
#if defined( __SSE2__ ) && defined( __x86_64__ )
for(; j < (width-scalewin)-3; j+=4)
{
valv= _mm_setzero_ps();
@@ -288,7 +288,7 @@ else {
#pragma omp parallel
#endif
{
#if defined( __SSE2__ ) && ((defined( WIN32 ) && defined( __x86_64__ )) || !defined( WIN32 ))
#if defined( __SSE2__ ) && defined( __x86_64__ )
__m128 dirwtv, valv, normv;
float domkerv[5][5][4] __attribute__ ((aligned (16))) = {{{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1}},{{1,1,1,1},{2,2,2,2},{2,2,2,2},{2,2,2,2},{1,1,1,1}},{{1,1,1,1},{2,2,2,2},{2,2,2,2},{2,2,2,2},{1,1,1,1}},{{1,1,1,1},{2,2,2,2},{2,2,2,2},{2,2,2,2},{1,1,1,1}},{{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1}}};
@@ -313,7 +313,7 @@ else {
}
data_coarse[i][j] = val/norm; // low pass filter
}
#if defined( __SSE2__ ) && ((defined( WIN32 ) && defined( __x86_64__ )) || !defined( WIN32 ))
#if defined( __SSE2__ ) && defined( __x86_64__ )
for(; j < width-scalewin-3; j+=4)
{
valv = _mm_setzero_ps();