JPEG_DECODE_ONLY macro reintroduced to allow just the decode functions to be linked in
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9317003
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@119959 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
diff --git a/simd/jsimd_i386.c b/simd/jsimd_i386.c
index 120eb02..94510d3 100644
--- a/simd/jsimd_i386.c
+++ b/simd/jsimd_i386.c
@@ -3,7 +3,7 @@
*
* Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
* Copyright 2009-2011 D. R. Commander
- *
+ *
* 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
@@ -61,6 +61,7 @@
simd_support &= JSIMD_SSE2;
}
+#ifndef JPEG_DECODE_ONLY
GLOBAL(int)
jsimd_can_rgb_ycc (void)
{
@@ -82,6 +83,7 @@
return 0;
}
+#endif
GLOBAL(int)
jsimd_can_rgb_gray (void)
@@ -127,6 +129,7 @@
return 0;
}
+#ifndef JPEG_DECODE_ONLY
GLOBAL(void)
jsimd_rgb_ycc_convert (j_compress_ptr cinfo,
JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
@@ -179,6 +182,7 @@
mmxfct(cinfo->image_width, input_buf,
output_buf, output_row, num_rows);
}
+#endif
GLOBAL(void)
jsimd_rgb_gray_convert (j_compress_ptr cinfo,
@@ -286,6 +290,7 @@
input_row, output_buf, num_rows);
}
+#ifndef JPEG_DECODE_ONLY
GLOBAL(int)
jsimd_can_h2v2_downsample (void)
{
@@ -351,6 +356,7 @@
compptr->v_samp_factor, compptr->width_in_blocks,
input_data, output_data);
}
+#endif
GLOBAL(int)
jsimd_can_h2v2_upsample (void)
@@ -392,7 +398,7 @@
GLOBAL(void)
jsimd_h2v2_upsample (j_decompress_ptr cinfo,
- jpeg_component_info * compptr,
+ jpeg_component_info * compptr,
JSAMPARRAY input_data,
JSAMPARRAY * output_data_ptr)
{
@@ -406,7 +412,7 @@
GLOBAL(void)
jsimd_h2v1_upsample (j_decompress_ptr cinfo,
- jpeg_component_info * compptr,
+ jpeg_component_info * compptr,
JSAMPARRAY input_data,
JSAMPARRAY * output_data_ptr)
{
@@ -460,7 +466,7 @@
GLOBAL(void)
jsimd_h2v2_fancy_upsample (j_decompress_ptr cinfo,
- jpeg_component_info * compptr,
+ jpeg_component_info * compptr,
JSAMPARRAY input_data,
JSAMPARRAY * output_data_ptr)
{
@@ -475,7 +481,7 @@
GLOBAL(void)
jsimd_h2v1_fancy_upsample (j_decompress_ptr cinfo,
- jpeg_component_info * compptr,
+ jpeg_component_info * compptr,
JSAMPARRAY input_data,
JSAMPARRAY * output_data_ptr)
{
@@ -636,6 +642,7 @@
in_row_group_ctr, output_buf);
}
+#ifndef JPEG_DECODE_ONLY
GLOBAL(int)
jsimd_can_convsamp (void)
{
@@ -855,6 +862,7 @@
else if (simd_support & JSIMD_3DNOW)
jsimd_quantize_float_3dnow(coef_block, divisors, workspace);
}
+#endif
GLOBAL(int)
jsimd_can_idct_2x2 (void)
diff --git a/simd/jsimd_x86_64.c b/simd/jsimd_x86_64.c
index 8d17db3..e27094f 100644
--- a/simd/jsimd_x86_64.c
+++ b/simd/jsimd_x86_64.c
@@ -3,7 +3,7 @@
*
* Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
* Copyright 2009-2011 D. R. Commander
- *
+ *
* 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
@@ -29,6 +29,7 @@
#define IS_ALIGNED_SSE(ptr) (IS_ALIGNED(ptr, 4)) /* 16 byte alignment */
+#ifndef JPEG_DECODE_ONLY
GLOBAL(int)
jsimd_can_rgb_ycc (void)
{
@@ -45,6 +46,7 @@
return 1;
}
+#endif
GLOBAL(int)
jsimd_can_rgb_gray (void)
@@ -80,6 +82,7 @@
return 1;
}
+#ifndef JPEG_DECODE_ONLY
GLOBAL(void)
jsimd_rgb_ycc_convert (j_compress_ptr cinfo,
JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
@@ -118,6 +121,7 @@
sse2fct(cinfo->image_width, input_buf, output_buf, output_row, num_rows);
}
+#endif
GLOBAL(void)
jsimd_rgb_gray_convert (j_compress_ptr cinfo,
@@ -197,6 +201,7 @@
sse2fct(cinfo->output_width, input_buf, input_row, output_buf, num_rows);
}
+#ifndef JPEG_DECODE_ONLY
GLOBAL(int)
jsimd_can_h2v2_downsample (void)
{
@@ -242,6 +247,7 @@
compptr->width_in_blocks,
input_data, output_data);
}
+#endif
GLOBAL(int)
jsimd_can_h2v2_upsample (void)
@@ -269,7 +275,7 @@
GLOBAL(void)
jsimd_h2v2_upsample (j_decompress_ptr cinfo,
- jpeg_component_info * compptr,
+ jpeg_component_info * compptr,
JSAMPARRAY input_data,
JSAMPARRAY * output_data_ptr)
{
@@ -280,7 +286,7 @@
GLOBAL(void)
jsimd_h2v1_upsample (j_decompress_ptr cinfo,
- jpeg_component_info * compptr,
+ jpeg_component_info * compptr,
JSAMPARRAY input_data,
JSAMPARRAY * output_data_ptr)
{
@@ -321,7 +327,7 @@
GLOBAL(void)
jsimd_h2v2_fancy_upsample (j_decompress_ptr cinfo,
- jpeg_component_info * compptr,
+ jpeg_component_info * compptr,
JSAMPARRAY input_data,
JSAMPARRAY * output_data_ptr)
{
@@ -332,7 +338,7 @@
GLOBAL(void)
jsimd_h2v1_fancy_upsample (j_decompress_ptr cinfo,
- jpeg_component_info * compptr,
+ jpeg_component_info * compptr,
JSAMPARRAY input_data,
JSAMPARRAY * output_data_ptr)
{
@@ -451,6 +457,7 @@
sse2fct(cinfo->output_width, input_buf, in_row_group_ctr, output_buf);
}
+#ifndef JPEG_DECODE_ONLY
GLOBAL(int)
jsimd_can_convsamp (void)
{
@@ -601,6 +608,7 @@
{
jsimd_quantize_float_sse2(coef_block, divisors, workspace);
}
+#endif
GLOBAL(int)
jsimd_can_idct_2x2 (void)