summaryrefslogtreecommitdiff
path: root/core/include/fpdfapi
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2016-01-05 16:33:12 -0800
committerLei Zhang <thestig@chromium.org>2016-01-05 16:33:12 -0800
commit62664cee15230d6cbe08ed010721a4557b36dc22 (patch)
tree2baf5570b23f51e082f3ab3e8de88d8538043ae3 /core/include/fpdfapi
parent6ba32d9e65ef5d40d357876f9457e228a5fab308 (diff)
downloadpdfium-62664cee15230d6cbe08ed010721a4557b36dc22.tar.xz
Merge to XFA: Fix a few uses of default arguments.
TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1555293002 . (cherry picked from commit dbfaa8d11404a53b4807b3dbd0185047367bbff6) Review URL: https://codereview.chromium.org/1565603002 .
Diffstat (limited to 'core/include/fpdfapi')
-rw-r--r--core/include/fpdfapi/fpdf_objects.h6
-rw-r--r--core/include/fpdfapi/fpdf_parser.h12
2 files changed, 9 insertions, 9 deletions
diff --git a/core/include/fpdfapi/fpdf_objects.h b/core/include/fpdfapi/fpdf_objects.h
index e80801c507..a9a27c74a1 100644
--- a/core/include/fpdfapi/fpdf_objects.h
+++ b/core/include/fpdfapi/fpdf_objects.h
@@ -28,6 +28,7 @@ class CPDF_StreamAcc;
class CPDF_StreamFilter;
class CPDF_String;
class IFX_FileRead;
+struct PARSE_CONTEXT;
#define PDFOBJ_INVALID 0
#define PDFOBJ_BOOLEAN 1
@@ -120,7 +121,7 @@ class CPDF_Object {
~CPDF_Object() {}
void Destroy();
- static const int OBJECT_REF_MAX_DEPTH = 128;
+ static const int kObjectRefMaxDepth = 128;
static int s_nCurRefDepth;
FX_DWORD m_Type;
FX_DWORD m_ObjNum;
@@ -573,8 +574,7 @@ class CPDF_IndirectObjects {
~CPDF_IndirectObjects();
- CPDF_Object* GetIndirectObject(FX_DWORD objnum,
- struct PARSE_CONTEXT* pContext = NULL);
+ CPDF_Object* GetIndirectObject(FX_DWORD objnum, PARSE_CONTEXT* pContext);
int GetIndirectType(FX_DWORD objnum);
diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h
index 4153b1d1f2..bcb35b0ad6 100644
--- a/core/include/fpdfapi/fpdf_parser.h
+++ b/core/include/fpdfapi/fpdf_parser.h
@@ -245,13 +245,13 @@ class CPDF_SyntaxParser {
CPDF_Object* GetObject(CPDF_IndirectObjects* pObjList,
FX_DWORD objnum,
FX_DWORD gennum,
- struct PARSE_CONTEXT* pContext = NULL,
- FX_BOOL bDecrypt = TRUE);
+ PARSE_CONTEXT* pContext,
+ FX_BOOL bDecrypt);
CPDF_Object* GetObjectByStrict(CPDF_IndirectObjects* pObjList,
FX_DWORD objnum,
FX_DWORD gennum,
- struct PARSE_CONTEXT* pContext = NULL);
+ PARSE_CONTEXT* pContext);
int GetDirectNum();
@@ -425,12 +425,12 @@ class CPDF_Parser {
CPDF_Object* ParseIndirectObjectAt(CPDF_IndirectObjects* pObjList,
FX_FILESIZE pos,
FX_DWORD objnum,
- struct PARSE_CONTEXT* pContext);
+ PARSE_CONTEXT* pContext);
CPDF_Object* ParseIndirectObjectAtByStrict(CPDF_IndirectObjects* pObjList,
FX_FILESIZE pos,
FX_DWORD objnum,
- struct PARSE_CONTEXT* pContext,
+ PARSE_CONTEXT* pContext,
FX_FILESIZE* pResultPos);
FX_DWORD StartAsynParse(IFX_FileRead* pFile,
@@ -840,7 +840,7 @@ FX_DWORD RunLengthDecode(const uint8_t* src_buf,
FX_DWORD src_size,
uint8_t*& dest_buf,
FX_DWORD& dest_size);
-FX_BOOL IsSignatureDict(const CPDF_Dictionary* pDict);
+bool IsSignatureDict(const CPDF_Dictionary* pDict);
class CPDF_NumberTree {
public: