Skip to content
Commit 42958116 authored by Ondřej Surý's avatar Ondřej Surý
Browse files

Merge tag 'upstream/1.4.2'

Upstream version 1.4.2

Conflicts:
	BUILDING.txt
	CMakeLists.txt
	ChangeLog.txt
	Makefile.am
	Makefile.in
	aclocal.m4
	compile
	config.guess
	config.h.in
	config.sub
	configure
	configure.ac
	depcomp
	doc/html/group___turbo_j_p_e_g.html
	install-sh
	java/Makefile.in
	java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html
	java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html
	java/doc/org/libjpegturbo/turbojpeg/TJTransformer.html
	java/org/libjpegturbo/turbojpeg/TJCompressor.java
	java/org/libjpegturbo/turbojpeg/TJDecompressor.java
	java/org/libjpegturbo/turbojpeg/TJTransformer.java
	jcdctmgr.c
	jdhuff.c
	jdphuff.c
	jfdctint.c
	jidctint.c
	jidctred.c
	jmorecfg.h
	jpegint.h
	ltmain.sh
	md5/Makefile.in
	missing
	rdbmp.c
	rdppm.c
	rdtarga.c
	simd/Makefile.in
	simd/jccolext-sse2-64.asm
	simd/jcgrass2-64.asm
	simd/jcgrass2.asm
	simd/jcgray-sse2-64.asm
	simd/jcgray-sse2.asm
	simd/jcgryext-sse2-64.asm
	simd/jcsample-sse2-64.asm
	simd/jdcolext-sse2-64.asm
	simd/jdmrgext-sse2-64.asm
	simd/jdsample-sse2-64.asm
	simd/jidctflt-sse2-64.asm
	simd/jidctfst-sse2-64.asm
	simd/jidctint-sse2-64.asm
	simd/jidctred-sse2-64.asm
	simd/jquantf-sse2-64.asm
	simd/jquanti-sse2-64.asm
	simd/jsimd_mips_dspr2.S
	turbojpeg.c
	turbojpeg.h
parents 729b34ce 3787f467
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment