Index: trunk/Ohana/src/opihi/dvo/imdata.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/imdata.c	(revision 3462)
+++ trunk/Ohana/src/opihi/dvo/imdata.c	(revision 4585)
@@ -135,8 +135,5 @@
 	vec[0].elements[N] = catalog.average[n].R - catalog.measure[i].dR / 360000.0;
 	N++;
-	if (N == NPTS - 1) {
-	  NPTS += 1000;
-	  REALLOCATE (vec[0].elements, float, NPTS);
-	}
+	CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
       }
       break;
@@ -147,8 +144,5 @@
 	vec[0].elements[N] = catalog.average[n].D - catalog.measure[i].dD / 360000.0;
 	N++;
-	if (N == NPTS - 1) {
-	  NPTS += 1000;
-	  REALLOCATE (vec[0].elements, float, NPTS);
-	}
+	CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
       }
       break;
@@ -158,8 +152,5 @@
 	vec[0].elements[N] = catalog.measure[i].M / 1000.0;
 	N++;
-	if (N == NPTS - 1) {
-	  NPTS += 1000;
-	  REALLOCATE (vec[0].elements, float, NPTS);
-	}
+	CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
       }
       break;
@@ -169,8 +160,5 @@
 	vec[0].elements[N] = catalog.measure[i].dM / 1000.0;
 	N++;
-	if (N == NPTS - 1) {
-	  NPTS += 1000;
-	  REALLOCATE (vec[0].elements, float, NPTS);
-	}
+	CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
       }
       break;
@@ -180,8 +168,5 @@
 	vec[0].elements[N] = catalog.measure[i].Mcal / 1000.0;
 	N++;
-	if (N == NPTS - 1) {
-	  NPTS += 1000;
-	  REALLOCATE (vec[0].elements, float, NPTS);
-	}
+	CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
       }
       break;
@@ -192,8 +177,4 @@
 	vec[0].elements[N] = catalog.average[n].M / 1000.0;
 	N++;
-	if (N == NPTS - 1) {
-	  NPTS += 1000;
-	  REALLOCATE (vec[0].elements, float, NPTS);
-	}
       }
       break;
@@ -203,8 +184,5 @@
 	vec[0].elements[N] = catalog.measure[i].source;
 	N++;
-	if (N == NPTS - 1) {
-	  NPTS += 1000;
-	  REALLOCATE (vec[0].elements, float, NPTS);
-	}
+	CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
       }
       break;
@@ -214,8 +192,5 @@
 	vec[0].elements[N] = TimeValue (catalog.measure[i].t, TimeReference, TimeFormat);
 	N++;
-	if (N == NPTS - 1) {
-	  NPTS += 1000;
-	  REALLOCATE (vec[0].elements, float, NPTS);
-	}
+	CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
       }
       break;