summaryrefslogtreecommitdiff
path: root/gdk-pixbuf/pixops/pixops.c
diff options
context:
space:
mode:
Diffstat (limited to 'gdk-pixbuf/pixops/pixops.c')
-rw-r--r--gdk-pixbuf/pixops/pixops.c21
1 files changed, 14 insertions, 7 deletions
diff --git a/gdk-pixbuf/pixops/pixops.c b/gdk-pixbuf/pixops/pixops.c
index b235a4ac5..081191cd5 100644
--- a/gdk-pixbuf/pixops/pixops.c
+++ b/gdk-pixbuf/pixops/pixops.c
@@ -107,10 +107,12 @@ pixops_scale_nearest (guchar *dest_buf,
for (i = 0; i < (render_y1 - render_y0); i++)
{
+ const guchar *src;
+ guchar *dest;
y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT;
y_pos = CLAMP (y_pos, 0, src_height - 1);
- const guchar *src = src_buf + y_pos * src_rowstride;
- guchar *dest = dest_buf + i * dest_rowstride;
+ src = src_buf + y_pos * src_rowstride;
+ dest = dest_buf + i * dest_rowstride;
x = render_x0 * x_step + x_step / 2;
@@ -133,7 +135,8 @@ pixops_scale_nearest (guchar *dest_buf,
}
else
{
- INNER_LOOP(4, 4, guint32 *p32=(guint32*)dest;*p32=*((guint32*)p));
+ gint32 *p32;
+ INNER_LOOP(4, 4, p32=(guint32*)dest;*p32=*((guint32*)p));
}
}
}
@@ -169,10 +172,12 @@ pixops_composite_nearest (guchar *dest_buf,
for (i = 0; i < (render_y1 - render_y0); i++)
{
+ const guchar *src;
+ guchar *dest;
y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT;
y_pos = CLAMP (y_pos, 0, src_height - 1);
- const guchar *src = src_buf + y_pos * src_rowstride;
- guchar *dest = dest_buf + i * dest_rowstride;
+ src = src_buf + y_pos * src_rowstride;
+ dest = dest_buf + i * dest_rowstride;
x = render_x0 * x_step + x_step / 2;
@@ -259,10 +264,12 @@ pixops_composite_color_nearest (guchar *dest_buf,
for (i = 0; i < (render_y1 - render_y0); i++)
{
+ const guchar *src;
+ guchar *dest;
y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT;
y_pos = CLAMP (y_pos, 0, src_height - 1);
- const guchar *src = src_buf + y_pos * src_rowstride;
- guchar *dest = dest_buf + i * dest_rowstride;
+ src = src_buf + y_pos * src_rowstride;
+ dest = dest_buf + i * dest_rowstride;
x = render_x0 * x_step + x_step / 2;