From 8cd9d88d40f3705622226f2452e191f5b3ee50d1 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sat, 6 Nov 2010 18:08:27 +0000
Subject: [PATCH] tiny rewrite, avoid type conversion warnings

---
 ChangeLog                      |  4 ++++
 src/frontend/plotting/plotit.c | 13 +++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 81d15ba13..880d07684 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-06  Robert Larice
+ * src/frontend/plotting/plotit.c :
+    tiny rewrite, avoid type conversion warnings
+
 2010-11-06  Dietmar Warning
  * analysis/dctran.c: use ceil function for correct round up
 
diff --git a/src/frontend/plotting/plotit.c b/src/frontend/plotting/plotit.c
index 81f381ef9..3016891eb 100644
--- a/src/frontend/plotting/plotit.c
+++ b/src/frontend/plotting/plotit.c
@@ -135,24 +135,21 @@ static void
 compress(struct dvec *d, double *xcomp, double *xind)
 {
     int cfac, ihi, ilo, newlen, i;
-    int sz = isreal(d) ? sizeof(double) : sizeof(ngcomplex_t);
-    double *dd;
-    ngcomplex_t *cc;
 
     if (xind) {
         ilo = (int) xind[0];
         ihi = (int) xind[1];
-        if ((ilo <= ihi) && (ilo > 0) && (ilo < d->v_length) &&
+        if ((ihi >= ilo) && (ilo > 0) && (ilo < d->v_length) &&
                 (ihi > 1) && (ihi <= d->v_length)) {
             newlen = ihi - ilo;
-            dd = (double *) tmalloc(newlen * sz);
-            cc = (ngcomplex_t *) dd;
             if (isreal(d)) {
-                bcopy(d->v_realdata + ilo, dd, newlen * sz);
+                double *dd = TMALLOC(double, newlen);
+                bcopy(d->v_realdata + ilo, dd, (size_t) newlen * sizeof(double));
                 tfree(d->v_realdata);
                 d->v_realdata = dd;
             } else {
-                bcopy(d->v_compdata + ilo, cc, newlen * sz);
+                ngcomplex_t *cc = TMALLOC(ngcomplex_t, newlen);
+                bcopy(d->v_compdata + ilo, cc, (size_t) newlen * sizeof(ngcomplex_t));
                 tfree(d->v_compdata);
                 d->v_compdata = cc;
             }