From c728cfd8f236929808cf081232e0702f3382d80b Mon Sep 17 00:00:00 2001 From: DRC Date: Sun, 18 May 2014 19:36:05 +0000 Subject: [PATCH] Fix MIPS build git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@1314 632fc199-4ca6-4c93-a231-07263d6284db --- simd/jsimd.h | 12 +++++++----- simd/jsimd_mips.c | 6 +++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/simd/jsimd.h b/simd/jsimd.h index 8cd4473..776edbb 100644 --- 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 336b2db..ae9d41e 100644 --- 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) -- 2.40.0