[libcvd-members] libcvd cvd/utility.h cvd_src/i686/utility_doubl...

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Edward Rosten <edrosten>        09/03/17 19:12:38

Modified files:
        cvd            : utility.h 
        cvd_src/i686   : utility_double_int.cc 

Log message:
        Add in correct types so convolveGaussian(double) works.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/utility.h?cvsroot=libcvd&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/i686/utility_double_int.cc?cvsroot=libcvd&r1=1.2&r2=1.3

Patches:
Index: cvd/utility.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/utility.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- cvd/utility.h       15 Mar 2009 20:39:29 -0000      1.11
+++ cvd/utility.h       17 Mar 2009 19:12:37 -0000      1.12
@@ -134,7 +134,7 @@
   /// Compute pointwise (a_i + b_i) * c and add to out_i
   /// This is accelerated using SIMD for some platforms and data types 
(alignment is checked at runtime)
   /// Do not specify template parameters explicitly so that overloading can 
choose the right implementation
-  template <class A, class B> inline void add_multiple_of_sum(const A* a, 
const A* b, const float& c,  B* out, size_t count)
+  template <class A, class B, class C> inline void add_multiple_of_sum(const 
A* a, const A* b, const C& c,  B* out, size_t count)
   {
       while (count--)
          *(out++) += (*(a++) + *(b++)) * c;
@@ -218,7 +218,7 @@
 
   void differences(const int32_t* a, const int32_t* b, int32_t* diff, size_t 
size);
   void differences(const double* a, const double* b, double* diff, size_t 
size);
-  void add_multiple_of_sum(const double* a, const double* b, const float& c,  
double* out, size_t count);
+  void add_multiple_of_sum(const double* a, const double* b, const double& c,  
double* out, size_t count);
   void assign_multiple(const double* a, const double& c,  double* out, size_t 
count);
   double inner_product(const double* a, const double* b, size_t count);
   double sum_squared_differences(const double* a, const double* b, size_t 
count);

Index: cvd_src/i686/utility_double_int.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/i686/utility_double_int.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3