ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
DRC
2019-02-12 13:42:57 -06:00
parent bdec995839 6a8421fb44
commit a9075a17c3
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -1331,6 +1331,11 @@ if(WITH_TURBOJPEG)
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND
CMAKE_C_LINKER_SUPPORTS_PDB)
install(FILES "$<TARGET_PDB_FILE:turbojpeg>"
DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL)
endif()
endif() endif()
if(ENABLE_STATIC) if(ENABLE_STATIC)
install(TARGETS turbojpeg-static ARCHIVE install(TARGETS turbojpeg-static ARCHIVE

4
cmakescripts/GNUInstallDirs.cmake
View File

@@ -119,7 +119,7 @@
#============================================================================= #=============================================================================
# Copyright 2018 Matthias Räncker # Copyright 2018 Matthias Räncker
# Copyright 2016 D. R. Commander # Copyright 2016, 2019 D. R. Commander
# Copyright 2016 Dmitry Marakasov # Copyright 2016 Dmitry Marakasov
# Copyright 2016 Roger Leigh # Copyright 2016 Roger Leigh
# Copyright 2015 Alex Turbov # Copyright 2015 Alex Turbov
@@ -185,7 +185,7 @@ macro(GNUInstallDirs_set_install_dir var docstring)
"${docstring} (Default: ${CMAKE_INSTALL_DEFAULT_${var}})" "${docstring} (Default: ${CMAKE_INSTALL_DEFAULT_${var}})"
${_GNUInstallDirs_CMAKE_INSTALL_FORCE_${var}}) ${_GNUInstallDirs_CMAKE_INSTALL_FORCE_${var}})
if(NOT "${CMAKE_INSTALL_${var}}" STREQUAL "${CMAKE_INSTALL_DEFAULT_${var}}") if(NOT CMAKE_INSTALL_${var} STREQUAL CMAKE_INSTALL_DEFAULT_${var})
unset(_GNUInstallDirs_CMAKE_INSTALL_DEFAULT_${var} CACHE) unset(_GNUInstallDirs_CMAKE_INSTALL_DEFAULT_${var} CACHE)
endif() endif()

8
sharedlib/CMakeLists.txt
View File

@@ -52,7 +52,8 @@ if(MAPFLAG)
LINK_FLAGS "${MAPFLAG}${CMAKE_CURRENT_BINARY_DIR}/../libjpeg.map") LINK_FLAGS "${MAPFLAG}${CMAKE_CURRENT_BINARY_DIR}/../libjpeg.map")
endif() endif()
if(MSVC) if(MSVC)
set_target_properties(jpeg PROPERTIES SUFFIX ${SO_MAJOR_VERSION}.dll) set_target_properties(jpeg PROPERTIES
RUNTIME_OUTPUT_NAME jpeg${SO_MAJOR_VERSION})
# The jsimd_*.c file is built using /MT, so this prevents a linker warning. # The jsimd_*.c file is built using /MT, so this prevents a linker warning.
set_target_properties(jpeg PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT /NODEFAULTLIB:LIBCMTD") set_target_properties(jpeg PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT /NODEFAULTLIB:LIBCMTD")
elseif(MINGW) elseif(MINGW)
@@ -91,3 +92,8 @@ install(TARGETS jpeg cjpeg djpeg jpegtran
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND
CMAKE_C_LINKER_SUPPORTS_PDB)
install(FILES "$<TARGET_PDB_FILE:jpeg>"
DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL)
endif()

6
tjbench.c
View File

@@ -139,7 +139,7 @@ int decomp(unsigned char *srcBuf, unsigned char **jpegBuf,
unsigned long *jpegSize, unsigned char *dstBuf, int w, int h, unsigned long *jpegSize, unsigned char *dstBuf, int w, int h,
int subsamp, int jpegQual, char *fileName, int tilew, int tileh) int subsamp, int jpegQual, char *fileName, int tilew, int tileh)
{ {
char tempStr[1024], sizeStr[20] = "\0", qualStr[6] = "\0", *ptr; char tempStr[1024], sizeStr[20] = "\0", qualStr[13] = "\0", *ptr;
FILE *file = NULL; FILE *file = NULL;
tjhandle handle = NULL; tjhandle handle = NULL;
int row, col, iter = 0, dstBufAlloc = 0, retval = 0; int row, col, iter = 0, dstBufAlloc = 0, retval = 0;
@@ -152,8 +152,8 @@ int decomp(unsigned char *srcBuf, unsigned char **jpegBuf,
unsigned char *dstPtr, *dstPtr2, *yuvBuf = NULL; unsigned char *dstPtr, *dstPtr2, *yuvBuf = NULL;
if (jpegQual > 0) { if (jpegQual > 0) {
snprintf(qualStr, 6, "_Q%d", jpegQual); snprintf(qualStr, 13, "_Q%d", jpegQual);
qualStr[5] = 0; qualStr[12] = 0;
} }
if ((handle = tjInitDecompress()) == NULL) if ((handle = tjInitDecompress()) == NULL)