Index: jsimddct.h |
diff --git a/jsimddct.h b/jsimddct.h |
index a1c74407ea3343bdeb5c8c3c367dc5b591284cc5..b19ab48d407a34b09eda1bf0e4fc838ef26397c2 100644 |
--- a/jsimddct.h |
+++ b/jsimddct.h |
@@ -2,101 +2,73 @@ |
* jsimddct.h |
* |
* Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB |
- * |
+ * |
* 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 |
* |
*/ |
-/* Short forms of external names for systems with brain-damaged linkers. */ |
- |
-#ifdef NEED_SHORT_EXTERNAL_NAMES |
-#define jsimd_can_convsamp jSCanConv |
-#define jsimd_can_convsamp_float jSCanConvF |
-#define jsimd_convsamp jSConv |
-#define jsimd_convsamp_float jSConvF |
-#define jsimd_can_fdct_islow jSCanFDCTIS |
-#define jsimd_can_fdct_ifast jSCanFDCTIF |
-#define jsimd_can_fdct_float jSCanFDCTFl |
-#define jsimd_fdct_islow jSFDCTIS |
-#define jsimd_fdct_ifast jSFDCTIF |
-#define jsimd_fdct_float jSFDCTFl |
-#define jsimd_can_quantize jSCanQuant |
-#define jsimd_can_quantize_float jSCanQuantF |
-#define jsimd_quantize jSQuant |
-#define jsimd_quantize_float jSQuantF |
-#define jsimd_can_idct_2x2 jSCanIDCT22 |
-#define jsimd_can_idct_4x4 jSCanIDCT44 |
-#define jsimd_idct_2x2 jSIDCT22 |
-#define jsimd_idct_4x4 jSIDCT44 |
-#define jsimd_can_idct_islow jSCanIDCTIS |
-#define jsimd_can_idct_ifast jSCanIDCTIF |
-#define jsimd_can_idct_float jSCanIDCTFl |
-#define jsimd_idct_islow jSIDCTIS |
-#define jsimd_idct_ifast jSIDCTIF |
-#define jsimd_idct_float jSIDCTFl |
-#endif /* NEED_SHORT_EXTERNAL_NAMES */ |
- |
-EXTERN(int) jsimd_can_convsamp JPP((void)); |
-EXTERN(int) jsimd_can_convsamp_float JPP((void)); |
- |
-EXTERN(void) jsimd_convsamp JPP((JSAMPARRAY sample_data, |
- JDIMENSION start_col, |
- DCTELEM * workspace)); |
-EXTERN(void) jsimd_convsamp_float JPP((JSAMPARRAY sample_data, |
- JDIMENSION start_col, |
- FAST_FLOAT * workspace)); |
+EXTERN(int) jsimd_can_convsamp (void); |
+EXTERN(int) jsimd_can_convsamp_float (void); |
-EXTERN(int) jsimd_can_fdct_islow JPP((void)); |
-EXTERN(int) jsimd_can_fdct_ifast JPP((void)); |
-EXTERN(int) jsimd_can_fdct_float JPP((void)); |
+EXTERN(void) jsimd_convsamp (JSAMPARRAY sample_data, JDIMENSION start_col, |
+ DCTELEM *workspace); |
+EXTERN(void) jsimd_convsamp_float (JSAMPARRAY sample_data, |
+ JDIMENSION start_col, |
+ FAST_FLOAT *workspace); |
-EXTERN(void) jsimd_fdct_islow JPP((DCTELEM * data)); |
-EXTERN(void) jsimd_fdct_ifast JPP((DCTELEM * data)); |
-EXTERN(void) jsimd_fdct_float JPP((FAST_FLOAT * data)); |
+EXTERN(int) jsimd_can_fdct_islow (void); |
+EXTERN(int) jsimd_can_fdct_ifast (void); |
+EXTERN(int) jsimd_can_fdct_float (void); |
-EXTERN(int) jsimd_can_quantize JPP((void)); |
-EXTERN(int) jsimd_can_quantize_float JPP((void)); |
+EXTERN(void) jsimd_fdct_islow (DCTELEM *data); |
+EXTERN(void) jsimd_fdct_ifast (DCTELEM *data); |
+EXTERN(void) jsimd_fdct_float (FAST_FLOAT *data); |
-EXTERN(void) jsimd_quantize JPP((JCOEFPTR coef_block, |
- DCTELEM * divisors, |
- DCTELEM * workspace)); |
-EXTERN(void) jsimd_quantize_float JPP((JCOEFPTR coef_block, |
- FAST_FLOAT * divisors, |
- FAST_FLOAT * workspace)); |
+EXTERN(int) jsimd_can_quantize (void); |
+EXTERN(int) jsimd_can_quantize_float (void); |
-EXTERN(int) jsimd_can_idct_2x2 JPP((void)); |
-EXTERN(int) jsimd_can_idct_4x4 JPP((void)); |
+EXTERN(void) jsimd_quantize (JCOEFPTR coef_block, DCTELEM *divisors, |
+ DCTELEM *workspace); |
+EXTERN(void) jsimd_quantize_float (JCOEFPTR coef_block, FAST_FLOAT *divisors, |
+ FAST_FLOAT *workspace); |
-EXTERN(void) jsimd_idct_2x2 JPP((j_decompress_ptr cinfo, |
- jpeg_component_info * compptr, |
- JCOEFPTR coef_block, |
- JSAMPARRAY output_buf, |
- JDIMENSION output_col)); |
-EXTERN(void) jsimd_idct_4x4 JPP((j_decompress_ptr cinfo, |
- jpeg_component_info * compptr, |
- JCOEFPTR coef_block, |
- JSAMPARRAY output_buf, |
- JDIMENSION output_col)); |
+EXTERN(int) jsimd_can_idct_2x2 (void); |
+EXTERN(int) jsimd_can_idct_4x4 (void); |
+EXTERN(int) jsimd_can_idct_6x6 (void); |
+EXTERN(int) jsimd_can_idct_12x12 (void); |
-EXTERN(int) jsimd_can_idct_islow JPP((void)); |
-EXTERN(int) jsimd_can_idct_ifast JPP((void)); |
-EXTERN(int) jsimd_can_idct_float JPP((void)); |
+EXTERN(void) jsimd_idct_2x2 (j_decompress_ptr cinfo, |
+ jpeg_component_info *compptr, |
+ JCOEFPTR coef_block, JSAMPARRAY output_buf, |
+ JDIMENSION output_col); |
+EXTERN(void) jsimd_idct_4x4 (j_decompress_ptr cinfo, |
+ jpeg_component_info *compptr, |
+ JCOEFPTR coef_block, JSAMPARRAY output_buf, |
+ JDIMENSION output_col); |
+EXTERN(void) jsimd_idct_6x6 (j_decompress_ptr cinfo, |
+ jpeg_component_info *compptr, |
+ JCOEFPTR coef_block, JSAMPARRAY output_buf, |
+ JDIMENSION output_col); |
+EXTERN(void) jsimd_idct_12x12 (j_decompress_ptr cinfo, |
+ jpeg_component_info *compptr, |
+ JCOEFPTR coef_block, JSAMPARRAY output_buf, |
+ JDIMENSION output_col); |
-EXTERN(void) jsimd_idct_islow JPP((j_decompress_ptr cinfo, |
- jpeg_component_info * compptr, |
- JCOEFPTR coef_block, |
- JSAMPARRAY output_buf, |
- JDIMENSION output_col)); |
-EXTERN(void) jsimd_idct_ifast JPP((j_decompress_ptr cinfo, |
- jpeg_component_info * compptr, |
- JCOEFPTR coef_block, |
- JSAMPARRAY output_buf, |
- JDIMENSION output_col)); |
-EXTERN(void) jsimd_idct_float JPP((j_decompress_ptr cinfo, |
- jpeg_component_info * compptr, |
- JCOEFPTR coef_block, |
- JSAMPARRAY output_buf, |
- JDIMENSION output_col)); |
+EXTERN(int) jsimd_can_idct_islow (void); |
+EXTERN(int) jsimd_can_idct_ifast (void); |
+EXTERN(int) jsimd_can_idct_float (void); |
+EXTERN(void) jsimd_idct_islow (j_decompress_ptr cinfo, |
+ jpeg_component_info *compptr, |
+ JCOEFPTR coef_block, JSAMPARRAY output_buf, |
+ JDIMENSION output_col); |
+EXTERN(void) jsimd_idct_ifast (j_decompress_ptr cinfo, |
+ jpeg_component_info *compptr, |
+ JCOEFPTR coef_block, JSAMPARRAY output_buf, |
+ JDIMENSION output_col); |
+EXTERN(void) jsimd_idct_float (j_decompress_ptr cinfo, |
+ jpeg_component_info *compptr, |
+ JCOEFPTR coef_block, JSAMPARRAY output_buf, |
+ JDIMENSION output_col); |