summaryrefslogtreecommitdiff
path: root/trunk/simd
diff options
context:
space:
mode:
authordcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519>2011-02-02 05:29:19 +0000
committerdcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519>2011-02-02 05:29:19 +0000
commit9626e595ca4d74766b8a64a5bf363983abc6fbec (patch)
treecff0549b9ac464b1ba47da6707dece791661c620 /trunk/simd
parentdc9dcb05be5b6a2a4d94fb4d18b59a654c9cbd0b (diff)
Clarify that the C wrappers fall under the same license as the rest of the SIMD code
git-svn-id: https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo@331 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'trunk/simd')
-rw-r--r--trunk/simd/jsimd_i386.c1
-rw-r--r--trunk/simd/jsimd_x86_64.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/trunk/simd/jsimd_i386.c b/trunk/simd/jsimd_i386.c
index ab52519..d9bb774 100644
--- a/trunk/simd/jsimd_i386.c
+++ b/trunk/simd/jsimd_i386.c
@@ -6,6 +6,7 @@
*
* Based on the x86 SIMD extension for IJG JPEG library,
* Copyright (C) 1999-2006, MIYASAKA Masaru.
+ * For conditions of distribution and use, see copyright notice in jsimdext.inc
*
* This file contains the interface between the "normal" portions
* of the library and the SIMD implementations when running on a
diff --git a/trunk/simd/jsimd_x86_64.c b/trunk/simd/jsimd_x86_64.c
index 4bff6c2..ceb7a48 100644
--- a/trunk/simd/jsimd_x86_64.c
+++ b/trunk/simd/jsimd_x86_64.c
@@ -6,6 +6,7 @@
*
* Based on the x86 SIMD extension for IJG JPEG library,
* Copyright (C) 1999-2006, MIYASAKA Masaru.
+ * For conditions of distribution and use, see copyright notice in jsimdext.inc
*
* This file contains the interface between the "normal" portions
* of the library and the SIMD implementations when running on a
@@ -490,6 +491,9 @@ jsimd_fdct_float (FAST_FLOAT * data)
GLOBAL(int)
jsimd_can_quantize (void)
{
+ char *env=getenv("JSIMD_SLOWQUANTIZE");
+ if(env && strlen(env)==1 && !strcmp(env, "1"))
+ return 0;
/* The code is optimised for these values only */
if (DCTSIZE != 8)
return 0;