[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - basebmp/inc

[Caolán McNamara]

 basebmp/inc/packedpixeliterator.hxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7e0449ab6a45d3e50741e85175002cfa8e05da49
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 2 14:40:43 2016 +0000

    error: left operand of shift expression '(-1 << 4)' is negative
    
    Change-Id: Id87fd266f8e27444cb0984c92921b6700f504042
    Reviewed-on: https://gerrit.libreoffice.org/22047
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/basebmp/inc/packedpixeliterator.hxx b/basebmp/inc/packedpixeliterator.hxx
index 776a45e..d7c6e62 100644
--- a/basebmp/inc/packedpixeliterator.hxx
+++ b/basebmp/inc/packedpixeliterator.hxx
@@ -78,7 +78,7 @@ public:
         num_intraword_positions=sizeof(value_type)*8/bits_per_pixel,
         /** Bit mask for one pixel (least significant bits)
          */
-        bit_mask=~(~0 << bits_per_pixel)
+        bit_mask=~(~0U << bits_per_pixel)
     };
 
 private:
@@ -238,7 +238,7 @@ public:
         num_intraword_positions=sizeof(value_type)*8/bits_per_pixel,
         /** Bit mask for one pixel (least significant bits)
          */
-        bit_mask=~(~0 << bits_per_pixel)
+        bit_mask=~(~0U << bits_per_pixel)
     };
 
 private:
@@ -477,7 +477,7 @@ public:
         num_intraword_positions=sizeof(value_type)*8/bits_per_pixel,
         /** Bit mask for one pixel (least significant bits)
          */
-        bit_mask=~(~0 << bits_per_pixel)
+        bit_mask=~(~0U << bits_per_pixel)
     };
 
     // TODO(F2): direction of iteration (ImageIterator can be made to