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-11-04 18:50:45 -06:00
parent adf9cc942f ac59b2c582
commit d92ae5df0c
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/TJBench.java
View File

@@ -478,6 +478,8 @@ final class TJBench {
if (!compOnly) if (!compOnly)
decomp(srcBuf, jpegBuf, jpegSize, tmpBuf, w, h, subsamp, jpegQual, decomp(srcBuf, jpegBuf, jpegSize, tmpBuf, w, h, subsamp, jpegQual,
fileName, tilew, tileh); fileName, tilew, tileh);
else if (quiet == 1)
System.out.println("N/A");
if (tilew == w && tileh == h) break; if (tilew == w && tileh == h) break;
} }

8
simd/CMakeLists.txt
View File

@@ -41,6 +41,14 @@ elseif(CPU_TYPE STREQUAL "i386")
endif() endif()
endif() endif()
if(NOT REQUIRE_SIMD)
include(CheckLanguage)
check_language(ASM_NASM)
if(NOT CMAKE_ASM_NASM_COMPILER)
simd_fail("SIMD extensions disabled: could not find NASM compiler")
return()
endif()
endif()
enable_language(ASM_NASM) enable_language(ASM_NASM)
message(STATUS "CMAKE_ASM_NASM_COMPILER = ${CMAKE_ASM_NASM_COMPILER}") message(STATUS "CMAKE_ASM_NASM_COMPILER = ${CMAKE_ASM_NASM_COMPILER}")

2
tjbench.c
View File

@@ -486,7 +486,7 @@ static int fullTest(unsigned char *srcBuf, int w, int h, int subsamp,
if (decomp(srcBuf, jpegBuf, jpegSize, tmpBuf, w, h, subsamp, jpegQual, if (decomp(srcBuf, jpegBuf, jpegSize, tmpBuf, w, h, subsamp, jpegQual,
fileName, tilew, tileh) == -1) fileName, tilew, tileh) == -1)
goto bailout; goto bailout;
} } else if (quiet == 1) printf("N/A\n");
for (i = 0; i < ntilesw * ntilesh; i++) { for (i = 0; i < ntilesw * ntilesh; i++) {
if (jpegBuf[i]) tjFree(jpegBuf[i]); if (jpegBuf[i]) tjFree(jpegBuf[i]);