Merge branch 'master' into dev

java/TJBench.java

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

simd/CMakeLists.txt

@@ -41,6 +41,14 @@ elseif(CPU_TYPE STREQUAL "i386")
   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)
 message(STATUS "CMAKE_ASM_NASM_COMPILER = ${CMAKE_ASM_NASM_COMPILER}")
 

tjbench.c

@@ -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,
                  fileName, tilew, tileh) == -1)
         goto bailout;
-    }
+    } else if (quiet == 1) printf("N/A\n");
 
     for (i = 0; i < ntilesw * ntilesh; i++) {
       if (jpegBuf[i]) tjFree(jpegBuf[i]);