arm: Rename all functions to the pattern png_*_neon; add debug traces
diff --git a/arm/palette_neon_intrinsics.c b/arm/palette_neon_intrinsics.c
index 465ed36..b4d1fd2 100644
--- a/arm/palette_neon_intrinsics.c
+++ b/arm/palette_neon_intrinsics.c
@@ -22,7 +22,7 @@
/* Build an RGBA8 palette from the separate RGB and alpha palettes. */
void
-png_riffle_palette_rgba8(png_structrp png_ptr)
+png_riffle_palette_neon(png_structrp png_ptr)
{
png_const_colorp palette = png_ptr->palette;
png_bytep riffled_palette = png_ptr->riffled_palette;
@@ -30,6 +30,8 @@
int num_trans = png_ptr->num_trans;
int i;
+ png_debug(1, "in png_riffle_palette_neon");
+
/* Initially black, opaque. */
uint8x16x4_t w = {{
vdupq_n_u8(0x00),
@@ -57,7 +59,7 @@
/* Expands a palettized row into RGBA8. */
int
-png_do_expand_palette_neon_rgba8(png_structrp png_ptr, png_row_infop row_info,
+png_do_expand_palette_rgba8_neon(png_structrp png_ptr, png_row_infop row_info,
png_const_bytep row, png_bytepp ssp, png_bytepp ddp)
{
png_uint_32 row_width = row_info->width;
@@ -66,6 +68,8 @@
const png_int_32 pixels_per_chunk = 4;
int i;
+ png_debug(1, "in png_do_expand_palette_rgba8_neon");
+
if (row_width < pixels_per_chunk)
return 0;
@@ -99,7 +103,7 @@
/* Expands a palettized row into RGB8. */
int
-png_do_expand_palette_neon_rgb8(png_structrp png_ptr, png_row_infop row_info,
+png_do_expand_palette_rgb8_neon(png_structrp png_ptr, png_row_infop row_info,
png_const_bytep row, png_bytepp ssp, png_bytepp ddp)
{
png_uint_32 row_width = row_info->width;
@@ -107,6 +111,8 @@
const png_uint_32 pixels_per_chunk = 8;
int i;
+ png_debug(1, "in png_do_expand_palette_rgb8_neon");
+
if (row_width <= pixels_per_chunk)
return 0;
diff --git a/pngpriv.h b/pngpriv.h
index 24d245d..583c26f 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -2119,11 +2119,11 @@
#if PNG_ARM_NEON_IMPLEMENTATION == 1
PNG_INTERNAL_FUNCTION(void,
- png_riffle_palette_rgba8,
+ png_riffle_palette_neon,
(png_structrp),
PNG_EMPTY);
PNG_INTERNAL_FUNCTION(int,
- png_do_expand_palette_neon_rgba8,
+ png_do_expand_palette_rgba8_neon,
(png_structrp,
png_row_infop,
png_const_bytep,
@@ -2131,7 +2131,7 @@
const png_bytepp),
PNG_EMPTY);
PNG_INTERNAL_FUNCTION(int,
- png_do_expand_palette_neon_rgb8,
+ png_do_expand_palette_rgb8_neon,
(png_structrp,
png_row_infop,
png_const_bytep,
diff --git a/pngrtran.c b/pngrtran.c
index 3294340..d2bb82e 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -1169,7 +1169,7 @@
if ((png_ptr->num_trans > 0) && (png_ptr->bit_depth == 8))
{
png_ptr->riffled_palette = (png_bytep)png_malloc(png_ptr, 256 * 4);
- png_riffle_palette_rgba8(png_ptr);
+ png_riffle_palette_neon(png_ptr);
}
}
#endif /* PNG_ARM_NEON_INTRINSICS_AVAILABLE */
@@ -4334,7 +4334,7 @@
* but sometimes row_info->bit_depth has been changed to 8.
* In these cases, the palette hasn't been riffled.
*/
- i = png_do_expand_palette_neon_rgba8(png_ptr, row_info, row,
+ i = png_do_expand_palette_rgba8_neon(png_ptr, row_info, row,
&sp, &dp);
}
#else
@@ -4365,7 +4365,7 @@
dp = row + (size_t)(row_width * 3) - 1;
i = 0;
#ifdef PNG_ARM_NEON_INTRINSICS_AVAILABLE
- i = png_do_expand_palette_neon_rgb8(png_ptr, row_info, row,
+ i = png_do_expand_palette_rgb8_neon(png_ptr, row_info, row,
&sp, &dp);
#else
PNG_UNUSED(png_ptr)
