[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30269] trunk/blender/extern/libopenjpeg/ dwt.c: Fix #22829: build error in openjpeg with SSE using MSVC, already fixed
Brecht Van Lommel
brecht at blender.org
Tue Jul 13 15:59:34 CEST 2010
Revision: 30269
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30269
Author: blendix
Date: 2010-07-13 15:59:34 +0200 (Tue, 13 Jul 2010)
Log Message:
-----------
Fix #22829: build error in openjpeg with SSE using MSVC, already fixed
in openjpeg svn but not in any release, so adding just that fix for now.
Modified Paths:
--------------
trunk/blender/extern/libopenjpeg/dwt.c
Modified: trunk/blender/extern/libopenjpeg/dwt.c
===================================================================
--- trunk/blender/extern/libopenjpeg/dwt.c 2010-07-13 13:31:43 UTC (rev 30268)
+++ trunk/blender/extern/libopenjpeg/dwt.c 2010-07-13 13:59:34 UTC (rev 30269)
@@ -610,7 +610,7 @@
int i;
for(i = 0; i < count; ++i){
__m128 tmp = vw[i*2];
- vw[i*2] = tmp * c;
+ vw[i*2] = _mm_mul_ps(tmp, c);
}
}
@@ -622,18 +622,18 @@
__m128 tmp1 = vl[ 0];
__m128 tmp2 = vw[-1];
__m128 tmp3 = vw[ 0];
- vw[-1] = tmp2 + ((tmp1 + tmp3) * c);
+ vw[-1] = _mm_add_ps(tmp2, _mm_mul_ps(_mm_add_ps(tmp1, tmp3), c));
vl = vw;
vw += 2;
}
if(m >= k){
return;
}
- c += c;
- c *= vl[0];
+ c = _mm_add_ps(c, c);
+ c = _mm_mul_ps(c, vl[0]);
for(; m < k; ++m){
__m128 tmp = vw[-1];
- vw[-1] = tmp + c;
+ vw[-1] = _mm_add_ps(tmp, c);
vw += 2;
}
}
More information about the Bf-blender-cvs
mailing list