Changeset 6251 for trunk/psLib/src/astro/psCoord.c

Timestamp:

Jan 30, 2006, 10:28:34 AM (20 years ago)

Author:

drobbin

Message:

Added type support in Metadata for s8,s16,u8-32. Edited PixelsTransform and test. Added types to DataType.

File:

• trunk/psLib/src/astro/psCoord.c (modified) (3 diffs)

trunk/psLib/src/astro/psCoord.c

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.102 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-01-28 01:31:44 $
+*  @version $Revision: 1.103 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-01-30 20:28:33 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1085 +1085 @@
     PS_ASSERT_PTR_NON_NULL(input, NULL);
     PS_ASSERT_PTR_NON_NULL(inToOut, NULL);
-    PS_ASSERT_PTR_NON_NULL(inToOut->x, NULL);
-    PS_ASSERT_PTR_NON_NULL(inToOut->y, NULL);
     if (out == NULL) {
         //XXX: Should the length (nalloc) be 1 and append be used everytime a pixel is added?
@@ -1104 +1102 @@
         deriv = psPlaneTransformDeriv(deriv, inToOut, coord);
         fxnVal = psPlaneTransformApply(fxnVal, inToOut, coord);
-        if (fabs(fxnVal->x - coord->x) < fabs(deriv->x) &&
-                fabs(fxnVal->y - coord->y) < fabs(deriv->y)) {
-            int x = (int)(round(fabs(deriv->x)));
-            int y = (int)(round(fabs(deriv->y)));
+        if (fabs(fxnVal->x - coord->x) <= fabs(deriv->x) &&
+                fabs(fxnVal->y - coord->y) <= fabs(deriv->y)) {
+            int x = (int)(ceil(fabs(deriv->x)));
+            int y = (int)(ceil(fabs(deriv->y)));
             for (int j = -x; j <= x; j++) {
                 for (int k = -y; k <= y; k++) {