From c812495631df9f059bfd332ffe37e76dd011e96c Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 26 Jan 2016 14:36:36 -0800 Subject: Fix collison with Windows #define RGB macro. kGray and such are much safer. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1638093002 . --- core/include/fpdfdoc/fpdf_ap.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/include/fpdfdoc') diff --git a/core/include/fpdfdoc/fpdf_ap.h b/core/include/fpdfdoc/fpdf_ap.h index dddbb6e0df..510b39cb9b 100644 --- a/core/include/fpdfdoc/fpdf_ap.h +++ b/core/include/fpdfdoc/fpdf_ap.h @@ -27,9 +27,9 @@ struct CPVT_Dash { }; struct CPVT_Color { - enum Type { TRANSPARENT = 0, GRAY, RGB, CMYK }; + enum Type { kTransparent = 0, kGray, kRGB, kCMYK }; - CPVT_Color(Type type = TRANSPARENT, + CPVT_Color(Type type = kTransparent, FX_FLOAT color1 = 0.0f, FX_FLOAT color2 = 0.0f, FX_FLOAT color3 = 0.0f, -- cgit v1.2.3