Changeset 31660 for trunk/psLib/src/math/psVectorSmooth.c

Timestamp:

Jun 22, 2011, 12:27:33 AM (15 years ago)

Author:

eugene

Message:

merged from eam_branches/ipp-20110505: update memory locking to allow paralled realloc

File:

• trunk/psLib/src/math/psVectorSmooth.c (modified) (3 diffs)

trunk/psLib/src/math/psVectorSmooth.c

@@ -30 +30 @@
     if (output == input) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Cannot smooth vector in-place.");
-        return false;
+        return NULL;
     }
 
@@ -38 +38 @@
     long Nbin = input->n;               // Number of elements
     double factor = -0.5/(sigma*sigma); // Factor for Gaussian
+
+    if (Nbin < Npixel) {
+        // cannot smooth narrow vector
+        return NULL;
+    }
 
     #define VECTOR_SMOOTH_CASE(TYPE) \
@@ -60 +65 @@
         /* smooth first Nrange pixels, with renorm */ \
         /* XXX need to check that this does not run over end for narrow vectors */ \
-        for (long i = 0; i < Nrange; i++, vi++, vo++) { \
+        for (long i = 0; i < Nrange; i++, vi++, vo++) { \
             ps##TYPE *vr = vi - i; \
             ps##TYPE *vg = gauss - i; \