Changeset 2411 for trunk/psLib/src/dataManip/psFunctions.c

Timestamp:

Nov 23, 2004, 2:05:54 PM (22 years ago)

Author:

gusciora

Message:

Added -Wall to Makefile.globals, and fixed resultant compile errors.

File:

• trunk/psLib/src/dataManip/psFunctions.c (modified) (6 diffs)

trunk/psLib/src/dataManip/psFunctions.c

@@ -7 +7 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-23 19:35:30 $
+ *  @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-24 00:05:54 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -825 +825 @@
  *****************************************************************************/
 #define FUNC_MACRO_FULL_INTERPOLATE_1D(TYPE) \
-static float fullInterpolate1D##TYPE(float *domain, \
-                                     float *range, \
+static float fullInterpolate1D##TYPE(ps##TYPE *domain, \
+                                     ps##TYPE *range, \
                                      psS32 n, \
-                                     float x) \
+                                     ps##TYPE x) \
 { \
     \
@@ -875 +875 @@
 } \
 
+/*
 FUNC_MACRO_FULL_INTERPOLATE_1D(U8)
 FUNC_MACRO_FULL_INTERPOLATE_1D(U16)
@@ -883 +884 @@
 FUNC_MACRO_FULL_INTERPOLATE_1D(S32)
 FUNC_MACRO_FULL_INTERPOLATE_1D(S64)
+FUNC_MACRO_FULL_INTERPOLATE_1D(F64)
+*/
 FUNC_MACRO_FULL_INTERPOLATE_1D(F32)
-FUNC_MACRO_FULL_INTERPOLATE_1D(F64)
+
 
 /*****************************************************************************
@@ -1956 +1959 @@
 {
     PS_PTR_CHECK_TYPE_EQUAL(x, bins, -3);
+    char* strType;
 
     switch (x->type.type) {
@@ -1978 +1982 @@
     case PS_TYPE_F64:
         return(vectorBinDisectF64(bins->data.F64, bins->n, x->data.F64));
-    }
-
-    char* strType;
-    PS_TYPE_NAME(strType,x->type.type);
-    psError(PS_ERR_BAD_PARAMETER_TYPE,
-            PS_ERRORTEXT_psFunctions_TYPE_NOT_SUPPORTED,
-            strType);
+    case PS_TYPE_C32:
+        PS_TYPE_NAME(strType,x->type.type);
+        psError(PS_ERR_BAD_PARAMETER_TYPE,
+                PS_ERRORTEXT_psFunctions_TYPE_NOT_SUPPORTED,
+                strType);
+    case PS_TYPE_C64:
+        PS_TYPE_NAME(strType,x->type.type);
+        psError(PS_ERR_BAD_PARAMETER_TYPE,
+                PS_ERRORTEXT_psFunctions_TYPE_NOT_SUPPORTED,
+                strType);
+    case PS_TYPE_PTR:
+        PS_TYPE_NAME(strType,x->type.type);
+        psError(PS_ERR_BAD_PARAMETER_TYPE,
+                PS_ERRORTEXT_psFunctions_TYPE_NOT_SUPPORTED,
+                strType);
+    }
     return(-3);
 }