From 9e06fc03411531a36fc7274a1809af3aa3b3d456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 2 Feb 2016 15:41:27 +0000 Subject: [PATCH] try again --- ...nd-of-shift-expression-1-4-is-negati.patch | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/0001-error-left-operand-of-shift-expression-1-4-is-negati.patch b/0001-error-left-operand-of-shift-expression-1-4-is-negati.patch index 4940171..8633b69 100644 --- a/0001-error-left-operand-of-shift-expression-1-4-is-negati.patch +++ b/0001-error-left-operand-of-shift-expression-1-4-is-negati.patch @@ -1,4 +1,4 @@ -From 02ea43e61ac9779a640d48393d127fcb7d698500 Mon Sep 17 00:00:00 2001 +From 6bb7d9a227d06c215c94ecd305ebb4232010a3fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 2 Feb 2016 14:40:43 +0000 Subject: [PATCH] error: left operand of shift expression '(-1 << 4)' is @@ -6,11 +6,11 @@ Subject: [PATCH] error: left operand of shift expression '(-1 << 4)' is Change-Id: Id87fd266f8e27444cb0984c92921b6700f504042 --- - basebmp/inc/packedpixeliterator.hxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + basebmp/inc/packedpixeliterator.hxx | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/basebmp/inc/packedpixeliterator.hxx b/basebmp/inc/packedpixeliterator.hxx -index 776a45e..e5ef517 100644 +index 776a45e..d7c6e62 100644 --- a/basebmp/inc/packedpixeliterator.hxx +++ b/basebmp/inc/packedpixeliterator.hxx @@ -78,7 +78,7 @@ public: @@ -18,10 +18,28 @@ index 776a45e..e5ef517 100644 /** Bit mask for one pixel (least significant bits) */ - bit_mask=~(~0 << bits_per_pixel) -+ bit_mask=~(static_cast(~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 -- 2.5.0