!43 libjpeg隐藏内部符号，避免交叉调用

Merge pull request !43 from rainbow/master

BUILD.gn

@@ -17,6 +17,31 @@ if (defined(ohos_lite)) {
   import("//build/ohos.gni")
 }
 
+config("turbojpeg_opt") {
+  if (target_platform == "pc") {
+    if (is_ohos && is_clang && (target_cpu == "arm" || target_cpu == "arm64")) {
+      defines = [ "HUFF_DECODE_OPT" ]
+    }
+  }
+}
+
+config("turbojpeg_local_symbol_first") {
+  if (target_platform == "pc") {
+    if (is_ohos && is_clang && (target_cpu == "arm" || target_cpu == "arm64")) {
+      ldflags = [ "-Wl,-Bsymbolic" ]
+    }
+  }
+}
+
+config("turbojpeg_hide_symbol") {
+  if (target_platform == "pc") {
+    if (is_ohos && is_clang && (target_cpu == "arm" || target_cpu == "arm64")) {
+      cflags = [ "-fvisibility=hidden" ]
+      defines = [ "HIDE_INTERNAL" ]
+    }
+  }
+}
+
 action("libjpeg_action") {
   script = "//third_party/libjpeg-turbo/install.py"
   outputs = [
@@ -183,9 +208,6 @@ if (!defined(ohos_lite)) {
 config("turbojpeg_config") {
   include_dirs += [ "${target_gen_dir}/libjpeg-turbo-2.1.1" ]
   defines = define_config
-  if (target_platform == "pc") {
-    defines += [ "HUFF_DECODE_OPT" ]
-  }
 }
 
 if (defined(ohos_lite)) {
@@ -211,6 +233,10 @@ if (defined(ohos_lite)) {
   ohos_static_library("turbojpeg_static") {
     sources = get_target_outputs(":libjpeg_action")
     public_configs = [ ":turbojpeg_config" ]
+    configs = [
+      ":turbojpeg_opt",
+      ":turbojpeg_hide_symbol",
+    ]
     deps = [ ":libjpeg_action" ]
     part_name = "libjpeg-turbo"
     subsystem_name = "thirdparty"
@@ -218,6 +244,10 @@ if (defined(ohos_lite)) {
   ohos_shared_library("turbojpeg") {
     sources = get_target_outputs(":libjpeg_action")
     public_configs = [ ":turbojpeg_config" ]
+    configs = [
+      ":turbojpeg_opt",
+      ":turbojpeg_local_symbol_first",
+    ]
     deps = [ ":libjpeg_action" ]
     innerapi_tags = [ "platformsdk" ]
     part_name = "libjpeg-turbo"

libjpeg-turbo-optimize.patch

@@ -1,5 +1,198 @@
+diff --git a/cdjpeg.h b/cdjpeg.h
+index 082687c..840cd2d 100644
+--- a/cdjpeg.h
++++ b/cdjpeg.h
+@@ -103,39 +103,39 @@ typedef struct cdjpeg_progress_mgr *cd_progress_ptr;
+ 
+ /* Module selection routines for I/O modules. */
+ 
+-EXTERN(cjpeg_source_ptr) jinit_read_bmp(j_compress_ptr cinfo,
++HIDE(EXTERN)(cjpeg_source_ptr) jinit_read_bmp(j_compress_ptr cinfo,
+                                         boolean use_inversion_array);
+-EXTERN(djpeg_dest_ptr) jinit_write_bmp(j_decompress_ptr cinfo, boolean is_os2,
++HIDE(EXTERN)(djpeg_dest_ptr) jinit_write_bmp(j_decompress_ptr cinfo, boolean is_os2,
+                                        boolean use_inversion_array);
+-EXTERN(cjpeg_source_ptr) jinit_read_gif(j_compress_ptr cinfo);
+-EXTERN(djpeg_dest_ptr) jinit_write_gif(j_decompress_ptr cinfo, boolean is_lzw);
+-EXTERN(cjpeg_source_ptr) jinit_read_ppm(j_compress_ptr cinfo);
+-EXTERN(djpeg_dest_ptr) jinit_write_ppm(j_decompress_ptr cinfo);
+-EXTERN(cjpeg_source_ptr) jinit_read_targa(j_compress_ptr cinfo);
+-EXTERN(djpeg_dest_ptr) jinit_write_targa(j_decompress_ptr cinfo);
++HIDE(EXTERN)(cjpeg_source_ptr) jinit_read_gif(j_compress_ptr cinfo);
++HIDE(EXTERN)(djpeg_dest_ptr) jinit_write_gif(j_decompress_ptr cinfo, boolean is_lzw);
++HIDE(EXTERN)(cjpeg_source_ptr) jinit_read_ppm(j_compress_ptr cinfo);
++HIDE(EXTERN)(djpeg_dest_ptr) jinit_write_ppm(j_decompress_ptr cinfo);
++HIDE(EXTERN)(cjpeg_source_ptr) jinit_read_targa(j_compress_ptr cinfo);
++HIDE(EXTERN)(djpeg_dest_ptr) jinit_write_targa(j_decompress_ptr cinfo);
+ 
+ /* cjpeg support routines (in rdswitch.c) */
+ 
+-EXTERN(boolean) read_quant_tables(j_compress_ptr cinfo, char *filename,
++HIDE(EXTERN)(boolean) read_quant_tables(j_compress_ptr cinfo, char *filename,
+                                   boolean force_baseline);
+-EXTERN(boolean) read_scan_script(j_compress_ptr cinfo, char *filename);
+-EXTERN(boolean) set_quality_ratings(j_compress_ptr cinfo, char *arg,
++HIDE(EXTERN)(boolean) read_scan_script(j_compress_ptr cinfo, char *filename);
++HIDE(EXTERN)(boolean) set_quality_ratings(j_compress_ptr cinfo, char *arg,
+                                     boolean force_baseline);
+-EXTERN(boolean) set_quant_slots(j_compress_ptr cinfo, char *arg);
+-EXTERN(boolean) set_sample_factors(j_compress_ptr cinfo, char *arg);
++HIDE(EXTERN)(boolean) set_quant_slots(j_compress_ptr cinfo, char *arg);
++HIDE(EXTERN)(boolean) set_sample_factors(j_compress_ptr cinfo, char *arg);
+ 
+ /* djpeg support routines (in rdcolmap.c) */
+ 
+-EXTERN(void) read_color_map(j_decompress_ptr cinfo, FILE *infile);
++HIDE(EXTERN)(void) read_color_map(j_decompress_ptr cinfo, FILE *infile);
+ 
+ /* common support routines (in cdjpeg.c) */
+ 
+-EXTERN(void) start_progress_monitor(j_common_ptr cinfo,
++HIDE(EXTERN)(void) start_progress_monitor(j_common_ptr cinfo,
+                                     cd_progress_ptr progress);
+-EXTERN(void) end_progress_monitor(j_common_ptr cinfo);
+-EXTERN(boolean) keymatch(char *arg, const char *keyword, int minchars);
+-EXTERN(FILE *) read_stdin(void);
+-EXTERN(FILE *) write_stdout(void);
++HIDE(EXTERN)(void) end_progress_monitor(j_common_ptr cinfo);
++HIDE(EXTERN)(boolean) keymatch(char *arg, const char *keyword, int minchars);
++HIDE(EXTERN)(FILE *) read_stdin(void);
++HIDE(EXTERN)(FILE *) write_stdout(void);
+ 
+ /* miscellaneous useful macros */
+ 
+diff --git a/jchuff.h b/jchuff.h
+index da7809a..57e9f8c 100644
+--- a/jchuff.h
++++ b/jchuff.h
+@@ -42,9 +42,9 @@ typedef struct {
+ } c_derived_tbl;
+ 
+ /* Expand a Huffman table definition into the derived format */
+-EXTERN(void) jpeg_make_c_derived_tbl(j_compress_ptr cinfo, boolean isDC,
++HIDE(EXTERN)(void) jpeg_make_c_derived_tbl(j_compress_ptr cinfo, boolean isDC,
+                                      int tblno, c_derived_tbl **pdtbl);
+ 
+ /* Generate an optimal table definition given the specified counts */
+-EXTERN(void) jpeg_gen_optimal_table(j_compress_ptr cinfo, JHUFF_TBL *htbl,
++HIDE(EXTERN)(void) jpeg_gen_optimal_table(j_compress_ptr cinfo, JHUFF_TBL *htbl,
+                                     long freq[]);
+diff --git a/jdatadst-tj.c b/jdatadst-tj.c
+index fdaa2de..dc53970 100644
+--- a/jdatadst-tj.c
++++ b/jdatadst-tj.c
+@@ -27,7 +27,7 @@
+ extern void *malloc(size_t size);
+ extern void free(void *ptr);
+ #endif
+-void jpeg_mem_dest_tj(j_compress_ptr cinfo, unsigned char **outbuffer,
++HIDE(void) jpeg_mem_dest_tj(j_compress_ptr cinfo, unsigned char **outbuffer,
+                       unsigned long *outsize, boolean alloc);
+ 
+ 
+diff --git a/jdatasrc-tj.c b/jdatasrc-tj.c
+index 69fb5ea..1808dd9 100644
+--- a/jdatasrc-tj.c
++++ b/jdatasrc-tj.c
+@@ -23,7 +23,7 @@
+ #include "jpeglib.h"
+ #include "jerror.h"
+ 
+-void jpeg_mem_src_tj(j_decompress_ptr cinfo, const unsigned char *inbuffer,
++HIDE(void) jpeg_mem_src_tj(j_decompress_ptr cinfo, const unsigned char *inbuffer,
+                      unsigned long insize);
+ 
+ 
+diff --git a/jdct.h b/jdct.h
+index 66d1718..7273ec0 100644
+--- a/jdct.h
++++ b/jdct.h
+@@ -90,62 +90,62 @@ typedef FAST_FLOAT FLOAT_MULT_TYPE;  /* preferred floating type */
+ 
+ /* Extern declarations for the forward and inverse DCT routines. */
+ 
+-EXTERN(void) jpeg_fdct_islow(DCTELEM *data);
+-EXTERN(void) jpeg_fdct_ifast(DCTELEM *data);
+-EXTERN(void) jpeg_fdct_float(FAST_FLOAT *data);
++HIDE(EXTERN)(void) jpeg_fdct_islow(DCTELEM *data);
++HIDE(EXTERN)(void) jpeg_fdct_ifast(DCTELEM *data);
++HIDE(EXTERN)(void) jpeg_fdct_float(FAST_FLOAT *data);
+ 
+-EXTERN(void) jpeg_idct_islow(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jpeg_idct_islow(j_decompress_ptr cinfo,
+                              jpeg_component_info *compptr, JCOEFPTR coef_block,
+                              JSAMPARRAY output_buf, JDIMENSION output_col);
+-EXTERN(void) jpeg_idct_ifast(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jpeg_idct_ifast(j_decompress_ptr cinfo,
+                              jpeg_component_info *compptr, JCOEFPTR coef_block,
+                              JSAMPARRAY output_buf, JDIMENSION output_col);
+-EXTERN(void) jpeg_idct_float(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jpeg_idct_float(j_decompress_ptr cinfo,
+                              jpeg_component_info *compptr, JCOEFPTR coef_block,
+                              JSAMPARRAY output_buf, JDIMENSION output_col);
+-EXTERN(void) jpeg_idct_7x7(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jpeg_idct_7x7(j_decompress_ptr cinfo,
+                            jpeg_component_info *compptr, JCOEFPTR coef_block,
+                            JSAMPARRAY output_buf, JDIMENSION output_col);
+-EXTERN(void) jpeg_idct_6x6(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jpeg_idct_6x6(j_decompress_ptr cinfo,
+                            jpeg_component_info *compptr, JCOEFPTR coef_block,
+                            JSAMPARRAY output_buf, JDIMENSION output_col);
+-EXTERN(void) jpeg_idct_5x5(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jpeg_idct_5x5(j_decompress_ptr cinfo,
+                            jpeg_component_info *compptr, JCOEFPTR coef_block,
+                            JSAMPARRAY output_buf, JDIMENSION output_col);
+-EXTERN(void) jpeg_idct_4x4(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jpeg_idct_4x4(j_decompress_ptr cinfo,
+                            jpeg_component_info *compptr, JCOEFPTR coef_block,
+                            JSAMPARRAY output_buf, JDIMENSION output_col);
+-EXTERN(void) jpeg_idct_3x3(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jpeg_idct_3x3(j_decompress_ptr cinfo,
+                            jpeg_component_info *compptr, JCOEFPTR coef_block,
+                            JSAMPARRAY output_buf, JDIMENSION output_col);
+-EXTERN(void) jpeg_idct_2x2(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jpeg_idct_2x2(j_decompress_ptr cinfo,
+                            jpeg_component_info *compptr, JCOEFPTR coef_block,
+                            JSAMPARRAY output_buf, JDIMENSION output_col);
+-EXTERN(void) jpeg_idct_1x1(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jpeg_idct_1x1(j_decompress_ptr cinfo,
+                            jpeg_component_info *compptr, JCOEFPTR coef_block,
+                            JSAMPARRAY output_buf, JDIMENSION output_col);
+-EXTERN(void) jpeg_idct_9x9(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jpeg_idct_9x9(j_decompress_ptr cinfo,
+                            jpeg_component_info *compptr, JCOEFPTR coef_block,
+                            JSAMPARRAY output_buf, JDIMENSION output_col);
+-EXTERN(void) jpeg_idct_10x10(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jpeg_idct_10x10(j_decompress_ptr cinfo,
+                              jpeg_component_info *compptr, JCOEFPTR coef_block,
+                              JSAMPARRAY output_buf, JDIMENSION output_col);
+-EXTERN(void) jpeg_idct_11x11(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jpeg_idct_11x11(j_decompress_ptr cinfo,
+                              jpeg_component_info *compptr, JCOEFPTR coef_block,
+                              JSAMPARRAY output_buf, JDIMENSION output_col);
+-EXTERN(void) jpeg_idct_12x12(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jpeg_idct_12x12(j_decompress_ptr cinfo,
+                              jpeg_component_info *compptr, JCOEFPTR coef_block,
+                              JSAMPARRAY output_buf, JDIMENSION output_col);
+-EXTERN(void) jpeg_idct_13x13(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jpeg_idct_13x13(j_decompress_ptr cinfo,
+                              jpeg_component_info *compptr, JCOEFPTR coef_block,
+                              JSAMPARRAY output_buf, JDIMENSION output_col);
+-EXTERN(void) jpeg_idct_14x14(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jpeg_idct_14x14(j_decompress_ptr cinfo,
+                              jpeg_component_info *compptr, JCOEFPTR coef_block,
+                              JSAMPARRAY output_buf, JDIMENSION output_col);
+-EXTERN(void) jpeg_idct_15x15(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jpeg_idct_15x15(j_decompress_ptr cinfo,
+                              jpeg_component_info *compptr, JCOEFPTR coef_block,
+                              JSAMPARRAY output_buf, JDIMENSION output_col);
+-EXTERN(void) jpeg_idct_16x16(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jpeg_idct_16x16(j_decompress_ptr cinfo,
+                              jpeg_component_info *compptr, JCOEFPTR coef_block,
+                              JSAMPARRAY output_buf, JDIMENSION output_col);
+ 
 diff --git a/jdhuff.h b/jdhuff.h
-index cfa0b7f..f24c73e 100644
+index cfa0b7f..6cc2344 100644
 --- a/jdhuff.h
 +++ b/jdhuff.h
 @@ -16,10 +16,55 @@
@@ -61,7 +254,7 @@ index cfa0b7f..f24c73e 100644
  
  typedef struct {
    /* Basic tables: (element [0] of each array is unused) */
-@@ -44,7 +89,7 @@ typedef struct {
+@@ -44,11 +89,11 @@ typedef struct {
     * if too long.  The next 8 bits of each entry contain the
     * symbol.
     */
@@ -70,6 +263,29 @@ index cfa0b7f..f24c73e 100644
  } d_derived_tbl;
  
  /* Expand a Huffman table definition into the derived format */
+-EXTERN(void) jpeg_make_d_derived_tbl(j_decompress_ptr cinfo, boolean isDC,
++HIDE(EXTERN)(void) jpeg_make_d_derived_tbl(j_decompress_ptr cinfo, boolean isDC,
+                                      int tblno, d_derived_tbl **pdtbl);
+ 
+ 
+@@ -172,7 +217,7 @@ typedef struct {                /* Bitreading working state within an MCU */
+   (bits_left -= (nbits))
+ 
+ /* Load up the bit buffer to a depth of at least nbits */
+-EXTERN(boolean) jpeg_fill_bit_buffer(bitread_working_state *state,
++HIDE(EXTERN)(boolean) jpeg_fill_bit_buffer(bitread_working_state *state,
+                                      register bit_buf_type get_buffer,
+                                      register int bits_left, int nbits);
+ 
+@@ -241,7 +286,7 @@ slowlabel: \
+   }
+ 
+ /* Out-of-line case for Huffman code fetching */
+-EXTERN(int) jpeg_huff_decode(bitread_working_state *state,
++HIDE(EXTERN)(int) jpeg_huff_decode(bitread_working_state *state,
+                              register bit_buf_type get_buffer,
+                              register int bits_left, d_derived_tbl *htbl,
+                              int min_bits);
 diff --git a/jdhuff_opt.c b/jdhuff_opt.c
 new file mode 100644
 index 0000000..5b1875c
@@ -1279,6 +1495,415 @@ index c6d82ca..25e3b1d 100644
        /* remember the single active table */
        entropy->ac_derived_tbl = entropy->derived_tbls[tbl];
      }
+diff --git a/jmemsys.h b/jmemsys.h
+index 9229550..a17f46c 100644
+--- a/jmemsys.h
++++ b/jmemsys.h
+@@ -31,8 +31,8 @@
+  * size of the object being freed, just in case it's needed.
+  */
+ 
+-EXTERN(void *) jpeg_get_small(j_common_ptr cinfo, size_t sizeofobject);
+-EXTERN(void) jpeg_free_small(j_common_ptr cinfo, void *object,
++HIDE(EXTERN)(void *) jpeg_get_small(j_common_ptr cinfo, size_t sizeofobject);
++HIDE(EXTERN)(void) jpeg_free_small(j_common_ptr cinfo, void *object,
+                              size_t sizeofobject);
+ 
+ /*
+@@ -43,8 +43,8 @@ EXTERN(void) jpeg_free_small(j_common_ptr cinfo, void *object,
+  * large chunks.
+  */
+ 
+-EXTERN(void *) jpeg_get_large(j_common_ptr cinfo, size_t sizeofobject);
+-EXTERN(void) jpeg_free_large(j_common_ptr cinfo, void *object,
++HIDE(EXTERN)(void *) jpeg_get_large(j_common_ptr cinfo, size_t sizeofobject);
++HIDE(EXTERN)(void) jpeg_free_large(j_common_ptr cinfo, void *object,
+                              size_t sizeofobject);
+ 
+ /*
+@@ -84,7 +84,7 @@ EXTERN(void) jpeg_free_large(j_common_ptr cinfo, void *object,
+  * Conversely, zero may be returned to always use the minimum amount of memory.
+  */
+ 
+-EXTERN(size_t) jpeg_mem_available(j_common_ptr cinfo, size_t min_bytes_needed,
++HIDE(EXTERN)(size_t) jpeg_mem_available(j_common_ptr cinfo, size_t min_bytes_needed,
+                                   size_t max_bytes_needed,
+                                   size_t already_allocated);
+ 
+@@ -157,7 +157,7 @@ typedef struct backing_store_struct {
+  * just take an error exit.)
+  */
+ 
+-EXTERN(void) jpeg_open_backing_store(j_common_ptr cinfo,
++HIDE(EXTERN)(void) jpeg_open_backing_store(j_common_ptr cinfo,
+                                      backing_store_ptr info,
+                                      long total_bytes_needed);
+ 
+@@ -174,5 +174,5 @@ EXTERN(void) jpeg_open_backing_store(j_common_ptr cinfo,
+  * all opened backing-store objects have been closed.
+  */
+ 
+-EXTERN(long) jpeg_mem_init(j_common_ptr cinfo);
+-EXTERN(void) jpeg_mem_term(j_common_ptr cinfo);
++HIDE(EXTERN)(long) jpeg_mem_init(j_common_ptr cinfo);
++HIDE(EXTERN)(void) jpeg_mem_term(j_common_ptr cinfo);
+diff --git a/jmorecfg.h b/jmorecfg.h
+index 1a63a14..f4b3903 100644
+--- a/jmorecfg.h
++++ b/jmorecfg.h
+@@ -178,7 +178,12 @@ typedef unsigned int JDIMENSION;
+ #define GLOBAL(type)            type
+ /* a reference to a GLOBAL function: */
+ #define EXTERN(type)            extern type
+-
++/* a function used only in this lib: */
++#ifdef HIDE_INTERNAL
++  #define HIDE(type)            __attribute__((visibility("hidden"))) type
++#else
++  #define HIDE(type)            type
++#endif
+ 
+ /* Originally, this macro was used as a way of defining function prototypes
+  * for both modern compilers as well as older compilers that did not support
+diff --git a/jpegint.h b/jpegint.h
+index 8c85347..7798a89 100644
+--- a/jpegint.h
++++ b/jpegint.h
+@@ -318,53 +318,53 @@ struct jpeg_color_quantizer {
+ 
+ 
+ /* Compression module initialization routines */
+-EXTERN(void) jinit_compress_master(j_compress_ptr cinfo);
+-EXTERN(void) jinit_c_master_control(j_compress_ptr cinfo,
++HIDE(EXTERN)(void) jinit_compress_master(j_compress_ptr cinfo);
++HIDE(EXTERN)(void) jinit_c_master_control(j_compress_ptr cinfo,
+                                     boolean transcode_only);
+-EXTERN(void) jinit_c_main_controller(j_compress_ptr cinfo,
++HIDE(EXTERN)(void) jinit_c_main_controller(j_compress_ptr cinfo,
+                                      boolean need_full_buffer);
+-EXTERN(void) jinit_c_prep_controller(j_compress_ptr cinfo,
++HIDE(EXTERN)(void) jinit_c_prep_controller(j_compress_ptr cinfo,
+                                      boolean need_full_buffer);
+-EXTERN(void) jinit_c_coef_controller(j_compress_ptr cinfo,
++HIDE(EXTERN)(void) jinit_c_coef_controller(j_compress_ptr cinfo,
+                                      boolean need_full_buffer);
+-EXTERN(void) jinit_color_converter(j_compress_ptr cinfo);
+-EXTERN(void) jinit_downsampler(j_compress_ptr cinfo);
+-EXTERN(void) jinit_forward_dct(j_compress_ptr cinfo);
+-EXTERN(void) jinit_huff_encoder(j_compress_ptr cinfo);
+-EXTERN(void) jinit_phuff_encoder(j_compress_ptr cinfo);
+-EXTERN(void) jinit_arith_encoder(j_compress_ptr cinfo);
+-EXTERN(void) jinit_marker_writer(j_compress_ptr cinfo);
++HIDE(EXTERN)(void) jinit_color_converter(j_compress_ptr cinfo);
++HIDE(EXTERN)(void) jinit_downsampler(j_compress_ptr cinfo);
++HIDE(EXTERN)(void) jinit_forward_dct(j_compress_ptr cinfo);
++HIDE(EXTERN)(void) jinit_huff_encoder(j_compress_ptr cinfo);
++HIDE(EXTERN)(void) jinit_phuff_encoder(j_compress_ptr cinfo);
++HIDE(EXTERN)(void) jinit_arith_encoder(j_compress_ptr cinfo);
++HIDE(EXTERN)(void) jinit_marker_writer(j_compress_ptr cinfo);
+ /* Decompression module initialization routines */
+-EXTERN(void) jinit_master_decompress(j_decompress_ptr cinfo);
+-EXTERN(void) jinit_d_main_controller(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jinit_master_decompress(j_decompress_ptr cinfo);
++HIDE(EXTERN)(void) jinit_d_main_controller(j_decompress_ptr cinfo,
+                                      boolean need_full_buffer);
+-EXTERN(void) jinit_d_coef_controller(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jinit_d_coef_controller(j_decompress_ptr cinfo,
+                                      boolean need_full_buffer);
+-EXTERN(void) jinit_d_post_controller(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jinit_d_post_controller(j_decompress_ptr cinfo,
+                                      boolean need_full_buffer);
+-EXTERN(void) jinit_input_controller(j_decompress_ptr cinfo);
+-EXTERN(void) jinit_marker_reader(j_decompress_ptr cinfo);
+-EXTERN(void) jinit_huff_decoder(j_decompress_ptr cinfo);
+-EXTERN(void) jinit_phuff_decoder(j_decompress_ptr cinfo);
+-EXTERN(void) jinit_arith_decoder(j_decompress_ptr cinfo);
+-EXTERN(void) jinit_inverse_dct(j_decompress_ptr cinfo);
+-EXTERN(void) jinit_upsampler(j_decompress_ptr cinfo);
+-EXTERN(void) jinit_color_deconverter(j_decompress_ptr cinfo);
+-EXTERN(void) jinit_1pass_quantizer(j_decompress_ptr cinfo);
+-EXTERN(void) jinit_2pass_quantizer(j_decompress_ptr cinfo);
+-EXTERN(void) jinit_merged_upsampler(j_decompress_ptr cinfo);
++HIDE(EXTERN)(void) jinit_input_controller(j_decompress_ptr cinfo);
++HIDE(EXTERN)(void) jinit_marker_reader(j_decompress_ptr cinfo);
++HIDE(EXTERN)(void) jinit_huff_decoder(j_decompress_ptr cinfo);
++HIDE(EXTERN)(void) jinit_phuff_decoder(j_decompress_ptr cinfo);
++HIDE(EXTERN)(void) jinit_arith_decoder(j_decompress_ptr cinfo);
++HIDE(EXTERN)(void) jinit_inverse_dct(j_decompress_ptr cinfo);
++HIDE(EXTERN)(void) jinit_upsampler(j_decompress_ptr cinfo);
++HIDE(EXTERN)(void) jinit_color_deconverter(j_decompress_ptr cinfo);
++HIDE(EXTERN)(void) jinit_1pass_quantizer(j_decompress_ptr cinfo);
++HIDE(EXTERN)(void) jinit_2pass_quantizer(j_decompress_ptr cinfo);
++HIDE(EXTERN)(void) jinit_merged_upsampler(j_decompress_ptr cinfo);
+ /* Memory manager initialization */
+-EXTERN(void) jinit_memory_mgr(j_common_ptr cinfo);
++HIDE(EXTERN)(void) jinit_memory_mgr(j_common_ptr cinfo);
+ 
+ /* Utility routines in jutils.c */
+-EXTERN(long) jdiv_round_up(long a, long b);
+-EXTERN(long) jround_up(long a, long b);
+-EXTERN(void) jcopy_sample_rows(JSAMPARRAY input_array, int source_row,
++HIDE(EXTERN)(long) jdiv_round_up(long a, long b);
++HIDE(EXTERN)(long) jround_up(long a, long b);
++HIDE(EXTERN)(void) jcopy_sample_rows(JSAMPARRAY input_array, int source_row,
+                                JSAMPARRAY output_array, int dest_row,
+                                int num_rows, JDIMENSION num_cols);
+-EXTERN(void) jcopy_block_row(JBLOCKROW input_row, JBLOCKROW output_row,
++HIDE(EXTERN)(void) jcopy_block_row(JBLOCKROW input_row, JBLOCKROW output_row,
+                              JDIMENSION num_blocks);
+-EXTERN(void) jzero_far(void *target, size_t bytestozero);
++HIDE(EXTERN)(void) jzero_far(void *target, size_t bytestozero);
+ /* Constant tables in jutils.c */
+ #if 0                           /* This table is not actually needed in v6a */
+ extern const int jpeg_zigzag_order[]; /* natural coef order to zigzag order */
+diff --git a/jsimd.h b/jsimd.h
+index f3a87ee..ea094f6 100644
+--- a/jsimd.h
++++ b/jsimd.h
+@@ -14,110 +14,110 @@
+ 
+ #include "jchuff.h"             /* Declarations shared with jcphuff.c */
+ 
+-EXTERN(int) jsimd_can_rgb_ycc(void);
+-EXTERN(int) jsimd_can_rgb_gray(void);
+-EXTERN(int) jsimd_can_ycc_rgb(void);
+-EXTERN(int) jsimd_can_ycc_rgb565(void);
+-EXTERN(int) jsimd_c_can_null_convert(void);
++HIDE(EXTERN)(int) jsimd_can_rgb_ycc(void);
++HIDE(EXTERN)(int) jsimd_can_rgb_gray(void);
++HIDE(EXTERN)(int) jsimd_can_ycc_rgb(void);
++HIDE(EXTERN)(int) jsimd_can_ycc_rgb565(void);
++HIDE(EXTERN)(int) jsimd_c_can_null_convert(void);
+ 
+-EXTERN(void) jsimd_rgb_ycc_convert(j_compress_ptr cinfo, JSAMPARRAY input_buf,
++HIDE(EXTERN)(void) jsimd_rgb_ycc_convert(j_compress_ptr cinfo, JSAMPARRAY input_buf,
+                                    JSAMPIMAGE output_buf,
+                                    JDIMENSION output_row, int num_rows);
+-EXTERN(void) jsimd_rgb_gray_convert(j_compress_ptr cinfo, JSAMPARRAY input_buf,
++HIDE(EXTERN)(void) jsimd_rgb_gray_convert(j_compress_ptr cinfo, JSAMPARRAY input_buf,
+                                     JSAMPIMAGE output_buf,
+                                     JDIMENSION output_row, int num_rows);
+-EXTERN(void) jsimd_ycc_rgb_convert(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jsimd_ycc_rgb_convert(j_decompress_ptr cinfo,
+                                    JSAMPIMAGE input_buf, JDIMENSION input_row,
+                                    JSAMPARRAY output_buf, int num_rows);
+-EXTERN(void) jsimd_ycc_rgb565_convert(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jsimd_ycc_rgb565_convert(j_decompress_ptr cinfo,
+                                       JSAMPIMAGE input_buf,
+                                       JDIMENSION input_row,
+                                       JSAMPARRAY output_buf, int num_rows);
+-EXTERN(void) jsimd_c_null_convert(j_compress_ptr cinfo, JSAMPARRAY input_buf,
++HIDE(EXTERN)(void) jsimd_c_null_convert(j_compress_ptr cinfo, JSAMPARRAY input_buf,
+                                   JSAMPIMAGE output_buf, JDIMENSION output_row,
+                                   int num_rows);
+ 
+-EXTERN(int) jsimd_can_h2v2_downsample(void);
+-EXTERN(int) jsimd_can_h2v1_downsample(void);
++HIDE(EXTERN)(int) jsimd_can_h2v2_downsample(void);
++HIDE(EXTERN)(int) jsimd_can_h2v1_downsample(void);
+ 
+-EXTERN(void) jsimd_h2v2_downsample(j_compress_ptr cinfo,
++HIDE(EXTERN)(void) jsimd_h2v2_downsample(j_compress_ptr cinfo,
+                                    jpeg_component_info *compptr,
+                                    JSAMPARRAY input_data,
+                                    JSAMPARRAY output_data);
+ 
+-EXTERN(int) jsimd_can_h2v2_smooth_downsample(void);
++HIDE(EXTERN)(int) jsimd_can_h2v2_smooth_downsample(void);
+ 
+-EXTERN(void) jsimd_h2v2_smooth_downsample(j_compress_ptr cinfo,
++HIDE(EXTERN)(void) jsimd_h2v2_smooth_downsample(j_compress_ptr cinfo,
+                                           jpeg_component_info *compptr,
+                                           JSAMPARRAY input_data,
+                                           JSAMPARRAY output_data);
+ 
+-EXTERN(void) jsimd_h2v1_downsample(j_compress_ptr cinfo,
++HIDE(EXTERN)(void) jsimd_h2v1_downsample(j_compress_ptr cinfo,
+                                    jpeg_component_info *compptr,
+                                    JSAMPARRAY input_data,
+                                    JSAMPARRAY output_data);
+ 
+-EXTERN(int) jsimd_can_h2v2_upsample(void);
+-EXTERN(int) jsimd_can_h2v1_upsample(void);
+-EXTERN(int) jsimd_can_int_upsample(void);
++HIDE(EXTERN)(int) jsimd_can_h2v2_upsample(void);
++HIDE(EXTERN)(int) jsimd_can_h2v1_upsample(void);
++HIDE(EXTERN)(int) jsimd_can_int_upsample(void);
+ 
+-EXTERN(void) jsimd_h2v2_upsample(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jsimd_h2v2_upsample(j_decompress_ptr cinfo,
+                                  jpeg_component_info *compptr,
+                                  JSAMPARRAY input_data,
+                                  JSAMPARRAY *output_data_ptr);
+-EXTERN(void) jsimd_h2v1_upsample(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jsimd_h2v1_upsample(j_decompress_ptr cinfo,
+                                  jpeg_component_info *compptr,
+                                  JSAMPARRAY input_data,
+                                  JSAMPARRAY *output_data_ptr);
+-EXTERN(void) jsimd_int_upsample(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jsimd_int_upsample(j_decompress_ptr cinfo,
+                                 jpeg_component_info *compptr,
+                                 JSAMPARRAY input_data,
+                                 JSAMPARRAY *output_data_ptr);
+ 
+-EXTERN(int) jsimd_can_h2v2_fancy_upsample(void);
+-EXTERN(int) jsimd_can_h2v1_fancy_upsample(void);
+-EXTERN(int) jsimd_can_h1v2_fancy_upsample(void);
++HIDE(EXTERN)(int) jsimd_can_h2v2_fancy_upsample(void);
++HIDE(EXTERN)(int) jsimd_can_h2v1_fancy_upsample(void);
++HIDE(EXTERN)(int) jsimd_can_h1v2_fancy_upsample(void);
+ 
+-EXTERN(void) jsimd_h2v2_fancy_upsample(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jsimd_h2v2_fancy_upsample(j_decompress_ptr cinfo,
+                                        jpeg_component_info *compptr,
+                                        JSAMPARRAY input_data,
+                                        JSAMPARRAY *output_data_ptr);
+-EXTERN(void) jsimd_h2v1_fancy_upsample(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jsimd_h2v1_fancy_upsample(j_decompress_ptr cinfo,
+                                        jpeg_component_info *compptr,
+                                        JSAMPARRAY input_data,
+                                        JSAMPARRAY *output_data_ptr);
+-EXTERN(void) jsimd_h1v2_fancy_upsample(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jsimd_h1v2_fancy_upsample(j_decompress_ptr cinfo,
+                                        jpeg_component_info *compptr,
+                                        JSAMPARRAY input_data,
+                                        JSAMPARRAY *output_data_ptr);
+ 
+-EXTERN(int) jsimd_can_h2v2_merged_upsample(void);
+-EXTERN(int) jsimd_can_h2v1_merged_upsample(void);
++HIDE(EXTERN)(int) jsimd_can_h2v2_merged_upsample(void);
++HIDE(EXTERN)(int) jsimd_can_h2v1_merged_upsample(void);
+ 
+-EXTERN(void) jsimd_h2v2_merged_upsample(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jsimd_h2v2_merged_upsample(j_decompress_ptr cinfo,
+                                         JSAMPIMAGE input_buf,
+                                         JDIMENSION in_row_group_ctr,
+                                         JSAMPARRAY output_buf);
+-EXTERN(void) jsimd_h2v1_merged_upsample(j_decompress_ptr cinfo,
++HIDE(EXTERN)(void) jsimd_h2v1_merged_upsample(j_decompress_ptr cinfo,
+                                         JSAMPIMAGE input_buf,
+                                         JDIMENSION in_row_group_ctr,
+                                         JSAMPARRAY output_buf);
+ 
+-EXTERN(int) jsimd_can_huff_encode_one_block(void);
++HIDE(EXTERN)(int) jsimd_can_huff_encode_one_block(void);
+ 
+-EXTERN(JOCTET *) jsimd_huff_encode_one_block(void *state, JOCTET *buffer,
++HIDE(EXTERN)(JOCTET *) jsimd_huff_encode_one_block(void *state, JOCTET *buffer,
+                                              JCOEFPTR block, int last_dc_val,
+                                              c_derived_tbl *dctbl,
+                                              c_derived_tbl *actbl);
+ 
+-EXTERN(int) jsimd_can_encode_mcu_AC_first_prepare(void);
++HIDE(EXTERN)(int) jsimd_can_encode_mcu_AC_first_prepare(void);
+ 
+-EXTERN(void) jsimd_encode_mcu_AC_first_prepare
++HIDE(EXTERN)(void) jsimd_encode_mcu_AC_first_prepare
+   (const JCOEF *block, const int *jpeg_natural_order_start, int Sl, int Al,
+    UJCOEF *values, size_t *zerobits);
+ 
+-EXTERN(int) jsimd_can_encode_mcu_AC_refine_prepare(void);
++HIDE(EXTERN)(int) jsimd_can_encode_mcu_AC_refine_prepare(void);
+ 
+-EXTERN(int) jsimd_encode_mcu_AC_refine_prepare
++HIDE(EXTERN)(int) jsimd_encode_mcu_AC_refine_prepare
+   (const JCOEF *block, const int *jpeg_natural_order_start, int Sl, int Al,
+    UJCOEF *absvalues, size_t *bits);
+diff --git a/jsimddct.h b/jsimddct.h
+index 55ee8cf..c19fe41 100644
+--- a/jsimddct.h
++++ b/jsimddct.h
+@@ -9,62 +9,62 @@
+  *
+  */
+ 
+-EXTERN(int) jsimd_can_convsamp(void);
+-EXTERN(int) jsimd_can_convsamp_float(void);
++HIDE(EXTERN)(int) jsimd_can_convsamp(void);
++HIDE(EXTERN)(int) jsimd_can_convsamp_float(void);
+ 
+-EXTERN(void) jsimd_convsamp(JSAMPARRAY sample_data, JDIMENSION start_col,
++HIDE(EXTERN)(void) jsimd_convsamp(JSAMPARRAY sample_data, JDIMENSION start_col,
+                             DCTELEM *workspace);
+-EXTERN(void) jsimd_convsamp_float(JSAMPARRAY sample_data, JDIMENSION start_col,
++HIDE(EXTERN)(void) jsimd_convsamp_float(JSAMPARRAY sample_data, JDIMENSION start_col,
+                                   FAST_FLOAT *workspace);
+ 
+-EXTERN(int) jsimd_can_fdct_islow(void);
+-EXTERN(int) jsimd_can_fdct_ifast(void);
+-EXTERN(int) jsimd_can_fdct_float(void);
++HIDE(EXTERN)(int) jsimd_can_fdct_islow(void);
++HIDE(EXTERN)(int) jsimd_can_fdct_ifast(void);
++HIDE(EXTERN)(int) jsimd_can_fdct_float(void);
+ 
+-EXTERN(void) jsimd_fdct_islow(DCTELEM *data);
+-EXTERN(void) jsimd_fdct_ifast(DCTELEM *data);
+-EXTERN(void) jsimd_fdct_float(FAST_FLOAT *data);
++HIDE(EXTERN)(void) jsimd_fdct_islow(DCTELEM *data);
++HIDE(EXTERN)(void) jsimd_fdct_ifast(DCTELEM *data);
++HIDE(EXTERN)(void) jsimd_fdct_float(FAST_FLOAT *data);
+ 
+-EXTERN(int) jsimd_can_quantize(void);
+-EXTERN(int) jsimd_can_quantize_float(void);
++HIDE(EXTERN)(int) jsimd_can_quantize(void);
++HIDE(EXTERN)(int) jsimd_can_quantize_float(void);
+ 
+-EXTERN(void) jsimd_quantize(JCOEFPTR coef_block, DCTELEM *divisors,
++HIDE(EXTERN)(void) jsimd_quantize(JCOEFPTR coef_block, DCTELEM *divisors,
+                             DCTELEM *workspace);
+-EXTERN(void) jsimd_quantize_float(JCOEFPTR coef_block, FAST_FLOAT *divisors,
++HIDE(EXTERN)(void) jsimd_quantize_float(JCOEFPTR coef_block, FAST_FLOAT *divisors,
+                                   FAST_FLOAT *workspace);
+ 
+-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);
++HIDE(EXTERN)(int) jsimd_can_idct_2x2(void);
++HIDE(EXTERN)(int) jsimd_can_idct_4x4(void);
++HIDE(EXTERN)(int) jsimd_can_idct_6x6(void);
++HIDE(EXTERN)(int) jsimd_can_idct_12x12(void);
+ 
+-EXTERN(void) jsimd_idct_2x2(j_decompress_ptr cinfo,
++HIDE(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,
++HIDE(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,
++HIDE(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,
++HIDE(EXTERN)(void) jsimd_idct_12x12(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);
++HIDE(EXTERN)(int) jsimd_can_idct_islow(void);
++HIDE(EXTERN)(int) jsimd_can_idct_ifast(void);
++HIDE(EXTERN)(int) jsimd_can_idct_float(void);
+ 
+-EXTERN(void) jsimd_idct_islow(j_decompress_ptr cinfo,
++HIDE(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,
++HIDE(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,
++HIDE(EXTERN)(void) jsimd_idct_float(j_decompress_ptr cinfo,
+                               jpeg_component_info *compptr,
+                               JCOEFPTR coef_block, JSAMPARRAY output_buf,
+                               JDIMENSION output_col);
 diff --git a/jutils.c b/jutils.c
 index 5c5bb17..cd14e74 100644
 --- a/jutils.c
@@ -1319,3 +1944,342 @@ index 5c5bb17..cd14e74 100644
  
  
  /*
+diff --git a/simd/jsimd.h b/simd/jsimd.h
+index abebbf4..1d45a56 100644
+--- a/simd/jsimd.h
++++ b/simd/jsimd.h
+@@ -102,34 +102,34 @@ EXTERN(void) jsimd_extxrgb_ycc_convert_avx2
+   (JDIMENSION img_width, JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+    JDIMENSION output_row, int num_rows);
+ 
+-EXTERN(void) jsimd_rgb_ycc_convert_neon
++HIDE(EXTERN)(void) jsimd_rgb_ycc_convert_neon
+   (JDIMENSION img_width, JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+    JDIMENSION output_row, int num_rows);
+-EXTERN(void) jsimd_extrgb_ycc_convert_neon
++HIDE(EXTERN)(void) jsimd_extrgb_ycc_convert_neon
+   (JDIMENSION img_width, JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+    JDIMENSION output_row, int num_rows);
+-EXTERN(void) jsimd_extrgbx_ycc_convert_neon
++HIDE(EXTERN)(void) jsimd_extrgbx_ycc_convert_neon
+   (JDIMENSION img_width, JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+    JDIMENSION output_row, int num_rows);
+-EXTERN(void) jsimd_extbgr_ycc_convert_neon
++HIDE(EXTERN)(void) jsimd_extbgr_ycc_convert_neon
+   (JDIMENSION img_width, JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+    JDIMENSION output_row, int num_rows);
+-EXTERN(void) jsimd_extbgrx_ycc_convert_neon
++HIDE(EXTERN)(void) jsimd_extbgrx_ycc_convert_neon
+   (JDIMENSION img_width, JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+    JDIMENSION output_row, int num_rows);
+-EXTERN(void) jsimd_extxbgr_ycc_convert_neon
++HIDE(EXTERN)(void) jsimd_extxbgr_ycc_convert_neon
+   (JDIMENSION img_width, JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+    JDIMENSION output_row, int num_rows);
+-EXTERN(void) jsimd_extxrgb_ycc_convert_neon
++HIDE(EXTERN)(void) jsimd_extxrgb_ycc_convert_neon
+   (JDIMENSION img_width, JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+    JDIMENSION output_row, int num_rows);
+ 
+ #ifndef NEON_INTRINSICS
+ 
+-EXTERN(void) jsimd_extrgb_ycc_convert_neon_slowld3
++HIDE(EXTERN)(void) jsimd_extrgb_ycc_convert_neon_slowld3
+   (JDIMENSION img_width, JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+    JDIMENSION output_row, int num_rows);
+-EXTERN(void) jsimd_extbgr_ycc_convert_neon_slowld3
++HIDE(EXTERN)(void) jsimd_extbgr_ycc_convert_neon_slowld3
+   (JDIMENSION img_width, JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+    JDIMENSION output_row, int num_rows);
+ 
+@@ -270,25 +270,25 @@ EXTERN(void) jsimd_extxrgb_gray_convert_avx2
+   (JDIMENSION img_width, JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+    JDIMENSION output_row, int num_rows);
+ 
+-EXTERN(void) jsimd_rgb_gray_convert_neon
++HIDE(EXTERN)(void) jsimd_rgb_gray_convert_neon
+   (JDIMENSION img_width, JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+    JDIMENSION output_row, int num_rows);
+-EXTERN(void) jsimd_extrgb_gray_convert_neon
++HIDE(EXTERN)(void) jsimd_extrgb_gray_convert_neon
+   (JDIMENSION img_width, JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+    JDIMENSION output_row, int num_rows);
+-EXTERN(void) jsimd_extrgbx_gray_convert_neon
++HIDE(EXTERN)(void) jsimd_extrgbx_gray_convert_neon
+   (JDIMENSION img_width, JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+    JDIMENSION output_row, int num_rows);
+-EXTERN(void) jsimd_extbgr_gray_convert_neon
++HIDE(EXTERN)(void) jsimd_extbgr_gray_convert_neon
+   (JDIMENSION img_width, JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+    JDIMENSION output_row, int num_rows);
+-EXTERN(void) jsimd_extbgrx_gray_convert_neon
++HIDE(EXTERN)(void) jsimd_extbgrx_gray_convert_neon
+   (JDIMENSION img_width, JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+    JDIMENSION output_row, int num_rows);
+-EXTERN(void) jsimd_extxbgr_gray_convert_neon
++HIDE(EXTERN)(void) jsimd_extxbgr_gray_convert_neon
+   (JDIMENSION img_width, JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+    JDIMENSION output_row, int num_rows);
+-EXTERN(void) jsimd_extxrgb_gray_convert_neon
++HIDE(EXTERN)(void) jsimd_extxrgb_gray_convert_neon
+   (JDIMENSION img_width, JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+    JDIMENSION output_row, int num_rows);
+ 
+@@ -427,37 +427,37 @@ EXTERN(void) jsimd_ycc_extxrgb_convert_avx2
+   (JDIMENSION out_width, JSAMPIMAGE input_buf, JDIMENSION input_row,
+    JSAMPARRAY output_buf, int num_rows);
+ 
+-EXTERN(void) jsimd_ycc_rgb_convert_neon
++HIDE(EXTERN)(void) jsimd_ycc_rgb_convert_neon
+   (JDIMENSION out_width, JSAMPIMAGE input_buf, JDIMENSION input_row,
+    JSAMPARRAY output_buf, int num_rows);
+-EXTERN(void) jsimd_ycc_extrgb_convert_neon
++HIDE(EXTERN)(void) jsimd_ycc_extrgb_convert_neon
+   (JDIMENSION out_width, JSAMPIMAGE input_buf, JDIMENSION input_row,
+    JSAMPARRAY output_buf, int num_rows);
+-EXTERN(void) jsimd_ycc_extrgbx_convert_neon
++HIDE(EXTERN)(void) jsimd_ycc_extrgbx_convert_neon
+   (JDIMENSION out_width, JSAMPIMAGE input_buf, JDIMENSION input_row,
+    JSAMPARRAY output_buf, int num_rows);
+-EXTERN(void) jsimd_ycc_extbgr_convert_neon
++HIDE(EXTERN)(void) jsimd_ycc_extbgr_convert_neon
+   (JDIMENSION out_width, JSAMPIMAGE input_buf, JDIMENSION input_row,
+    JSAMPARRAY output_buf, int num_rows);
+-EXTERN(void) jsimd_ycc_extbgrx_convert_neon
++HIDE(EXTERN)(void) jsimd_ycc_extbgrx_convert_neon
+   (JDIMENSION out_width, JSAMPIMAGE input_buf, JDIMENSION input_row,
+    JSAMPARRAY output_buf, int num_rows);
+-EXTERN(void) jsimd_ycc_extxbgr_convert_neon
++HIDE(EXTERN)(void) jsimd_ycc_extxbgr_convert_neon
+   (JDIMENSION out_width, JSAMPIMAGE input_buf, JDIMENSION input_row,
+    JSAMPARRAY output_buf, int num_rows);
+-EXTERN(void) jsimd_ycc_extxrgb_convert_neon
++HIDE(EXTERN)(void) jsimd_ycc_extxrgb_convert_neon
+   (JDIMENSION out_width, JSAMPIMAGE input_buf, JDIMENSION input_row,
+    JSAMPARRAY output_buf, int num_rows);
+-EXTERN(void) jsimd_ycc_rgb565_convert_neon
++HIDE(EXTERN)(void) jsimd_ycc_rgb565_convert_neon
+   (JDIMENSION out_width, JSAMPIMAGE input_buf, JDIMENSION input_row,
+    JSAMPARRAY output_buf, int num_rows);
+ 
+ #ifndef NEON_INTRINSICS
+ 
+-EXTERN(void) jsimd_ycc_extrgb_convert_neon_slowst3
++HIDE(EXTERN)(void) jsimd_ycc_extrgb_convert_neon_slowst3
+   (JDIMENSION out_width, JSAMPIMAGE input_buf, JDIMENSION input_row,
+    JSAMPARRAY output_buf, int num_rows);
+-EXTERN(void) jsimd_ycc_extbgr_convert_neon_slowst3
++HIDE(EXTERN)(void) jsimd_ycc_extbgr_convert_neon_slowst3
+   (JDIMENSION out_width, JSAMPIMAGE input_buf, JDIMENSION input_row,
+    JSAMPARRAY output_buf, int num_rows);
+ 
+@@ -547,7 +547,7 @@ EXTERN(void) jsimd_h2v1_downsample_avx2
+   (JDIMENSION image_width, int max_v_samp_factor, JDIMENSION v_samp_factor,
+    JDIMENSION width_in_blocks, JSAMPARRAY input_data, JSAMPARRAY output_data);
+ 
+-EXTERN(void) jsimd_h2v1_downsample_neon
++HIDE(EXTERN)(void) jsimd_h2v1_downsample_neon
+   (JDIMENSION image_width, int max_v_samp_factor, JDIMENSION v_samp_factor,
+    JDIMENSION width_in_blocks, JSAMPARRAY input_data, JSAMPARRAY output_data);
+ 
+@@ -572,7 +572,7 @@ EXTERN(void) jsimd_h2v2_downsample_avx2
+   (JDIMENSION image_width, int max_v_samp_factor, JDIMENSION v_samp_factor,
+    JDIMENSION width_in_blocks, JSAMPARRAY input_data, JSAMPARRAY output_data);
+ 
+-EXTERN(void) jsimd_h2v2_downsample_neon
++HIDE(EXTERN)(void) jsimd_h2v2_downsample_neon
+   (JDIMENSION image_width, int max_v_samp_factor, JDIMENSION v_samp_factor,
+    JDIMENSION width_in_blocks, JSAMPARRAY input_data, JSAMPARRAY output_data);
+ 
+@@ -617,10 +617,10 @@ EXTERN(void) jsimd_h2v2_upsample_avx2
+   (int max_v_samp_factor, JDIMENSION output_width, JSAMPARRAY input_data,
+    JSAMPARRAY *output_data_ptr);
+ 
+-EXTERN(void) jsimd_h2v1_upsample_neon
++HIDE(EXTERN)(void) jsimd_h2v1_upsample_neon
+   (int max_v_samp_factor, JDIMENSION output_width, JSAMPARRAY input_data,
+    JSAMPARRAY *output_data_ptr);
+-EXTERN(void) jsimd_h2v2_upsample_neon
++HIDE(EXTERN)(void) jsimd_h2v2_upsample_neon
+   (int max_v_samp_factor, JDIMENSION output_width, JSAMPARRAY input_data,
+    JSAMPARRAY *output_data_ptr);
+ 
+@@ -667,13 +667,13 @@ EXTERN(void) jsimd_h2v2_fancy_upsample_avx2
+   (int max_v_samp_factor, JDIMENSION downsampled_width, JSAMPARRAY input_data,
+    JSAMPARRAY *output_data_ptr);
+ 
+-EXTERN(void) jsimd_h2v1_fancy_upsample_neon
++HIDE(EXTERN)(void) jsimd_h2v1_fancy_upsample_neon
+   (int max_v_samp_factor, JDIMENSION downsampled_width, JSAMPARRAY input_data,
+    JSAMPARRAY *output_data_ptr);
+-EXTERN(void) jsimd_h2v2_fancy_upsample_neon
++HIDE(EXTERN)(void) jsimd_h2v2_fancy_upsample_neon
+   (int max_v_samp_factor, JDIMENSION downsampled_width, JSAMPARRAY input_data,
+    JSAMPARRAY *output_data_ptr);
+-EXTERN(void) jsimd_h1v2_fancy_upsample_neon
++HIDE(EXTERN)(void) jsimd_h1v2_fancy_upsample_neon
+   (int max_v_samp_factor, JDIMENSION downsampled_width, JSAMPARRAY input_data,
+    JSAMPARRAY *output_data_ptr);
+ 
+@@ -833,47 +833,47 @@ EXTERN(void) jsimd_h2v2_extxrgb_merged_upsample_avx2
+   (JDIMENSION output_width, JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
+    JSAMPARRAY output_buf);
+ 
+-EXTERN(void) jsimd_h2v1_merged_upsample_neon
++HIDE(EXTERN)(void) jsimd_h2v1_merged_upsample_neon
+   (JDIMENSION output_width, JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
+    JSAMPARRAY output_buf);
+-EXTERN(void) jsimd_h2v1_extrgb_merged_upsample_neon
++HIDE(EXTERN)(void) jsimd_h2v1_extrgb_merged_upsample_neon
+   (JDIMENSION output_width, JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
+    JSAMPARRAY output_buf);
+-EXTERN(void) jsimd_h2v1_extrgbx_merged_upsample_neon
++HIDE(EXTERN)(void) jsimd_h2v1_extrgbx_merged_upsample_neon
+   (JDIMENSION output_width, JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
+    JSAMPARRAY output_buf);
+-EXTERN(void) jsimd_h2v1_extbgr_merged_upsample_neon
++HIDE(EXTERN)(void) jsimd_h2v1_extbgr_merged_upsample_neon
+   (JDIMENSION output_width, JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
+    JSAMPARRAY output_buf);
+-EXTERN(void) jsimd_h2v1_extbgrx_merged_upsample_neon
++HIDE(EXTERN)(void) jsimd_h2v1_extbgrx_merged_upsample_neon
+   (JDIMENSION output_width, JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
+    JSAMPARRAY output_buf);
+-EXTERN(void) jsimd_h2v1_extxbgr_merged_upsample_neon
++HIDE(EXTERN)(void) jsimd_h2v1_extxbgr_merged_upsample_neon
+   (JDIMENSION output_width, JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
+    JSAMPARRAY output_buf);
+-EXTERN(void) jsimd_h2v1_extxrgb_merged_upsample_neon
++HIDE(EXTERN)(void) jsimd_h2v1_extxrgb_merged_upsample_neon
+   (JDIMENSION output_width, JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
+    JSAMPARRAY output_buf);
+ 
+-EXTERN(void) jsimd_h2v2_merged_upsample_neon
++HIDE(EXTERN)(void) jsimd_h2v2_merged_upsample_neon
+   (JDIMENSION output_width, JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
+    JSAMPARRAY output_buf);
+-EXTERN(void) jsimd_h2v2_extrgb_merged_upsample_neon
++HIDE(EXTERN)(void) jsimd_h2v2_extrgb_merged_upsample_neon
+   (JDIMENSION output_width, JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
+    JSAMPARRAY output_buf);
+-EXTERN(void) jsimd_h2v2_extrgbx_merged_upsample_neon
++HIDE(EXTERN)(void) jsimd_h2v2_extrgbx_merged_upsample_neon
+   (JDIMENSION output_width, JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
+    JSAMPARRAY output_buf);
+-EXTERN(void) jsimd_h2v2_extbgr_merged_upsample_neon
++HIDE(EXTERN)(void) jsimd_h2v2_extbgr_merged_upsample_neon
+   (JDIMENSION output_width, JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
+    JSAMPARRAY output_buf);
+-EXTERN(void) jsimd_h2v2_extbgrx_merged_upsample_neon
++HIDE(EXTERN)(void) jsimd_h2v2_extbgrx_merged_upsample_neon
+   (JDIMENSION output_width, JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
+    JSAMPARRAY output_buf);
+-EXTERN(void) jsimd_h2v2_extxbgr_merged_upsample_neon
++HIDE(EXTERN)(void) jsimd_h2v2_extxbgr_merged_upsample_neon
+   (JDIMENSION output_width, JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
+    JSAMPARRAY output_buf);
+-EXTERN(void) jsimd_h2v2_extxrgb_merged_upsample_neon
++HIDE(EXTERN)(void) jsimd_h2v2_extxrgb_merged_upsample_neon
+   (JDIMENSION output_width, JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
+    JSAMPARRAY output_buf);
+ 
+@@ -1019,7 +1019,7 @@ EXTERN(void) jsimd_convsamp_sse2
+ EXTERN(void) jsimd_convsamp_avx2
+   (JSAMPARRAY sample_data, JDIMENSION start_col, DCTELEM *workspace);
+ 
+-EXTERN(void) jsimd_convsamp_neon
++HIDE(EXTERN)(void) jsimd_convsamp_neon
+   (JSAMPARRAY sample_data, JDIMENSION start_col, DCTELEM *workspace);
+ 
+ EXTERN(void) jsimd_convsamp_dspr2
+@@ -1050,7 +1050,7 @@ EXTERN(void) jsimd_fdct_islow_sse2(DCTELEM *data);
+ extern const int jconst_fdct_islow_avx2[];
+ EXTERN(void) jsimd_fdct_islow_avx2(DCTELEM *data);
+ 
+-EXTERN(void) jsimd_fdct_islow_neon(DCTELEM *data);
++HIDE(EXTERN)(void) jsimd_fdct_islow_neon(DCTELEM *data);
+ 
+ EXTERN(void) jsimd_fdct_islow_dspr2(DCTELEM *data);
+ 
+@@ -1064,7 +1064,7 @@ EXTERN(void) jsimd_fdct_ifast_mmx(DCTELEM *data);
+ extern const int jconst_fdct_ifast_sse2[];
+ EXTERN(void) jsimd_fdct_ifast_sse2(DCTELEM *data);
+ 
+-EXTERN(void) jsimd_fdct_ifast_neon(DCTELEM *data);
++HIDE(EXTERN)(void) jsimd_fdct_ifast_neon(DCTELEM *data);
+ 
+ EXTERN(void) jsimd_fdct_ifast_dspr2(DCTELEM *data);
+ 
+@@ -1088,7 +1088,7 @@ EXTERN(void) jsimd_quantize_sse2
+ EXTERN(void) jsimd_quantize_avx2
+   (JCOEFPTR coef_block, DCTELEM *divisors, DCTELEM *workspace);
+ 
+-EXTERN(void) jsimd_quantize_neon
++HIDE(EXTERN)(void) jsimd_quantize_neon
+   (JCOEFPTR coef_block, DCTELEM *divisors, DCTELEM *workspace);
+ 
+ EXTERN(void) jsimd_quantize_dspr2
+@@ -1129,10 +1129,10 @@ EXTERN(void) jsimd_idct_4x4_sse2
+   (void *dct_table, JCOEFPTR coef_block, JSAMPARRAY output_buf,
+    JDIMENSION output_col);
+ 
+-EXTERN(void) jsimd_idct_2x2_neon
++HIDE(EXTERN)(void) jsimd_idct_2x2_neon
+   (void *dct_table, JCOEFPTR coef_block, JSAMPARRAY output_buf,
+    JDIMENSION output_col);
+-EXTERN(void) jsimd_idct_4x4_neon
++HIDE(EXTERN)(void) jsimd_idct_4x4_neon
+   (void *dct_table, JCOEFPTR coef_block, JSAMPARRAY output_buf,
+    JDIMENSION output_col);
+ 
+@@ -1165,7 +1165,7 @@ EXTERN(void) jsimd_idct_islow_avx2
+   (void *dct_table, JCOEFPTR coef_block, JSAMPARRAY output_buf,
+    JDIMENSION output_col);
+ 
+-EXTERN(void) jsimd_idct_islow_neon
++HIDE(EXTERN)(void) jsimd_idct_islow_neon
+   (void *dct_table, JCOEFPTR coef_block, JSAMPARRAY output_buf,
+    JDIMENSION output_col);
+ 
+@@ -1190,7 +1190,7 @@ EXTERN(void) jsimd_idct_ifast_sse2
+   (void *dct_table, JCOEFPTR coef_block, JSAMPARRAY output_buf,
+    JDIMENSION output_col);
+ 
+-EXTERN(void) jsimd_idct_ifast_neon
++HIDE(EXTERN)(void) jsimd_idct_ifast_neon
+   (void *dct_table, JCOEFPTR coef_block, JSAMPARRAY output_buf,
+    JDIMENSION output_col);
+ 
+@@ -1230,13 +1230,13 @@ EXTERN(JOCTET *) jsimd_huff_encode_one_block_sse2
+   (void *state, JOCTET *buffer, JCOEFPTR block, int last_dc_val,
+    c_derived_tbl *dctbl, c_derived_tbl *actbl);
+ 
+-EXTERN(JOCTET *) jsimd_huff_encode_one_block_neon
++HIDE(EXTERN)(JOCTET *) jsimd_huff_encode_one_block_neon
+   (void *state, JOCTET *buffer, JCOEFPTR block, int last_dc_val,
+    c_derived_tbl *dctbl, c_derived_tbl *actbl);
+ 
+ #ifndef NEON_INTRINSICS
+ 
+-EXTERN(JOCTET *) jsimd_huff_encode_one_block_neon_slowtbl
++HIDE(EXTERN)(JOCTET *) jsimd_huff_encode_one_block_neon_slowtbl
+   (void *state, JOCTET *buffer, JCOEFPTR block, int last_dc_val,
+    c_derived_tbl *dctbl, c_derived_tbl *actbl);
+ 
+@@ -1247,7 +1247,7 @@ EXTERN(void) jsimd_encode_mcu_AC_first_prepare_sse2
+   (const JCOEF *block, const int *jpeg_natural_order_start, int Sl, int Al,
+    UJCOEF *values, size_t *zerobits);
+ 
+-EXTERN(void) jsimd_encode_mcu_AC_first_prepare_neon
++HIDE(EXTERN)(void) jsimd_encode_mcu_AC_first_prepare_neon
+   (const JCOEF *block, const int *jpeg_natural_order_start, int Sl, int Al,
+    UJCOEF *values, size_t *zerobits);
+ 
+@@ -1255,6 +1255,6 @@ EXTERN(int) jsimd_encode_mcu_AC_refine_prepare_sse2
+   (const JCOEF *block, const int *jpeg_natural_order_start, int Sl, int Al,
+    UJCOEF *absvalues, size_t *bits);
+ 
+-EXTERN(int) jsimd_encode_mcu_AC_refine_prepare_neon
++HIDE(EXTERN)(int) jsimd_encode_mcu_AC_refine_prepare_neon
+   (const JCOEF *block, const int *jpeg_natural_order_start, int Sl, int Al,
+    UJCOEF *absvalues, size_t *bits);