Merging upstream version 1.15~pre2.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

1 files changed, 2 insertions, 2 deletions

diff --git a/decoder.h b/decoder.h
index a25f0f1..1722c14 100644
--- a/decoder.h
+++ b/decoder.h
@@ -176,11 +176,11 @@ public:
       match_byte <<= 1;
       const int match_bit = match_byte & 0x100;
       const int bit = decode_bit( bm1[match_bit+symbol] );
-      symbol = ( symbol << 1 ) + bit;
+      symbol = ( symbol << 1 ) | bit;
       if( match_bit != bit << 8 )
         {
         while( symbol < 0x100 )
-          symbol = ( symbol << 1 ) + decode_bit( bm[symbol] );
+          symbol = ( symbol << 1 ) | decode_bit( bm[symbol] );
         break;
         }
       }