Skip to content

C
core
Kaydet (Commit) bbbef156 authored tarafından David Ostrovsky's avatar David Ostrovsky Kaydeden (comit) Thorsten Behrens
Dosyalara gözat
Seçenekler

Bump jpeg-turbo version to 1.4.2 

Change-Id: Ie0d274423a66db49f58bf4de423ad7b0cc638d47
Reviewed-on: https://gerrit.libreoffice.org/20116Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
üst ff66223f
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 362 deletions
download.lst
Dosyayı görüntüle @ bbbef156
......@@ -73,8 +73,8 @@ export JFREEREPORT_LIBXML_TARBALL := ace6ab49184e329db254e454a010f56d-libxml-1.1
export JFREEREPORT_SAC_TARBALL := 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
export JPEG_MD5SUM := 3353992aecaee1805ef4109aadd433e7
export JPEG_TARBALL := jpegsrc.v9a.tar.gz
export JPEG_TURBO_MD5SUM := 2c3a68129dac443a72815ff5bb374b05
export JPEG_TURBO_TARBALL := libjpeg-turbo-1.3.1.tar.gz
export JPEG_TURBO_MD5SUM := 86b0d5f7507c2e6c21c00219162c3c44
export JPEG_TURBO_TARBALL := libjpeg-turbo-1.4.2.tar.gz
export LANGTAGREG_MD5SUM := bf5986dbfa1c9a0f26cf1b00ed369484
export LANGTAGREG_TARBALL := language-subtag-registry-2015-08-04.tar.bz2
export LANGUAGETOOL_TARBALL := b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
......
external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk
Dosyayı görüntüle @ bbbef156
......@@ -16,8 +16,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,jpeg-turbo,0))
$(eval $(call gb_UnpackedTarball_add_patches,jpeg-turbo,\
external/jpeg-turbo/jpeg-turbo.build.patch.1 \
$(if $(filter WNT,$(OS)),external/jpeg-turbo/jpeg-turbo.win_build.patch.1) \
external/jpeg-turbo/ubsan.patch \
external/jpeg-turbo/abi64.patch \
))
# vim: set noet sw=4 ts=4:
external/jpeg-turbo/abi64.patch deleted 100644 → 0
Dosyayı görüntüle @ ff66223f
cf. <https://github.com/libjpeg-turbo/libjpeg-turbo/commit/
8b2c04f774d18e05e321ee67a9a38b4d7e84f168> "Fix x86-64 ABI conformance issue in
SIMD code":
--- simd/jcclrss2-64.asm
+++ simd/jcclrss2-64.asm
@@ -50,14 +50,14 @@
collect_args
push rbx
- mov rcx, r10
+ mov ecx, r10d
test rcx,rcx
jz near .return
push rcx
mov rsi, r12
- mov rcx, r13
+ mov ecx, r13d
mov rdi, JSAMPARRAY [rsi+0*SIZEOF_JSAMPARRAY]
mov rbx, JSAMPARRAY [rsi+1*SIZEOF_JSAMPARRAY]
mov rdx, JSAMPARRAY [rsi+2*SIZEOF_JSAMPARRAY]
--- simd/jcgryss2-64.asm
+++ simd/jcgryss2-64.asm
@@ -50,14 +50,14 @@
collect_args
push rbx
- mov rcx, r10
+ mov ecx, r10d
test rcx,rcx
jz near .return
push rcx
mov rsi, r12
- mov rcx, r13
+ mov ecx, r13d
mov rdi, JSAMPARRAY [rsi+0*SIZEOF_JSAMPARRAY]
lea rdi, [rdi+rcx*SIZEOF_JSAMPROW]
--- simd/jcqnts2f-64.asm
+++ simd/jcqnts2f-64.asm
@@ -50,7 +50,7 @@
packsswb xmm7,xmm7 ; xmm7 = PB_CENTERJSAMPLE (0x808080..)
mov rsi, r10
- mov rax, r11
+ mov eax, r11d
mov rdi, r12
mov rcx, DCTSIZE/2
.convloop:
--- simd/jcqnts2i-64.asm
+++ simd/jcqnts2i-64.asm
@@ -50,7 +50,7 @@
psllw xmm7,7 ; xmm7={0xFF80 0xFF80 0xFF80 0xFF80 ..}
mov rsi, r10
- mov rax, r11
+ mov eax, r11d
mov rdi, r12
mov rcx, DCTSIZE/4
.convloop:
--- simd/jcsamss2-64.asm
+++ simd/jcsamss2-64.asm
@@ -49,11 +49,11 @@
mov rbp,rsp
collect_args
- mov rcx, r13
+ mov ecx, r13d
shl rcx,3 ; imul rcx,DCTSIZE (rcx = output_cols)
jz near .return
- mov rdx, r10
+ mov edx, r10d
; -- expand_right_edge
@@ -90,7 +90,7 @@
; -- h2v1_downsample
- mov rax, r12 ; rowctr
+ mov eax, r12d ; rowctr
test eax,eax
jle near .return
@@ -193,11 +193,11 @@
mov rbp,rsp
collect_args
- mov rcx, r13
+ mov rcx, r13
shl rcx,3 ; imul rcx,DCTSIZE (rcx = output_cols)
jz near .return
- mov rdx, r10
+ mov edx, r10d
; -- expand_right_edge
@@ -234,7 +234,7 @@
; -- h2v2_downsample
- mov rax, r12 ; rowctr
+ mov eax, r12d ; rowctr
test rax,rax
jle near .return
--- simd/jdclrss2-64.asm
+++ simd/jdclrss2-64.asm
@@ -52,14 +52,14 @@
collect_args
push rbx
- mov rcx, r10 ; num_cols
+ mov ecx, r10d ; num_cols
test rcx,rcx
jz near .return
push rcx
mov rdi, r11
- mov rcx, r12
+ mov ecx, r12d
mov rsi, JSAMPARRAY [rdi+0*SIZEOF_JSAMPARRAY]
mov rbx, JSAMPARRAY [rdi+1*SIZEOF_JSAMPARRAY]
mov rdx, JSAMPARRAY [rdi+2*SIZEOF_JSAMPARRAY]
--- simd/jdmrgss2-64.asm
+++ simd/jdmrgss2-64.asm
@@ -52,14 +52,14 @@
collect_args
push rbx
- mov rcx, r10 ; col
+ mov ecx, r10d ; col
test rcx,rcx
jz near .return
push rcx
mov rdi, r11
- mov rcx, r12
+ mov ecx, r12d
mov rsi, JSAMPARRAY [rdi+0*SIZEOF_JSAMPARRAY]
mov rbx, JSAMPARRAY [rdi+1*SIZEOF_JSAMPARRAY]
mov rdx, JSAMPARRAY [rdi+2*SIZEOF_JSAMPARRAY]
@@ -455,10 +455,10 @@
collect_args
push rbx
- mov rax, r10
+ mov eax, r10d
mov rdi, r11
- mov rcx, r12
+ mov ecx, r12d
mov rsi, JSAMPARRAY [rdi+0*SIZEOF_JSAMPARRAY]
mov rbx, JSAMPARRAY [rdi+1*SIZEOF_JSAMPARRAY]
mov rdx, JSAMPARRAY [rdi+2*SIZEOF_JSAMPARRAY]
--- simd/jdsamss2-64.asm
+++ simd/jdsamss2-64.asm
@@ -67,7 +67,7 @@
mov rbp,rsp
collect_args
- mov rax, r11 ; colctr
+ mov eax, r11d ; colctr
test rax,rax
jz near .return
@@ -214,7 +214,7 @@
collect_args
push rbx
- mov rax, r11 ; colctr
+ mov eax, r11d ; colctr
test rax,rax
jz near .return
@@ -506,7 +506,7 @@
mov rbp,rsp
collect_args
- mov rdx, r11
+ mov edx, r11d
add rdx, byte (2*SIZEOF_XMMWORD)-1
and rdx, byte -(2*SIZEOF_XMMWORD)
jz near .return
@@ -596,7 +596,7 @@
collect_args
push rbx
- mov rdx, r11
+ mov edx, r11d
add rdx, byte (2*SIZEOF_XMMWORD)-1
and rdx, byte -(2*SIZEOF_XMMWORD)
jz near .return
--- simd/jiss2flt-64.asm
+++ simd/jiss2flt-64.asm
@@ -326,7 +326,7 @@
mov rax, [original_rbp]
lea rsi, [workspace] ; FAST_FLOAT * wsptr
mov rdi, r12 ; (JSAMPROW *)
- mov rax, r13
+ mov eax, r13d
mov rcx, DCTSIZE/4 ; ctr
.rowloop:
--- simd/jiss2fst-64.asm
+++ simd/jiss2fst-64.asm
@@ -323,7 +323,7 @@
mov rax, [original_rbp]
mov rdi, r12 ; (JSAMPROW *)
- mov rax, r13
+ mov eax, r13d
; -- Even part
--- simd/jiss2int-64.asm
+++ simd/jiss2int-64.asm
@@ -515,7 +515,7 @@
mov rax, [original_rbp]
mov rdi, r12 ; (JSAMPROW *)
- mov rax, r13
+ mov eax, r13d
; -- Even part
--- simd/jiss2red-64.asm
+++ simd/jiss2red-64.asm
@@ -312,7 +312,7 @@
mov rax, [original_rbp]
mov rdi, r12 ; (JSAMPROW *)
- mov rax, r13
+ mov eax, r13d
; -- Even part
@@ -521,7 +521,7 @@
; ---- Pass 2: process rows, store into output array.
mov rdi, r12 ; (JSAMPROW *)
- mov rax, r13
+ mov eax, r13d
; | input:| result:|
; | A0 B0 | |
external/jpeg-turbo/jpeg-turbo.build.patch.1
Dosyayı görüntüle @ bbbef156
diff -ur jpeg.org/configure jpeg/configure
--- jpeg.org/configure 2014-11-14 12:05:43.345386578 +0100
+++ jpeg/configure 2014-11-14 12:08:59.077388882 +0100
@@ -22977,10 +22977,6 @@
else
rm -rf conftest*
echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- { { echo "$as_me:$LINENO: error: configuration problem: maybe object file format mismatch." >&5
-echo "$as_me: error: configuration problem: maybe object file format mismatch." >&2;}
- { (exit 1); exit 1; }; }
fi
@@ -23179,10 +23175,6 @@
else
rm -rf conftest*
echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- { { echo "$as_me:$LINENO: error: configuration problem: maybe object file format mismatch." >&5
-echo "$as_me: error: configuration problem: maybe object file format mismatch." >&2;}
- { (exit 1); exit 1; }; }
fi
diff -ur jpeg.org/Makefile.am jpeg/Makefile.am
--- jpeg.org/Makefile.am 2014-11-14 12:05:43.349386578 +0100
+++ jpeg/Makefile.am 2014-11-14 12:06:21.005387021 +0100
@@ -160,8 +160,6 @@
@@ -174,8 +174,6 @@
rm -rf `find $(distdir) -name .svn`
-SUBDIRS += md5
-
MD5_JPEG_INT = 9a68f56bc76e466aa7e52f415d0f4a5f
MD5_JPEG_FAST = 0e1502e7fa421835e376a314fac2a39f
MD5_JPEG_FAST_100 = 7bf72a8e741d64eecb960c97323af77c
diff -ur jpeg.org/Makefile.in jpeg/Makefile.in
--- jpeg.org/Makefile.in 2014-11-14 12:05:43.333386578 +0100
+++ jpeg/Makefile.in 2014-11-14 12:20:00.689396668 +0100
@@ -264,7 +264,7 @@
HEADERS = $(include_HEADERS) $(nodist_include_HEADERS)
if WITH_12BIT
TESTORIG = testorig12.jpg
diff -ru jpeg-turbo.orig/Makefile.in jpeg-turbo/Makefile.in
--- jpeg-turbo.orig/Makefile.in 2015-09-21 20:48:45.000000000 +0200
+++ jpeg-turbo/Makefile.in 2015-11-22 16:17:10.326527000 +0100
@@ -405,7 +405,7 @@
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
-DIST_SUBDIRS = java simd md5
+DIST_SUBDIRS = java simd
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -442,7 +442,7 @@
am__DIST_COMMON = $(dist_man1_MANS) $(srcdir)/Makefile.in \
$(srcdir)/config.h.in $(srcdir)/jconfig.h.in \
$(srcdir)/jconfigint.h.in $(srcdir)/libjpeg.map.in \
@@ -622,7 +622,7 @@
jidctflt.c jidctfst.c jidctint.c jidctred.c jquant1.c \
jquant2.c jutils.c jmemmgr.c jmemnobs.c $(am__append_3) \
$(am__append_4) $(am__append_5) $(am__append_10)
......@@ -56,3 +31,28 @@ diff -ur jpeg.org/Makefile.in jpeg/Makefile.in
@WITH_TURBOJPEG_TRUE@libturbojpeg_la_SOURCES = $(libjpeg_la_SOURCES) \
@WITH_TURBOJPEG_TRUE@ turbojpeg.c turbojpeg.h transupp.c \
@WITH_TURBOJPEG_TRUE@ transupp.h jdatadst-tj.c jdatasrc-tj.c \
diff -ru jpeg-turbo.orig/configure jpeg-turbo/configure
--- jpeg-turbo.orig/configure 2015-09-21 20:48:41.000000000 +0200
+++ jpeg-turbo/configure 2015-11-22 15:23:25.387071000 +0100
@@ -14630,9 +14630,7 @@
$as_echo "yes" >&6; }
else
rm -rf conftest*
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- as_fn_error $? "configuration problem: maybe object file format mismatch." "$LINENO" 5
+ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
fi
@@ -14828,9 +14826,7 @@
$as_echo "yes" >&6; }
else
rm -rf conftest*
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- as_fn_error $? "configuration problem: maybe object file format mismatch." "$LINENO" 5
+ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
fi
external/jpeg-turbo/jpeg-turbo.win_build.patch.1
Dosyayı görüntüle @ bbbef156
diff -ur jpeg.org/simd/Makefile.in jpeg/simd/Makefile.in
--- jpeg.org/simd/Makefile.in 2014-11-14 21:55:21.557802955 +0100
+++ jpeg/simd/Makefile.in 2014-11-14 21:57:16.845804312 +0100
@@ -583,8 +583,9 @@
diff -ru jpeg-turbo.orig/simd/Makefile.in jpeg-turbo/simd/Makefile.in
--- jpeg-turbo.orig/simd/Makefile.in 2015-09-21 20:48:45.000000000 +0200
+++ jpeg-turbo/simd/Makefile.in 2015-11-22 10:52:46.975285184 +0100
@@ -769,8 +769,8 @@
.asm.lo:
$(LIBTOOL) --mode=compile --tag NASM $(srcdir)/nasm_lt.sh $(NASM) $(NAFLAGS) -I$(srcdir) -I. $< -o $@
$(AM_V_GEN) $(LIBTOOL) $(AM_V_lt) --mode=compile --tag NASM $(srcdir)/nasm_lt.sh $(AM_V_lt) $(NASM) $(NAFLAGS) -I$(srcdir) -I. $< -o $@
-jsimdcfg.inc: $(srcdir)/jsimdcfg.inc.h ../jpeglib.h ../jconfig.h ../jmorecfg.h
- $(CPP) -I$(top_builddir) -I$(top_builddir)/simd $(srcdir)/jsimdcfg.inc.h | $(EGREP) "^[\;%]|^\ %" | sed 's%_cpp_protection_%%' | sed 's@% define@%define@g' > $@
- $(AM_V_GEN) $(CPP) -I$(top_builddir) -I$(top_builddir)/simd $(srcdir)/jsimdcfg.inc.h | $(EGREP) "^[\;%]|^\ %" | sed 's%_cpp_protection_%%' | sed 's@% define@%define@g' > $@
+jsimdcfg.inc: $(top_srcdir)/win/jsimdcfg.inc
+ cp $< $@
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
--- jpeg-turbo/configure.orig 2015-02-21 19:44:23.639600000 +0100
+++ jpeg-turbo/configure 2015-02-21 19:44:33.764000000 +0100
@@ -1847,7 +1847,7 @@
diff -ru jpeg-turbo.orig/configure jpeg-turbo/configure
--- jpeg-turbo.orig/configure 2015-11-22 15:57:23.702656000 +0100
+++ jpeg-turbo/configure 2015-11-22 15:59:37.084285000 +0100
@@ -13931,7 +13931,7 @@
else
cat >conftest.make <<\_ACEOF
all:
- @echo 'ac_maketemp="$(MAKE)"'
+ @echo 'ac_maketemp=$(MAKE)'
_ACEOF
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-$as_echo "#define NEED_BSD_STRINGS 1" >>confdefs.h
+$as_echo "#undef NEED_BSD_STRINGS" >>confdefs.h
fi
done
external/jpeg-turbo/ubsan.patch deleted 100644 → 0
Dosyayı görüntüle @ ff66223f
--- jdhuff.c
+++ jdhuff.c
@@ -489,7 +489,7 @@
#define AVOID_TABLES
#ifdef AVOID_TABLES
-#define HUFF_EXTEND(x,s) ((x) + ((((x) - (1<<((s)-1))) >> 31) & (((-1)<<(s)) + 1)))
+#define HUFF_EXTEND(x,s) ((x) + ((((x) - (1<<((s)-1))) >> 31) & (((unsigned)-1<<(s)) + 1)))
#else
--- jdphuff.c
+++ jdphuff.c
@@ -201,7 +201,7 @@
#define AVOID_TABLES
#ifdef AVOID_TABLES
-#define HUFF_EXTEND(x,s) ((x) < (1<<((s)-1)) ? (x) + (((-1)<<(s)) + 1) : (x))
+#define HUFF_EXTEND(x,s) ((x) < (1<<((s)-1)) ? (x) + (((unsigned)-1<<(s)) + 1) : (x))
#else
@@ -334,7 +334,7 @@
s += state.last_dc_val[ci];
state.last_dc_val[ci] = s;
/* Scale and output the coefficient (assumes jpeg_natural_order[0]=0) */
- (*block)[0] = (JCOEF) (s << Al);
+ (*block)[0] = (JCOEF) ((unsigned)s << Al);
}
/* Completed MCU, so update state */
@@ -402,7 +402,7 @@
r = GET_BITS(s);
s = HUFF_EXTEND(r, s);
/* Scale and output coefficient in natural (dezigzagged) order */
- (*block)[jpeg_natural_order[k]] = (JCOEF) (s << Al);
+ (*block)[jpeg_natural_order[k]] = (JCOEF) ((unsigned)s << Al);
} else {
if (r == 15) { /* ZRL */
k += 15; /* skip 15 zeroes in band */
@@ -494,7 +494,7 @@
phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
int Se = cinfo->Se;
int p1 = 1 << cinfo->Al; /* 1 in the bit position being coded */
- int m1 = (-1) << cinfo->Al; /* -1 in the bit position being coded */
+ int m1 = (unsigned)-1 << cinfo->Al; /* -1 in the bit position being coded */
register int s, k, r;
unsigned int EOBRUN;
JBLOCKROW block;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment