diff options
Diffstat (limited to 'simd/jsimd_arm.c')
| -rw-r--r-- | simd/jsimd_arm.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/simd/jsimd_arm.c b/simd/jsimd_arm.c index 9ed49fd..a9d920c 100644 --- a/simd/jsimd_arm.c +++ b/simd/jsimd_arm.c @@ -136,7 +136,6 @@ jsimd_can_rgb_ycc (void) { init_simd(); -<<<<<<< HEAD /* The code is optimised for these values only */ if (BITS_IN_JSAMPLE != 8) return 0; @@ -148,8 +147,6 @@ jsimd_can_rgb_ycc (void) if (simd_support & JSIMD_ARM_NEON) return 1; -======= ->>>>>>> 4a72099711359606b1fc10c1744057a6c568d5d8 return 0; } @@ -184,7 +181,6 @@ jsimd_rgb_ycc_convert (j_compress_ptr cinfo, JSAMPARRAY input_buf, JSAMPIMAGE output_buf, JDIMENSION output_row, int num_rows) { -<<<<<<< HEAD void (*neonfct)(JDIMENSION, JSAMPARRAY, JSAMPIMAGE, JDIMENSION, int); switch(cinfo->in_color_space) @@ -215,8 +211,6 @@ jsimd_rgb_ycc_convert (j_compress_ptr cinfo, if (simd_support & JSIMD_ARM_NEON) neonfct(cinfo->image_width, input_buf, output_buf, output_row, num_rows); -======= ->>>>>>> 4a72099711359606b1fc10c1744057a6c568d5d8 } GLOBAL(void) @@ -392,7 +386,6 @@ jsimd_can_convsamp (void) { init_simd(); -<<<<<<< HEAD /* The code is optimised for these values only */ if (DCTSIZE != 8) return 0; @@ -406,8 +399,6 @@ jsimd_can_convsamp (void) if (simd_support & JSIMD_ARM_NEON) return 1; -======= ->>>>>>> 4a72099711359606b1fc10c1744057a6c568d5d8 return 0; } @@ -423,11 +414,8 @@ GLOBAL(void) jsimd_convsamp (JSAMPARRAY sample_data, JDIMENSION start_col, DCTELEM * workspace) { -<<<<<<< HEAD if (simd_support & JSIMD_ARM_NEON) jsimd_convsamp_neon(sample_data, start_col, workspace); -======= ->>>>>>> 4a72099711359606b1fc10c1744057a6c568d5d8 } GLOBAL(void) @@ -449,7 +437,6 @@ jsimd_can_fdct_ifast (void) { init_simd(); -<<<<<<< HEAD /* The code is optimised for these values only */ if (DCTSIZE != 8) return 0; @@ -459,8 +446,6 @@ jsimd_can_fdct_ifast (void) if (simd_support & JSIMD_ARM_NEON) return 1; -======= ->>>>>>> 4a72099711359606b1fc10c1744057a6c568d5d8 return 0; } @@ -480,11 +465,8 @@ jsimd_fdct_islow (DCTELEM * data) GLOBAL(void) jsimd_fdct_ifast (DCTELEM * data) { -<<<<<<< HEAD if (simd_support & JSIMD_ARM_NEON) jsimd_fdct_ifast_neon(data); -======= ->>>>>>> 4a72099711359606b1fc10c1744057a6c568d5d8 } GLOBAL(void) @@ -497,7 +479,6 @@ jsimd_can_quantize (void) { init_simd(); -<<<<<<< HEAD /* The code is optimised for these values only */ if (DCTSIZE != 8) return 0; @@ -509,8 +490,6 @@ jsimd_can_quantize (void) if (simd_support & JSIMD_ARM_NEON) return 1; -======= ->>>>>>> 4a72099711359606b1fc10c1744057a6c568d5d8 return 0; } @@ -526,11 +505,8 @@ GLOBAL(void) jsimd_quantize (JCOEFPTR coef_block, DCTELEM * divisors, DCTELEM * workspace) { -<<<<<<< HEAD if (simd_support & JSIMD_ARM_NEON) jsimd_quantize_neon(coef_block, divisors, workspace); -======= ->>>>>>> 4a72099711359606b1fc10c1744057a6c568d5d8 } GLOBAL(void) @@ -608,7 +584,6 @@ jsimd_can_idct_islow (void) { init_simd(); -<<<<<<< HEAD /* The code is optimised for these values only */ if (DCTSIZE != 8) return 0; @@ -624,8 +599,6 @@ jsimd_can_idct_islow (void) if (simd_support & JSIMD_ARM_NEON) return 1; -======= ->>>>>>> 4a72099711359606b1fc10c1744057a6c568d5d8 return 0; } @@ -667,11 +640,8 @@ jsimd_idct_islow (j_decompress_ptr cinfo, jpeg_component_info * compptr, JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col) { -<<<<<<< HEAD if ((simd_support & JSIMD_ARM_NEON)) jsimd_idct_islow_neon(compptr->dct_table, coef_block, output_buf, output_col); -======= ->>>>>>> 4a72099711359606b1fc10c1744057a6c568d5d8 } GLOBAL(void) |