[wmaker-dev added to Cc:] Thanks Nicolas, I pushed it to 'next' now.
On Fri 26.Feb'10 at 12:32:45 +0100, Nicolas Bonifas wrote: > Hello, > > Some code in wrlib/scale.c can be safely removed (this code is only > compiled if "broken_code" is #DEFINEd, but this symbol appears nowhere else). > > Nicolas > From 68d9f3ee4b90ea97d9ee74afbc690e54bb2b0394 Mon Sep 17 00:00:00 2001 > From: Nicolas Bonifas <[email protected]> > Date: Fri, 26 Feb 2010 12:22:56 +0100 > Subject: [PATCH] Removed unused version of RScaleImage() in wrlib/scale.c > (the "broken_code" preprocessor symbol appears nowhere else) > > --- > wrlib/scale.c | 98 > --------------------------------------------------------- > 1 files changed, 0 insertions(+), 98 deletions(-) > > diff --git a/wrlib/scale.c b/wrlib/scale.c > index b0c5a92..7e49074 100644 > --- a/wrlib/scale.c > +++ b/wrlib/scale.c > @@ -45,7 +45,6 @@ > * > *---------------------------------------------------------------------- > */ > -#ifndef broken_code > RImage *RScaleImage(RImage * image, unsigned new_width, unsigned new_height) > { > int ox; > @@ -125,103 +124,6 @@ RImage *RScaleImage(RImage * image, unsigned new_width, > unsigned new_height) > return img; > } > > -#else > -RImage *RScaleImage(RImage * src, unsigned new_width, unsigned new_height) > -{ > - int ddy, ee; > - int h2; > - int yd; > - int xd, xs; > - RImage *dst; > - int e, xd2; > - unsigned char *sr, *sg, *sb, *sa; > - unsigned char *dr, *dg, *db, *da; > - int ys = 0; > - > - dst = RCreateImage(new_width, new_height, src->data[3] != NULL); > - > - ddy = src->height / 2; > - ee = (ddy / 2) - dst->height; > - h2 = new_height / 2; > - > - xd = dst->width; > - xs = src->width / 2; > - e = (src->width / 2) - xd; > - xd2 = xd / 2; > - > - sr = src->data[0]; > - sg = src->data[1]; > - sb = src->data[2]; > - sa = src->data[3]; > - > - dr = dst->data[0]; > - dg = dst->data[1]; > - db = dst->data[2]; > - da = dst->data[3]; > - > - if (sa == NULL) { > - for (yd = 0; yd < new_height; yd++) { > - int x; > - > - sr = src->data[0] + ys * src->width; > - sg = src->data[1] + ys * src->width; > - sb = src->data[2] + ys * src->width; > - > - for (x = 0; x < xd; x++) { > - *(dr++) = *sr; > - *(dg++) = *sg; > - *(db++) = *sb; > - > - while (e >= 0) { > - sr++; > - sg++; > - sb++; > - e -= xd2; > - } > - e += xs; > - } > - while (ee >= 0) { > - ys++; > - ee -= h2; > - } > - ee += ddy; > - } > - } else { > - for (yd = 0; yd < new_height; yd++) { > - int x; > - > - sr = src->data[0] + ys * src->width; > - sg = src->data[1] + ys * src->width; > - sb = src->data[2] + ys * src->width; > - sa = src->data[3] + ys * src->width; > - > - for (x = 0; x < xd; x++) { > - *(dr++) = *sr; > - *(dg++) = *sg; > - *(db++) = *sb; > - *(da++) = *sa; > - > - while (e >= 0) { > - sr++; > - sg++; > - sb++; > - sa++; > - e -= xd2; > - } > - e += xs; > - } > - while (ee >= 0) { > - ys++; > - ee -= h2; > - } > - ee += ddy; > - } > - } > - > - return dst; > -} > -#endif > - > /* > * Filtered Image Rescaling code copy/pasted from > * Graphics Gems III > -- > 1.6.6.1 > -- To unsubscribe, send mail to [email protected].
