Fix MIPS build

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@1314 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/simd/jsimd.h b/simd/jsimd.h
index 8cd4473ecfef6ed3324468588478cc42e23dba67..776edbbaf2f841c8040f5d807c40a06eed70ed7e 100644 (file)
--- a/simd/jsimd.h
+++ b/simd/jsimd.h
@@ -311,9 +311,11 @@ EXTERN(void) jsimd_h2v2_downsample_mips_dspr2
 
 /* h2v2 Smooth Downsampling */
 EXTERN(void) jsimd_h2v2_smooth_downsample_mips_dspr2
-        (JDIMENSION image_width, int max_v_samp_factor,
-         JDIMENSION v_samp_factor, JDIMENSION width_blocks,
-         JSAMPARRAY input_data, JSAMPARRAY output_data);
+        (JSAMPARRAY input_data, JSAMPARRAY output_data,
+         JDIMENSION v_samp_factor, int max_v_samp_factor,
+         int smoothing_factor, JDIMENSION width_blocks,
+         JDIMENSION image_width);
+
 
 /* Upsampling */
 EXTERN(void) jsimd_h2v1_upsample_mmx
@@ -626,8 +628,8 @@ EXTERN(void) jsimd_idct_islow_neon
          JDIMENSION output_col);
 
 EXTERN(void) jsimd_idct_islow_mips_dspr2
-        (void * dct_table, JCOEFPTR coef_block, JSAMPARRAY output_buf,
-         JDIMENSION output_col);
+        (void * dct_table, JCOEFPTR coef_block, int * output_buf,
+         JSAMPLE * output_col);
 
 /* Fast Integer Inverse DCT */
 EXTERN(void) jsimd_idct_ifast_mmx

diff --git a/simd/jsimd_mips.c b/simd/jsimd_mips.c
index 336b2dbacd268d521d55bdbcbe35de9d2cad834b..ae9d41ee4ceeaafb43b49cf9e475ac260028c910 100644 (file)
--- a/simd/jsimd_mips.c
+++ b/simd/jsimd_mips.c
@@ -286,9 +286,9 @@ jsimd_c_null_convert (j_compress_ptr cinfo,
                       JDIMENSION output_row, int num_rows)
 {
   if (simd_support & JSIMD_MIPS_DSPR2)
-    jsimd_null_convert_compr_mips_dspr2(cinfo->image_width, input_buf,
-                                        output_buf, output_row, num_rows,
-                                        cinfo->num_components);
+    jsimd_c_null_convert_mips_dspr2(cinfo->image_width, input_buf,
+                                    output_buf, output_row, num_rows,
+                                    cinfo->num_components);
 }
 
 GLOBAL(int)