[Libcvd-members] libcvd/cvd_src utility.cc

[James Loxam]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Branch:         
Changes by:     James Loxam <address@hidden>    06/05/18 14:03:44

Modified files:
        cvd_src        : utility.cc 

Log message:
        64-bit fixes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/libcvd/cvd_src/utility.cc.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: libcvd/cvd_src/utility.cc
diff -u libcvd/cvd_src/utility.cc:1.4 libcvd/cvd_src/utility.cc:1.5
--- libcvd/cvd_src/utility.cc:1.4       Wed May 17 09:26:18 2006
+++ libcvd/cvd_src/utility.cc   Thu May 18 14:03:43 2006
@@ -234,7 +234,7 @@
     template <bool Aligned_b> double float_inner_product(const __m128* a, 
const __m128* b, unsigned int count)
     {
        float sums_store[4];
-       const size_t BLOCK = 1<<10;
+       const unsigned int BLOCK = 1<<10;
        double dot = 0;
        while (count) {
            size_t pass = std::min(count, BLOCK);
@@ -398,7 +398,7 @@
     template <bool Aligned_b> double double_inner_product(const __m128d* a, 
const __m128d* b, unsigned int count)
     {
        double sums_store[2];
-       const size_t BLOCK = 1<<16;
+       const unsigned int BLOCK = 1<<16;
        double dot = 0;
        while (count) {
            size_t pass = std::min(count, BLOCK);
@@ -414,9 +414,9 @@
        return dot;
     }
 
-    template <bool Aligned_b> long long byte_sum_squared_differences(const 
__m128i* a, const __m128i* b, size_t count) {
+    template <bool Aligned_b> long long byte_sum_squared_differences(const 
__m128i* a, const __m128i* b, unsigned int count) {
        unsigned long sums_store[4];    
-       const size_t BLOCK = 1<<15;
+       const unsigned int BLOCK = 1<<15;
        long long ssd = 0;
        while (count) {
            size_t pass = std::min(count, BLOCK);
@@ -441,10 +441,10 @@
        return ssd;
     }
 
-    template <bool Aligned_b> inline double 
double_sum_squared_differences(const __m128d* a, const __m128d* b, size_t 
count) 
+    template <bool Aligned_b> inline double 
double_sum_squared_differences(const __m128d* a, const __m128d* b, unsigned int 
count) 
     {
        double sums_store[2];
-       const size_t BLOCK = 1<<10;
+       const unsigned int BLOCK = 1<<10;
        double ssd = 0;
        while (count) {
            size_t pass = std::min(count, BLOCK);