From: Siarhei Siamashka <siarhei.siamas...@nokia.com> --- pixman/pixman-arm-common.h | 12 ++++++------ pixman/pixman-fast-path.c | 12 ++++++------ pixman/pixman-fast-path.h | 14 +++++++------- 3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/pixman/pixman-arm-common.h b/pixman/pixman-arm-common.h
index 372e9f9..525a2c4 100644
--- a/pixman/pixman-arm-common.h
+++ b/pixman/pixman-arm-common.h
@@ -282,15 +282,15 @@ cputype##_composite_##name (pixman_implementation_t *imp,
\
src_type, dst_type) \
void \
pixman_scaled_nearest_scanline_##name##_##op##_asm_##cputype ( \
- int32_t w, \
- dst_type * dst, \
- src_type * src, \
- pixman_fixed_t vx, \
- pixman_fixed_t unit_x);\
+ int32_t w, \
+ dst_type * dst, \
+ const src_type * src, \
+ pixman_fixed_t vx, \
+ pixman_fixed_t unit_x); \
\
static force_inline void \
scaled_nearest_scanline_##cputype##_##name##_##op (dst_type * pd, \
- src_type * ps, \
+ const src_type * ps, \
int32_t w, \
pixman_fixed_t vx, \
pixman_fixed_t unit_x, \
diff --git a/pixman/pixman-fast-path.c b/pixman/pixman-fast-path.c
index eb09715..c4299e0 100644
--- a/pixman/pixman-fast-path.c
+++ b/pixman/pixman-fast-path.c
@@ -1410,12 +1410,12 @@ FAST_NEAREST (8888_565_normal, 8888, 0565, uint32_t,
uint16_t, OVER, NORMAL)
/* Use more unrolling for src_0565_0565 because it is typically CPU bound */
static force_inline void
-scaled_nearest_scanline_565_565_SRC (uint16_t * dst,
- uint16_t * src,
- int32_t w,
- pixman_fixed_t vx,
- pixman_fixed_t unit_x,
- pixman_fixed_t max_vx)
+scaled_nearest_scanline_565_565_SRC (uint16_t * dst,
+ const uint16_t * src,
+ int32_t w,
+ pixman_fixed_t vx,
+ pixman_fixed_t unit_x,
+ pixman_fixed_t max_vx)
{
uint16_t tmp1, tmp2, tmp3, tmp4;
while ((w -= 4) >= 0)
diff --git a/pixman/pixman-fast-path.h b/pixman/pixman-fast-path.h
index 069a282..591ab48 100644
--- a/pixman/pixman-fast-path.h
+++ b/pixman/pixman-fast-path.h
@@ -138,12 +138,12 @@ pad_repeat_get_scanline_bounds (int32_t
source_image_width,
#define FAST_NEAREST_SCANLINE(scanline_func_name, SRC_FORMAT, DST_FORMAT,
\
src_type_t, dst_type_t, OP, repeat_mode)
\
static force_inline void
\
-scanline_func_name (dst_type_t *dst,
\
- src_type_t *src,
\
- int32_t w,
\
- pixman_fixed_t vx,
\
- pixman_fixed_t unit_x,
\
- pixman_fixed_t max_vx)
\
+scanline_func_name (dst_type_t *dst,
\
+ const src_type_t *src,
\
+ int32_t w,
\
+ pixman_fixed_t vx,
\
+ pixman_fixed_t unit_x,
\
+ pixman_fixed_t max_vx)
\
{
\
uint32_t d;
\
src_type_t s1, s2;
\
@@ -346,7 +346,7 @@ fast_composite_scaled_nearest ## scale_func_name
(pixman_implementation_t *imp,
}
\
else if (PIXMAN_REPEAT_ ## repeat_mode == PIXMAN_REPEAT_NONE)
\
{
\
- static src_type_t zero[1] = { 0 };
\
+ static const src_type_t zero[1] = { 0 };
\
if (y < 0 || y >= src_image->bits.height)
\
{
\
scanline_func (dst, zero, left_pad + width + right_pad, 0, 0,
0); \
--
1.7.3.4
_______________________________________________
Pixman mailing list
Pixman@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/pixman
