Skip to content

Commit

Permalink
Bump libjpeg-turbo to 1.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
NiLuJe committed Sep 6, 2015
1 parent 2a132b4 commit 5749fbc
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -690,10 +690,10 @@ fetchthirdparty:
&& rm libpng-1.6.17.tar.gz && wget http://download.sourceforge.net/libpng/libpng-1.6.17.tar.gz || true
tar zxf libpng-1.6.17.tar.gz
# download libjpeg-turbo
[ ! -f libjpeg-turbo-1.4.0.tar.gz ] \
&& wget http://download.sourceforge.net/libjpeg-turbo/libjpeg-turbo-1.4.0.tar.gz || true
[ `md5sum libjpeg-turbo-1.4.0.tar.gz |cut -d\ -f1` != 039153dabe61e1ac8d9323b5522b56b0 ] \
&& rm libjpeg-turbo-1.4.0.tar.gz && false || tar zxf libjpeg-turbo-1.4.0.tar.gz
[ ! -f libjpeg-turbo-1.4.1.tar.gz ] \
&& wget http://download.sourceforge.net/libjpeg-turbo/libjpeg-turbo-1.4.1.tar.gz || true
[ `md5sum libjpeg-turbo-1.4.1.tar.gz |cut -d\ -f1` != b1f6b84859a16b8ebdcda951fa07c3f2 ] \
&& rm libjpeg-turbo-1.4.1.tar.gz && false || tar zxf libjpeg-turbo-1.4.1.tar.gz
# download giflib
[ ! -f giflib-5.1.1.tar.gz ] \
&& wget http://download.sourceforge.net/giflib/giflib-5.1.1.tar.gz || true
Expand Down
2 changes: 1 addition & 1 deletion Makefile.defs
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ FREETYPE_DIR=freetype2

JPEG_LIB=$(OUTPUT_DIR)/libs/libjpeg$(if $(WIN32),-8.dll,.so.8)
TURBOJPEG_LIB=$(OUTPUT_DIR)/libs/libturbojpeg$(if $(WIN32),.dll,.so)
JPEG_DIR=libjpeg-turbo-1.4.0
JPEG_DIR=libjpeg-turbo-1.4.1

PNG_LIB=$(OUTPUT_DIR)/libs/libpng16$(if $(WIN32),-16.dll,.so$(if $(ANDROID),,.16))
PNG_DIR=libpng-1.6.17
Expand Down
2 changes: 1 addition & 1 deletion kpvcrlib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ SET(ANTIWORD_INCLUDE_DIR ${CR_3RDPARTY_DIR}/antiword)
SET(CHM_INCLUDE_DIRS ${CR_3RDPARTY_DIR}/chmlib/src)
SET(PNG_INCLUDE_DIR ${BASE_DIR}/libpng-1.6.17/include)
SET(ZLIB_INCLUDE_DIR ${MUPDF_3RDPARTY_DIR}/zlib)
SET(JPEGLIB_INCLUDE_DIR ${BASE_DIR}/libjpeg-turbo-1.4.0/include)
SET(JPEGLIB_INCLUDE_DIR ${BASE_DIR}/libjpeg-turbo-1.4.1/include)
SET(JCONFIG_INCLUDE_DIR ${MUPDF_DIR}/scripts)
SET(CREGINE_INCLUDE_DIR ${CRE_DIR}/include)

Expand Down

0 comments on commit 5749fbc

Please sign in to comment.