Changeset 295 in pacpusframework for branches

Timestamp:

Mar 31, 2014, 3:24:03 PM (11 years ago)

Author:

DHERBOMEZ Gérald

Message:

Bug fix in BinaryDecoder.h file, notably for the mDecodeToUI8 function (error when decoding UI8 whose the size(in bits) < 8 bits )

Location:

branches

Files:

• 0.0.x/include/Pacpus/PacpusTools/BinaryDecoder.h (modified) (2 diffs)
• 0.1.x/include/Pacpus/PacpusTools/BinaryDecoder.h (modified) (4 diffs)

branches/0.0.x/include/Pacpus/PacpusTools/BinaryDecoder.h

@@ -766 +766 @@
         } else {
             *result = 0;
-            return true;
+            return false;
         }
     } else {
         // ok data is stored at most in 1 byte
         unsigned char c;
-        c = data[startBit>>3];                // >>3 <=> div 8
-        c >>= (8-((startBit & 0x07)+1));      // &0x07 <=> modulo 8
-        *result = c & getMask8( length );
+        
+                c = data[startBit>>3];                // >>3 <=> div 8
+        //c >>= (8-((startBit & 0x07)+1));      // &0x07 <=> modulo 8
+                c >>= startBit & 0x07 - (length - 1);    // &0x07 <=> modulo 8
+                *result = c & getMask8( length );
 
         return true;
@@ -798 +800 @@
         } else {
             *result = 0;
-            return true;
+            return false;
         }
     }

branches/0.1.x/include/Pacpus/PacpusTools/BinaryDecoder.h

@@ -31 +31 @@
 #define BINARYDECODER_H
 
-#include "PacpusToolsConfig.h"
-
 #ifdef __cplusplus
 extern "C"
@@ -38 +36 @@
 #endif // __cplusplus
 
+#include "PacpusToolsConfig.h"  
+  
 #include <stdio.h>
 
@@ -768 +768 @@
         } else {
             *result = 0;
-            return true;
+            return false;
         }
     } else {
         // ok data is stored at most in 1 byte
         unsigned char c;
-        c = data[startBit>>3];                // >>3 <=> div 8
-        c >>= (8-((startBit & 0x07)+1));      // &0x07 <=> modulo 8
-        *result = c & getMask8( length );
+        
+                c = data[startBit>>3];                // >>3 <=> div 8
+        //c >>= (8-((startBit & 0x07)+1));      // &0x07 <=> modulo 8
+                c >>= startBit & 0x07 - (length - 1);    // &0x07 <=> modulo 8
+                *result = c & getMask8( length );
 
         return true;
@@ -800 +802 @@
         } else {
             *result = 0;
-            return true;
+            return false;
         }
     }