diff options
| author | Nicolas Pena <npm@chromium.org> | 2017-09-01 13:25:16 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-05 14:10:37 +0000 |
| commit | 088ca03f25fe1f6d75c0ff3b71e0ad3d018a5e0c (patch) | |
| tree | 27f55db27d9112910d9219efa58474a0c2bd9b52 /third_party/libopenjpeg20/0012-mct_sse.patch | |
| parent | 740bcd892d22136873b2b123b94e51bf6e77b8f9 (diff) | |
| download | pdfium-088ca03f25fe1f6d75c0ff3b71e0ad3d018a5e0c.tar.xz | |
Upgrade OpenJPEG to 2.2.0
This CL upgrades OpenJPEG by copying the files from 2.2.0 and then applying
patches. Patch files that are no longer relevant are deleted. The relevant
ones are applied manually due to changes in formatting in OpenJPEG. Patch 34
is added to account for opj_malloc changes in PDFium.
Bug: chromium:718731
Change-Id: I3d316893eab5e235c9f71222a6818b8ae0c98383
Reviewed-on: https://pdfium-review.googlesource.com/12770
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'third_party/libopenjpeg20/0012-mct_sse.patch')
| -rw-r--r-- | third_party/libopenjpeg20/0012-mct_sse.patch | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/third_party/libopenjpeg20/0012-mct_sse.patch b/third_party/libopenjpeg20/0012-mct_sse.patch index bf08276764..168b9123e4 100644 --- a/third_party/libopenjpeg20/0012-mct_sse.patch +++ b/third_party/libopenjpeg20/0012-mct_sse.patch @@ -1,5 +1,5 @@ diff --git a/third_party/libopenjpeg20/mct.c b/third_party/libopenjpeg20/mct.c -index 8b0276f..7731c15 100644 +index 8c82ee20a..20b9e121b 100644 --- a/third_party/libopenjpeg20/mct.c +++ b/third_party/libopenjpeg20/mct.c @@ -37,13 +37,16 @@ @@ -22,39 +22,39 @@ index 8b0276f..7731c15 100644 #include <smmintrin.h> #endif -@@ -72,7 +75,7 @@ const OPJ_FLOAT64 * opj_mct_get_mct_norms_real () +@@ -72,7 +75,7 @@ const OPJ_FLOAT64 * opj_mct_get_mct_norms_real() /* <summary> */ /* Forward reversible MCT. */ /* </summary> */ -#ifdef __SSE2__ +#ifdef USE_SSE2 void opj_mct_encode( - OPJ_INT32* restrict c0, - OPJ_INT32* restrict c1, -@@ -137,7 +140,7 @@ void opj_mct_encode( + OPJ_INT32* OPJ_RESTRICT c0, + OPJ_INT32* OPJ_RESTRICT c1, +@@ -141,7 +144,7 @@ void opj_mct_encode( /* <summary> */ /* Inverse reversible MCT. */ /* </summary> */ -#ifdef __SSE2__ +#ifdef USE_SSE2 void opj_mct_decode( - OPJ_INT32* restrict c0, - OPJ_INT32* restrict c1, -@@ -204,7 +207,7 @@ OPJ_FLOAT64 opj_mct_getnorm(OPJ_UINT32 compno) { + OPJ_INT32* OPJ_RESTRICT c0, + OPJ_INT32* OPJ_RESTRICT c1, +@@ -209,7 +212,7 @@ OPJ_FLOAT64 opj_mct_getnorm(OPJ_UINT32 compno) /* <summary> */ /* Forward irreversible MCT. */ /* </summary> */ -#ifdef __SSE4_1__ +#ifdef USE_SSE4 void opj_mct_encode_real( - OPJ_INT32* restrict c0, - OPJ_INT32* restrict c1, -@@ -377,7 +380,7 @@ void opj_mct_decode_real( - OPJ_UINT32 n) + OPJ_INT32* OPJ_RESTRICT c0, + OPJ_INT32* OPJ_RESTRICT c1, +@@ -389,7 +392,7 @@ void opj_mct_decode_real( + OPJ_UINT32 n) { - OPJ_UINT32 i; + OPJ_UINT32 i; -#ifdef __SSE__ +#ifdef USE_SSE - __m128 vrv, vgu, vgv, vbu; - vrv = _mm_set1_ps(1.402f); - vgu = _mm_set1_ps(0.34413f); + __m128 vrv, vgu, vgv, vbu; + vrv = _mm_set1_ps(1.402f); + vgu = _mm_set1_ps(0.34413f); |