Changeset 8820

Timestamp:

Sep 15, 2006, 4:33:02 PM (20 years ago)

Author:

Paul Price

Message:

Allow pixels to be specified by a floating point value, so long as it's not fractional.

File:

• trunk/psModules/src/concepts/pmConceptsStandard.c (modified) (1 diff)

trunk/psModules/src/concepts/pmConceptsStandard.c

@@ -545 +545 @@
         TYPE_CASE(offset, concept, S32);
     default:
-        psError(PS_ERR_UNKNOWN, true, "Concept %s is not of integer type, as expected.\n", pattern->name);
-        return NULL;
+        if (concept->type == PS_TYPE_F32 && concept->data.F32 - (int)concept->data.F32 == 0) {
+            offset = concept->data.F32;
+        } else if (concept->type == PS_TYPE_F64 && concept->data.F64 - (int)concept->data.F64 == 0) {
+            offset = concept->data.F64;
+        } else {
+            psError(PS_ERR_UNKNOWN, true, "Concept %s is not of integer type, as expected.\n", pattern->name);
+            return NULL;
+        }
     }
     offset -= fortranCorr(cameraFormat, pattern->name);