core/include/fpdfdoc/fpdf_ap.h - Issue 1638093002: Fix collison with Windows #define RGB macro.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: core/include/fpdfdoc/fpdf_ap.h

Issue 1638093002: Fix collison with Windows #define RGB macro. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: Created 4 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: core/include/fpdfdoc/fpdf_ap.h

diff --git a/core/include/fpdfdoc/fpdf_ap.h b/core/include/fpdfdoc/fpdf_ap.h

index dddbb6e0df39e235b25d99033cacf750c6921431..510b39cb9b9cd82ca81bca34674a585033dab3fa 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,

« no previous file with comments | « no previous file | core/src/fpdfdoc/doc_ap.cpp » ('j') | no next file with comments »