callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a few C99isms

Browse Source 
Reported in bug 606761.
This commit is contained in:
Matthias Clasen
2010-01-17 22:47:14 -05:00
parent 81359376d7
commit 3fdcf3d3e2
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gdk-pixbuf/pixops/pixops.c
View File

@ -1250,13 +1250,19 @@ pixops_process (guchar *dest_buf,
{ {
int i, j; int i, j;
int x, y; /* X and Y position in source (fixed_point) */ int x, y; /* X and Y position in source (fixed_point) */
guchar **line_bufs; guchar **line_bufs;
int *filter_weights; int *filter_weights;
int x_step; int x_step;
int y_step; int y_step;
int check_shift;
int scaled_x_offset;
int run_end_x;
int run_end_index;
x_step = (1 << SCALE_SHIFT) / scale_x; /* X step in source (fixed point) */ x_step = (1 << SCALE_SHIFT) / scale_x; /* X step in source (fixed point) */
y_step = (1 << SCALE_SHIFT) / scale_y; /* Y step in source (fixed point) */ y_step = (1 << SCALE_SHIFT) / scale_y; /* Y step in source (fixed point) */
@ -1266,9 +1272,9 @@ pixops_process (guchar *dest_buf,
line_bufs = g_new (guchar *, filter->y.n); line_bufs = g_new (guchar *, filter->y.n);
filter_weights = make_filter_table (filter); filter_weights = make_filter_table (filter);
int check_shift = check_size ? get_check_shift (check_size) : 0; check_shift = check_size ? get_check_shift (check_size) : 0;
int scaled_x_offset = floor (filter->x.offset * (1 << SCALE_SHIFT)); scaled_x_offset = floor (filter->x.offset * (1 << SCALE_SHIFT));
/* Compute the index where we run off the end of the source buffer. The /* Compute the index where we run off the end of the source buffer. The
* furthest source pixel we access at index i is: * furthest source pixel we access at index i is:
@ -1282,9 +1288,9 @@ pixops_process (guchar *dest_buf,
* *
*/ */
#define MYDIV(a,b) ((a) > 0 ? (a) / (b) : ((a) - (b) + 1) / (b)) /* Division so that -1/5 = -1 */ #define MYDIV(a,b) ((a) > 0 ? (a) / (b) : ((a) - (b) + 1) / (b)) /* Division so that -1/5 = -1 */
int run_end_x = (((src_width - filter->x.n + 1) << SCALE_SHIFT) - scaled_x_offset); run_end_x = (((src_width - filter->x.n + 1) << SCALE_SHIFT) - scaled_x_offset);
int run_end_index = MYDIV (run_end_x + x_step - 1, x_step) - render_x0; run_end_index = MYDIV (run_end_x + x_step - 1, x_step) - render_x0;
run_end_index = MIN (run_end_index, render_x1 - render_x0); run_end_index = MIN (run_end_index, render_x1 - render_x0);
y = render_y0 * y_step + floor (filter->y.offset * (1 << SCALE_SHIFT)); y = render_y0 * y_step + floor (filter->y.offset * (1 << SCALE_SHIFT));
@ -1298,7 +1304,7 @@ pixops_process (guchar *dest_buf,
filter->x.n * filter->y.n * SUBSAMPLE; filter->x.n * filter->y.n * SUBSAMPLE;
guchar *new_outbuf; guchar *new_outbuf;
guint32 tcolor1, tcolor2; guint32 tcolor1, tcolor2;
guchar *outbuf = dest_buf + dest_rowstride * i; guchar *outbuf = dest_buf + dest_rowstride * i;
guchar *outbuf_end = outbuf + dest_channels * (render_x1 - render_x0); guchar *outbuf_end = outbuf + dest_channels * (render_x1 - render_x0);
@ -1336,7 +1342,7 @@ pixops_process (guchar *dest_buf,
line_bufs, src_channels, src_has_alpha, line_bufs, src_channels, src_has_alpha,
x >> SCALE_SHIFT, src_width, x >> SCALE_SHIFT, src_width,
check_size, tcolor1, tcolor2, pixel_func); check_size, tcolor1, tcolor2, pixel_func);
x += x_step; x += x_step;
x_start = x >> SCALE_SHIFT; x_start = x >> SCALE_SHIFT;
dest_x++; dest_x++;
@ -1363,7 +1369,7 @@ pixops_process (guchar *dest_buf,
line_bufs, src_channels, src_has_alpha, line_bufs, src_channels, src_has_alpha,
x >> SCALE_SHIFT, src_width, x >> SCALE_SHIFT, src_width,
check_size, tcolor1, tcolor2, pixel_func); check_size, tcolor1, tcolor2, pixel_func);
x += x_step; x += x_step;
dest_x++; dest_x++;
outbuf += dest_channels; outbuf += dest_channels;