Index: trunk/psphot/src/psPolynomials.c
===================================================================
--- trunk/psphot/src/psPolynomials.c	(revision 5084)
+++ trunk/psphot/src/psPolynomials.c	(revision 5134)
@@ -12,5 +12,5 @@
 void Polynomial1DDump_EAM (psPolynomial1D *poly) {
 
-    for (int i = 0; i < poly->n + 1; i++) {
+    for (int i = 0; i < poly->COOL_1D_n + 1; i++) {
 	fprintf (stderr, "x^%d : %g +/- %g\n", i, poly->coeff[i], poly->coeffErr[i]);
     }
@@ -39,5 +39,5 @@
     newPoly = (psPolynomial1D* ) psAlloc(sizeof(psPolynomial1D));
     newPoly->type = type;
-    newPoly->n = nOrder;
+    newPoly->COOL_1D_n = nOrder;
     newPoly->coeff = (psF64 *)psAlloc(nTerm * sizeof(psF64));
     newPoly->coeffErr = (psF64 *)psAlloc(nTerm * sizeof(psF64));
@@ -58,5 +58,5 @@
     psF64 xSum = 1.0;
 
-    for (loop_x = 0; loop_x < myPoly->n + 1; loop_x++) {
+    for (loop_x = 0; loop_x < myPoly->COOL_1D_n + 1; loop_x++) {
         if (myPoly->mask[loop_x] == 0) {
             polySum += xSum * myPoly->coeff[loop_x];
@@ -141,5 +141,5 @@
 # endif
       
-    nTerm = myPoly->n + 1;
+    nTerm = myPoly->COOL_1D_n + 1;
     A     = psImageAlloc(nTerm, nTerm, PS_TYPE_F64);
     B     = psVectorAlloc(nTerm, PS_TYPE_F64);
@@ -223,5 +223,5 @@
 
     if (poly == NULL) return;
-    for (int i = 0; i < poly->nX + 1; i++) {
+    for (int i = 0; i < poly->COOL_2D_nX + 1; i++) {
 	psFree (poly->coeff[i]);
 	psFree (poly->coeffErr[i]);
@@ -251,10 +251,10 @@
     newPoly = (psPolynomial2D* ) psAlloc(sizeof(psPolynomial2D));
     newPoly->type = type;
-    newPoly->nX = nXorder;
-    newPoly->nY = nYorder;
+    newPoly->COOL_2D_nX = nXorder;
+    newPoly->COOL_2D_nY = nYorder;
 
     newPoly->coeff = (psF64 **)psAlloc(nXterm * sizeof(psF64 *));
     newPoly->coeffErr = (psF64 **)psAlloc(nXterm * sizeof(psF64 *));
-    newPoly->mask = (char **)psAlloc(nXterm * sizeof(char *));
+    newPoly->mask = (psMaskType **)psAlloc(nXterm * sizeof(psMaskType *));
     // XXX EAM : this is an error in the definition of the polynomial mask 
     //           (should be psU8 not char)
@@ -278,6 +278,6 @@
 void Polynomial2DDump_EAM (psPolynomial2D *poly) {
 
-    for (int i = 0; i < poly->nX + 1; i++) {
-	for (int j = 0; j < poly->nY + 1; j++) {
+    for (int i = 0; i < poly->COOL_2D_nX + 1; i++) {
+	for (int j = 0; j < poly->COOL_2D_nY + 1; j++) {
 	    fprintf (stderr, "x^%d y^%d : %g +/- %g\n", i, j, poly->coeff[i][j], poly->coeffErr[i][j]);
 	}
@@ -298,8 +298,8 @@
 
     // XXX EAM : nX is order, not nTerms
-    for (loop_x = 0; loop_x < myPoly->nX + 1; loop_x++) {
+    for (loop_x = 0; loop_x < myPoly->COOL_2D_nX + 1; loop_x++) {
         ySum = xSum;
 	// XXX EAM : nX is order, not nTerms
-        for (loop_y = 0; loop_y < myPoly->nY + 1; loop_y++) {
+        for (loop_y = 0; loop_y < myPoly->COOL_2D_nY + 1; loop_y++) {
             if (myPoly->mask[loop_x][loop_y] == 0) {
                 polySum += ySum * myPoly->coeff[loop_x][loop_y];
@@ -425,6 +425,6 @@
     psS32 nTerm, nXterm, nYterm;
 
-    nXterm = myPoly->nX + 1;
-    nYterm = myPoly->nY + 1;
+    nXterm = myPoly->COOL_2D_nX + 1;
+    nYterm = myPoly->COOL_2D_nY + 1;
     nTerm = nXterm * nYterm;