diff options
| author | Bo Xu <bo_xu@foxitsoftware.com> | 2014-10-21 12:04:41 -0700 |
|---|---|---|
| committer | Bo Xu <bo_xu@foxitsoftware.com> | 2014-10-21 12:04:41 -0700 |
| commit | f71c2d02294fb3ceb7b19a93a6913f97c4ff2b7a (patch) | |
| tree | 5ad21b6fa0bebff846f1a352d6cdaf23c5bc666a | |
| parent | fe4537269fc7133320a5131638757f2ffa6bd854 (diff) | |
| download | pdfium-f71c2d02294fb3ceb7b19a93a6913f97c4ff2b7a.tar.xz | |
Add missing parenthesis in FXARGB_GETDIB macro
You can get warning when using FXARGB_GETDIB() with & operation in
the same statement like: FXARGB_GETDIB(src_scan) & 0xffffff in
fx_dib_composite.cpp:
../../third_party/pdfium/core/src/fxge/dib/fx_dib_composite.cpp:737:205:
error: '&' within '|' [-Werror,-Wbitwise-op-parentheses]
Original patch from jiangj@opera.com
R=thakis@chromium.org
Review URL: https://codereview.chromium.org/578253002
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | core/include/fxge/fx_dib.h | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -26,6 +26,7 @@ Raymes Khoury <raymes@chromium.org> Reid Kleckner <rnk@chromium.org>
Robert Sesek <rsesek@chromium.org>
Thomas Sepez <tsepez@chromium.org>
+Jiang Jiang <jiangj@opera.com>
Foxit Software Inc <*@foxitsoftware.com>
Google Inc. <*@google.com>
diff --git a/core/include/fxge/fx_dib.h b/core/include/fxge/fx_dib.h index 957a957043..d8a2003548 100644 --- a/core/include/fxge/fx_dib.h +++ b/core/include/fxge/fx_dib.h @@ -105,7 +105,7 @@ FX_ARGB ArgbEncode(int a, FX_COLORREF rgb); ((FX_LPBYTE)(p))[1] = (FX_BYTE)((cmyk) >> 16), \ ((FX_LPBYTE)(p))[2] = (FX_BYTE)((cmyk) >> 8), \ ((FX_LPBYTE)(p))[3] = (FX_BYTE)(cmyk)) -#define FXARGB_GETDIB(p) (((FX_LPBYTE)(p))[0]) | (((FX_LPBYTE)(p))[1] << 8) | (((FX_LPBYTE)(p))[2] << 16) | (((FX_LPBYTE)(p))[3] << 24) +#define FXARGB_GETDIB(p) ((((FX_LPBYTE)(p))[0]) | (((FX_LPBYTE)(p))[1] << 8) | (((FX_LPBYTE)(p))[2] << 16) | (((FX_LPBYTE)(p))[3] << 24)) #define FXARGB_SETDIB(p, argb) ((FX_LPBYTE)(p))[0] = (FX_BYTE)(argb), \ ((FX_LPBYTE)(p))[1] = (FX_BYTE)((argb) >> 8), \ ((FX_LPBYTE)(p))[2] = (FX_BYTE)((argb) >> 16), \ |