summaryrefslogtreecommitdiff
path: root/core/include/fpdfdoc
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2016-01-26 14:19:52 -0800
committerTom Sepez <tsepez@chromium.org>2016-01-26 14:19:52 -0800
commitf10ae634e7b198b18942baaf9f111f07cc8ce818 (patch)
treea753a70bdac1d2775895a30922d6e58e62e00360 /core/include/fpdfdoc
parentbef1eb99263b80d013d9a2c2618446dec99551c1 (diff)
downloadpdfium-f10ae634e7b198b18942baaf9f111f07cc8ce818.tar.xz
War on #defines - part 2
Introduce CPDF_Parser::Error. Introduce CPDF_Color::Type. Unused XFA_DATASETS and XFA_FORMS defines. Move FPDF_CreateStandardSecurityHandler() prototype to header. Delete prototype for nonexistent FPDF_CreatePubKeyHandler(). Make PBS_* defines local to .cpp file. Tidy whitespace. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1634123004 .
Diffstat (limited to 'core/include/fpdfdoc')
-rw-r--r--core/include/fpdfdoc/fpdf_ap.h21
1 files changed, 8 insertions, 13 deletions
diff --git a/core/include/fpdfdoc/fpdf_ap.h b/core/include/fpdfdoc/fpdf_ap.h
index 6d0478c23f..dddbb6e0df 100644
--- a/core/include/fpdfdoc/fpdf_ap.h
+++ b/core/include/fpdfdoc/fpdf_ap.h
@@ -16,22 +16,20 @@ class IPVT_FontMap {
virtual CPDF_Font* GetPDFFont(int32_t nFontIndex) = 0;
virtual CFX_ByteString GetPDFFontAlias(int32_t nFontIndex) = 0;
};
+
struct CPVT_Dash {
CPVT_Dash(int32_t dash, int32_t gap, int32_t phase)
: nDash(dash), nGap(gap), nPhase(phase) {}
int32_t nDash;
-
int32_t nGap;
-
int32_t nPhase;
};
-#define CT_TRANSPARENT 0
-#define CT_GRAY 1
-#define CT_RGB 2
-#define CT_CMYK 3
+
struct CPVT_Color {
- CPVT_Color(int32_t type = 0,
+ enum Type { TRANSPARENT = 0, GRAY, RGB, CMYK };
+
+ CPVT_Color(Type type = TRANSPARENT,
FX_FLOAT color1 = 0.0f,
FX_FLOAT color2 = 0.0f,
FX_FLOAT color3 = 0.0f,
@@ -42,12 +40,13 @@ struct CPVT_Color {
fColor3(color3),
fColor4(color4) {}
- int32_t nColorType;
+ Type nColorType;
FX_FLOAT fColor1;
FX_FLOAT fColor2;
FX_FLOAT fColor3;
FX_FLOAT fColor4;
};
+
class CPVT_Provider : public IPDF_VariableText_Provider {
public:
CPVT_Provider(IPVT_FontMap* pFontMap);
@@ -68,11 +67,7 @@ class CPVT_Provider : public IPDF_VariableText_Provider {
private:
IPVT_FontMap* m_pFontMap;
};
-#define PBS_SOLID 0
-#define PBS_DASH 1
-#define PBS_BEVELED 2
-#define PBS_INSET 3
-#define PBS_UNDERLINED 4
+
class CPVT_GenerateAP {
public:
static FX_BOOL GenerateTextFieldAP(CPDF_Document* pDoc,