Mercurial > hg > xemacs-beta

diff src/imgproc.c @ 3025:facf3239ba30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2005-10-25 11:16:19 by ben] rename new->new_, convert 'foo to `foo' EmacsFrame.c, ExternalClient.c, ExternalShell.c, chartab.c, cmdloop.c, compiler.h, console.c, database.c, device-msw.c, device-x.c, device.c, doc.c, dragdrop.c, eval.c, event-msw.c, event-stream.c, events.c, extents.c, file-coding.c, fns.c, frame-tty.c, frame.c, gpmevent.c, gutter.c, hash.c, imgproc.c, indent.c, keymap.c, lisp-union.h, macros.c, malloc.c, marker.c, menubar-x.c, menubar.c, mule-charset.c, number.c, process.c, profile.h, ralloc.c, redisplay.c, select-common.h, select.c, syntax.c, sysfile.h, sysproc.h, systime.h, syswindows.h, toolbar.c, tooltalk.c, tparam.c, unexaix.c, unexalpha.c, unexconvex.c, unexec.c, unexhp9k800.c, unexmips.c, unicode.c, window.c: new -> new_. 'foo -> `foo'. lwlib-internal.h: redo assert macros to follow lisp.h and not trigger warnings. lwlib.c, xlwtabs.c: new -> new_.
author ben
date Tue, 25 Oct 2005 11:16:49 +0000
parents ecf1ebac70d8
children 16112448d484
line wrap: on
line diff
--- a/src/imgproc.c	Tue Oct 25 08:32:50 2005 +0000
+++ b/src/imgproc.c	Tue Oct 25 11:16:49 2005 +0000
@@ -202,7 +202,7 @@
 {
   int		hist2[B_LEN];
   int		first = 0, last = 0;
-  register Colorbox	*new;
+  register Colorbox	*new_;
   register int	*iptr, *histp;
   register int	i, j;
   register int	ir,ig,ib;
@@ -286,45 +286,45 @@
     i++;
 
   /* Create new box, re-allocate points */
-  new = qt->freeboxes;
-  qt->freeboxes = new->next;
+  new_ = qt->freeboxes;
+  qt->freeboxes = new_->next;
   if (qt->freeboxes)
     qt->freeboxes->prev = NULL;
   if (qt->usedboxes)
-    qt->usedboxes->prev = new;
-  new->next = qt->usedboxes;
-  qt->usedboxes = new;
+    qt->usedboxes->prev = new_;
+  new_->next = qt->usedboxes;
+  qt->usedboxes = new_;
 
   histp = &hist2[first];
   for (sum1 = 0, j = first; j < i; j++)
     sum1 += *histp++;
   for (sum2 = 0, j = i; j <= last; j++)
     sum2 += *histp++;
-  new->total = sum1;
+  new_->total = sum1;
   ptr->total = sum2;
 
-  new->rmin = ptr->rmin;
-  new->rmax = ptr->rmax;
-  new->gmin = ptr->gmin;
-  new->gmax = ptr->gmax;
-  new->bmin = ptr->bmin;
-  new->bmax = ptr->bmax;
+  new_->rmin = ptr->rmin;
+  new_->rmax = ptr->rmax;
+  new_->gmin = ptr->gmin;
+  new_->gmax = ptr->gmax;
+  new_->bmin = ptr->bmin;
+  new_->bmax = ptr->bmax;
   switch (axis)
     {
     case RED:
-      new->rmax = i-1;
+      new_->rmax = i-1;
       ptr->rmin = i;
       break;
     case GREEN:
-      new->gmax = i-1;
+      new_->gmax = i-1;
       ptr->gmin = i;
       break;
     case BLUE:
-      new->bmax = i-1;
+      new_->bmax = i-1;
       ptr->bmin = i;
       break;
     }
-  shrinkbox (qt, new);
+  shrinkbox (qt, new_);
   shrinkbox (qt, ptr);
 }