diff options
| author | Bo Xu <bo_xu@foxitsoftware.com> | 2014-07-08 15:30:46 -0700 |
|---|---|---|
| committer | Bo Xu <bo_xu@foxitsoftware.com> | 2014-07-08 15:30:46 -0700 |
| commit | 3522876d5291922ddc62bf1b70d02743b0850673 (patch) | |
| tree | b3fd7eda6e8ed8f07674f6a6fba21e82ca83bee7 /core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/dwt.c | |
| parent | e7ee98e4c6fd56c9e930194e9fc11cc10e8293a1 (diff) | |
| download | pdfium-3522876d5291922ddc62bf1b70d02743b0850673.tar.xz | |
Remove custom memory manager
BUG=
R=palmer@chromium.org
Review URL: https://codereview.chromium.org/372473003
Diffstat (limited to 'core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/dwt.c')
| -rw-r--r-- | core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/dwt.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/dwt.c b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/dwt.c index 5f710e87b2..60698e3ffe 100644 --- a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/dwt.c +++ b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/dwt.c @@ -140,9 +140,7 @@ static void opj_v4dwt_interleave_h(opj_v4dwt_t* restrict w, OPJ_FLOAT32* restric static void opj_v4dwt_interleave_v(opj_v4dwt_t* restrict v , OPJ_FLOAT32* restrict a , OPJ_INT32 x, OPJ_INT32 nb_elts_read); -//#ifdef __SSE__ -// Disable __SSE__ due to bug http://crbug.com/373619. Should enable this after adding aligned malloc in memory manager -#if 0 +#ifdef __SSE__ static void opj_v4dwt_decode_step1_sse(opj_v4_t* w, OPJ_INT32 count, const __m128 c); static void opj_v4dwt_decode_step2_sse(opj_v4_t* l, opj_v4_t* w, OPJ_INT32 k, OPJ_INT32 m, __m128 c); @@ -673,9 +671,8 @@ void opj_v4dwt_interleave_v(opj_v4dwt_t* restrict v , OPJ_FLOAT32* restrict a , } } -//#ifdef __SSE__ -// Disable __SSE__ due to bug http://crbug.com/373619. Should enable this after adding aligned malloc in memory manager -#if 0 +#ifdef __SSE__ + void opj_v4dwt_decode_step1_sse(opj_v4_t* w, OPJ_INT32 count, const __m128 c){ __m128* restrict vw = (__m128*) w; OPJ_INT32 i; @@ -812,9 +809,7 @@ void opj_v4dwt_decode(opj_v4dwt_t* restrict dwt) b = 0; } -//#ifdef __SSE__ -// Disable __SSE__ due to bug http://crbug.com/373619. Should enable this after adding aligned malloc in memory manager -#if 0 +#ifdef __SSE__ opj_v4dwt_decode_step1_sse(dwt->wavelet+a, dwt->sn, _mm_set1_ps(opj_K)); opj_v4dwt_decode_step1_sse(dwt->wavelet+b, dwt->dn, _mm_set1_ps(opj_c13318)); opj_v4dwt_decode_step2_sse(dwt->wavelet+b, dwt->wavelet+a+1, dwt->sn, opj_int_min(dwt->sn, dwt->dn-a), _mm_set1_ps(opj_dwt_delta)); |