Changeset 10730 for trunk

Timestamp:

05/17/11 20:18:33 (14 years ago)

Author:

tbretz

Message:

Fixed a bug in bitcpy

File:

• trunk/FACT++/src/ByteOrder.h (modified) (2 diffs)

trunk/FACT++/src/ByteOrder.h

@@ -87 +87 @@
 void bitcpy(T *target, size_t ntarget, const S *source, size_t nsource, size_t ss=0, size_t ts=0)
 {
-    const size_t targetsize = ss==0 ? sizeof(T) : std::min(ss, sizeof(T));
-    const size_t sourcesize = ts==0 ? sizeof(S) : std::min(ts, sizeof(S));
+    const size_t targetsize = ts==0 ? sizeof(T)*8 : std::min(ts, sizeof(T)*8);
+    const size_t sourcesize = ss==0 ? sizeof(S)*8 : std::min(ss, sizeof(S)*8);
 
     const S *const ends = source + nsource;
@@ -106 +106 @@
         *t |= (*s>>sourcepos)<<targetpos;
 
-        // If not all bits fitted into targetsize the number
-        // of copied bits is the number of bits which fitted
-        const int n = std::min(sourcesize-sourcepos, targetsize-targetpos);
+        // Calculate how many bits were siuccessfully copied
+        const int ncopy = std::min(sourcesize-sourcepos, targetsize-targetpos);
 
-        targetpos += n;
-        sourcepos += n;
+        targetpos += ncopy;
+        sourcepos += ncopy;
 
         if (sourcepos>=sourcesize)
+        {
+            sourcepos %= sourcesize;
             s++;
+        }
 
         if (targetpos>=targetsize)
+        {
+            targetpos %= targetsize;
             t++;
+        }
 
-        sourcepos %= sourcesize;
-        targetpos %= targetsize;
     }
 }