summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--poppler/CairoOutputDev.h2
-rw-r--r--poppler/CurlPDFDocBuilder.h6
-rw-r--r--poppler/FileSpec.h2
-rw-r--r--poppler/FlateEncoder.h3
-rw-r--r--poppler/Form.h6
-rw-r--r--poppler/Gfx.h14
-rw-r--r--poppler/GfxState.h30
-rw-r--r--poppler/GlobalParams.h8
-rw-r--r--poppler/Lexer.h2
-rw-r--r--poppler/Link.h28
-rw-r--r--poppler/LocalPDFDocBuilder.h6
-rw-r--r--poppler/OptionalContent.h10
-rw-r--r--poppler/OutputDev.h10
-rw-r--r--poppler/PDFDoc.h48
-rw-r--r--poppler/PDFDocBuilder.h4
-rw-r--r--poppler/PDFDocFactory.h6
-rw-r--r--poppler/PSOutputDev.h18
-rw-r--r--poppler/Page.h34
-rw-r--r--poppler/Parser.h2
-rw-r--r--poppler/StdinPDFDocBuilder.h6
-rw-r--r--poppler/Stream.h22
-rw-r--r--poppler/StructElement.h14
-rw-r--r--poppler/StructTreeRoot.h6
-rw-r--r--poppler/XRef.h4
-rw-r--r--splash/Splash.h2
-rw-r--r--splash/SplashBitmap.h2
-rw-r--r--splash/SplashScreen.h4
-rw-r--r--utils/HtmlOutputDev.h10
28 files changed, 155 insertions, 154 deletions
diff --git a/poppler/CairoOutputDev.h b/poppler/CairoOutputDev.h
index c6776f4a..337b7da3 100644
--- a/poppler/CairoOutputDev.h
+++ b/poppler/CairoOutputDev.h
@@ -264,7 +264,7 @@ public:
//----- special access
// Called to indicate that a new PDF document has been loaded.
- void startDoc(PDFDoc *docA, CairoFontEngine *fontEngine = NULL);
+ void startDoc(PDFDoc *docA, CairoFontEngine *fontEngine = nullptr);
GBool isReverseVideo() { return gFalse; }
diff --git a/poppler/CurlPDFDocBuilder.h b/poppler/CurlPDFDocBuilder.h
index 43b442db..37c73a1c 100644
--- a/poppler/CurlPDFDocBuilder.h
+++ b/poppler/CurlPDFDocBuilder.h
@@ -5,7 +5,7 @@
// This file is licensed under the GPLv2 or later
//
// Copyright 2010 Hib Eris <hib@hiberis.nl>
-// Copyright 2010 Albert Astals Cid <aacid@kde.org>
+// Copyright 2010, 2018 Albert Astals Cid <aacid@kde.org>
//
//========================================================================
@@ -24,8 +24,8 @@ class CurlPDFDocBuilder : public PDFDocBuilder {
public:
- PDFDoc *buildPDFDoc(const GooString &uri, GooString *ownerPassword = NULL,
- GooString *userPassword = NULL, void *guiDataA = NULL) override;
+ PDFDoc *buildPDFDoc(const GooString &uri, GooString *ownerPassword = nullptr,
+ GooString *userPassword = nullptr, void *guiDataA = nullptr) override;
GBool supports(const GooString &uri) override;
};
diff --git a/poppler/FileSpec.h b/poppler/FileSpec.h
index f40f7705..eeeabca1 100644
--- a/poppler/FileSpec.h
+++ b/poppler/FileSpec.h
@@ -36,7 +36,7 @@ public:
const GooString *checksum() const { return m_checksum; }
const GooString *mimeType() const { return m_mimetype; }
Object *streamObject() { return &m_objStr; }
- Stream *stream() { return isOk() ? m_objStr.getStream() : NULL; }
+ Stream *stream() { return isOk() ? m_objStr.getStream() : nullptr; }
GBool isOk() const { return m_objStr.isStream(); }
GBool save(const char *path);
diff --git a/poppler/FlateEncoder.h b/poppler/FlateEncoder.h
index 093104ad..2db3f219 100644
--- a/poppler/FlateEncoder.h
+++ b/poppler/FlateEncoder.h
@@ -3,6 +3,7 @@
// FlateEncoder.h
//
// Copyright (C) 2016, William Bader <williambader@hotmail.com>
+// Copyright (C) 2018 Albert Astals Cid <aacid@kde.org>
//
// This file is under the GPLv2 or later license
//
@@ -51,7 +52,7 @@ public:
{ return (outBufPtr >= outBufEnd && !fillBuf()) ? EOF : (*outBufPtr++ & 0xff); }
int lookChar() override
{ return (outBufPtr >= outBufEnd && !fillBuf()) ? EOF : (*outBufPtr & 0xff); }
- GooString *getPSFilter(int psLevel, const char *indent) override { return NULL; }
+ GooString *getPSFilter(int psLevel, const char *indent) override { return nullptr; }
GBool isBinary(GBool last = gTrue) override { return gTrue; }
GBool isEncoder() override { return gTrue; }
diff --git a/poppler/Form.h b/poppler/Form.h
index 5cc62266..4d126de3 100644
--- a/poppler/Form.h
+++ b/poppler/Form.h
@@ -315,7 +315,7 @@ public:
FormWidget* findWidgetByRef (Ref aref);
int getNumWidgets() { return terminal ? numChildren : 0; }
- FormWidget *getWidget(int i) { return terminal ? widgets[i] : NULL; }
+ FormWidget *getWidget(int i) { return terminal ? widgets[i] : nullptr; }
// only implemented in FormFieldButton
virtual void fillChildrenSiblingsID ();
@@ -457,8 +457,8 @@ public:
~FormFieldChoice();
int getNumChoices() const { return numChoices; }
- const GooString* getChoice(int i) const { return choices ? choices[i].optionName : NULL; }
- const GooString* getExportVal (int i) const { return choices ? choices[i].exportVal : NULL; }
+ const GooString* getChoice(int i) const { return choices ? choices[i].optionName : nullptr; }
+ const GooString* getExportVal (int i) const { return choices ? choices[i].exportVal : nullptr; }
// For multi-select choices it returns the first one
const GooString* getSelectedChoice() const;
diff --git a/poppler/Gfx.h b/poppler/Gfx.h
index 5cc2685a..cd6ac3d4 100644
--- a/poppler/Gfx.h
+++ b/poppler/Gfx.h
@@ -154,14 +154,14 @@ public:
Gfx(PDFDoc *docA, OutputDev *outA, int pageNum, Dict *resDict,
double hDPI, double vDPI, const PDFRectangle *box,
const PDFRectangle *cropBox, int rotate,
- GBool (*abortCheckCbkA)(void *data) = NULL,
- void *abortCheckCbkDataA = NULL, XRef *xrefA = NULL);
+ GBool (*abortCheckCbkA)(void *data) = nullptr,
+ void *abortCheckCbkDataA = nullptr, XRef *xrefA = nullptr);
// Constructor for a sub-page object.
Gfx(PDFDoc *docA, OutputDev *outA, Dict *resDict,
const PDFRectangle *box, const PDFRectangle *cropBox,
- GBool (*abortCheckCbkA)(void *data) = NULL,
- void *abortCheckCbkDataA = NULL, Gfx *gfxA = NULL);
+ GBool (*abortCheckCbkA)(void *data) = nullptr,
+ void *abortCheckCbkDataA = nullptr, Gfx *gfxA = nullptr);
#ifdef USE_CMS
void initDisplayProfile();
#endif
@@ -199,10 +199,10 @@ public:
void drawForm(Object *str, Dict *resDict, const double *matrix, const double *bbox,
GBool transpGroup = gFalse, GBool softMask = gFalse,
- GfxColorSpace *blendingColorSpace = NULL,
+ GfxColorSpace *blendingColorSpace = nullptr,
GBool isolated = gFalse, GBool knockout = gFalse,
- GBool alpha = gFalse, Function *transferFunc = NULL,
- GfxColor *backdropColor = NULL);
+ GBool alpha = gFalse, Function *transferFunc = nullptr,
+ GfxColor *backdropColor = nullptr);
void pushResources(Dict *resDict);
void popResources();
diff --git a/poppler/GfxState.h b/poppler/GfxState.h
index 573c4e03..71831d0f 100644
--- a/poppler/GfxState.h
+++ b/poppler/GfxState.h
@@ -224,7 +224,7 @@ public:
virtual GfxColorSpace *copy() = 0;
virtual GfxColorSpaceMode getMode() = 0;
- // Construct a color space. Returns NULL if unsuccessful.
+ // Construct a color space. Returns nullptr if unsuccessful.
static GfxColorSpace *parse(GfxResources *res, Object *csObj, OutputDev *out, GfxState *state, int recursion = 0);
// Convert to gray, RGB, or CMYK.
@@ -337,7 +337,7 @@ public:
GfxColorSpace *copy() override;
GfxColorSpaceMode getMode() override { return csCalGray; }
- // Construct a CalGray color space. Returns NULL if unsuccessful.
+ // Construct a CalGray color space. Returns nullptr if unsuccessful.
static GfxColorSpace *parse(Array *arr, GfxState *state);
void getGray(const GfxColor *color, GfxGray *gray) const override;
@@ -415,7 +415,7 @@ public:
GfxColorSpace *copy() override;
GfxColorSpaceMode getMode() override { return csCalRGB; }
- // Construct a CalRGB color space. Returns NULL if unsuccessful.
+ // Construct a CalRGB color space. Returns nullptr if unsuccessful.
static GfxColorSpace *parse(Array *arr, GfxState *state);
void getGray(const GfxColor *color, GfxGray *gray) const override;
@@ -494,7 +494,7 @@ public:
GfxColorSpace *copy() override;
GfxColorSpaceMode getMode() override { return csLab; }
- // Construct a Lab color space. Returns NULL if unsuccessful.
+ // Construct a Lab color space. Returns nullptr if unsuccessful.
static GfxColorSpace *parse(Array *arr, GfxState *state);
void getGray(const GfxColor *color, GfxGray *gray) const override;
@@ -545,7 +545,7 @@ public:
GfxColorSpace *copy() override;
GfxColorSpaceMode getMode() override { return csICCBased; }
- // Construct an ICCBased color space. Returns NULL if unsuccessful.
+ // Construct an ICCBased color space. Returns nullptr if unsuccessful.
static GfxColorSpace *parse(Array *arr, OutputDev *out, GfxState *state, int recursion);
void getGray(const GfxColor *color, GfxGray *gray) const override;
@@ -579,7 +579,7 @@ private:
double rangeMax[4]; // max values for each component
Ref iccProfileStream; // the ICC profile
#ifdef USE_CMS
- int getIntent() { return (transform != NULL) ? transform->getIntent() : 0; }
+ int getIntent() { return (transform != nullptr) ? transform->getIntent() : 0; }
GfxColorTransform *transform;
GfxColorTransform *lineTransform; // color transform for line
mutable std::map<unsigned int, unsigned int> cmsCache;
@@ -597,7 +597,7 @@ public:
GfxColorSpace *copy() override;
GfxColorSpaceMode getMode() override { return csIndexed; }
- // Construct an Indexed color space. Returns NULL if unsuccessful.
+ // Construct an Indexed color space. Returns nullptr if unsuccessful.
static GfxColorSpace *parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion);
void getGray(const GfxColor *color, GfxGray *gray) const override;
@@ -650,7 +650,7 @@ public:
GfxColorSpace *copy() override;
GfxColorSpaceMode getMode() override { return csSeparation; }
- // Construct a Separation color space. Returns NULL if unsuccessful.
+ // Construct a Separation color space. Returns nullptr if unsuccessful.
static GfxColorSpace *parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion);
void getGray(const GfxColor *color, GfxGray *gray) const override;
@@ -695,7 +695,7 @@ public:
GfxColorSpace *copy() override;
GfxColorSpaceMode getMode() override { return csDeviceN; }
- // Construct a DeviceN color space. Returns NULL if unsuccessful.
+ // Construct a DeviceN color space. Returns nullptr if unsuccessful.
static GfxColorSpace *parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion);
void getGray(const GfxColor *color, GfxGray *gray) const override;
@@ -742,7 +742,7 @@ public:
GfxColorSpace *copy() override;
GfxColorSpaceMode getMode() override { return csPattern; }
- // Construct a Pattern color space. Returns NULL if unsuccessful.
+ // Construct a Pattern color space. Returns nullptr if unsuccessful.
static GfxColorSpace *parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion);
void getGray(const GfxColor *color, GfxGray *gray) const override;
@@ -807,7 +807,7 @@ public:
double getXStep() const { return xStep; }
double getYStep() const { return yStep; }
Dict *getResDict()
- { return resDict.isDict() ? resDict.getDict() : (Dict *)NULL; }
+ { return resDict.isDict() ? resDict.getDict() : (Dict *)nullptr; }
const double *getMatrix() const { return matrix; }
Object *getContentStream() { return &contentStream; }
@@ -1228,7 +1228,7 @@ public:
// Matte color ops
void setMatteColor(const GfxColor *color) { useMatte = gTrue; matteColor = *color; }
- const GfxColor *getMatteColor() const { return (useMatte) ? &matteColor : NULL; }
+ const GfxColor *getMatteColor() const { return (useMatte) ? &matteColor : nullptr; }
private:
GfxImageColorMap(GfxImageColorMap *colorMap);
@@ -1624,7 +1624,7 @@ public:
// Push/pop GfxState on/off stack.
GfxState *save();
GfxState *restore();
- GBool hasSaves() const { return saved != NULL; }
+ GBool hasSaves() const { return saved != nullptr; }
GBool isParentState(GfxState *state) { return saved == state || (saved && saved->isParentState(state)); }
// Misc
@@ -1652,8 +1652,8 @@ private:
GBool strokeOverprint; // stroke overprint
int overprintMode; // overprint mode
Function *transfer[4]; // transfer function (entries may be: all
- // NULL = identity; last three NULL =
- // single function; all four non-NULL =
+ // nullptr = identity; last three nullptr =
+ // single function; all four non-nullptr =
// R,G,B,gray functions)
double lineWidth; // line width
diff --git a/poppler/GlobalParams.h b/poppler/GlobalParams.h
index 500a6191..f6e63bb2 100644
--- a/poppler/GlobalParams.h
+++ b/poppler/GlobalParams.h
@@ -103,7 +103,7 @@ class GlobalParams {
public:
// Initialize the global parameters
- GlobalParams(const char *customPopplerDataDir = NULL);
+ GlobalParams(const char *customPopplerDataDir = nullptr);
~GlobalParams();
@@ -131,8 +131,8 @@ public:
GooString *findFontFile(const GooString *fontName);
GooString *findBase14FontFile(const GooString *base14Name, GfxFont *font);
GooString *findSystemFontFile(GfxFont *font, SysFontType *type,
- int *fontNum, GooString *substituteFontName = NULL,
- const GooString *base14Name = NULL);
+ int *fontNum, GooString *substituteFontName = nullptr,
+ const GooString *base14Name = nullptr);
GBool getPSExpandSmaller();
GBool getPSShrinkLarger();
PSLevel getPSLevel();
@@ -147,7 +147,7 @@ public:
CharCodeToUnicode *getCIDToUnicode(GooString *collection);
UnicodeMap *getUnicodeMap(GooString *encodingName);
- CMap *getCMap(const GooString *collection, GooString *cMapName, Stream *stream = NULL);
+ CMap *getCMap(const GooString *collection, GooString *cMapName, Stream *stream = nullptr);
UnicodeMap *getTextEncoding();
GooList *getEncodingNames();
diff --git a/poppler/Lexer.h b/poppler/Lexer.h
index eb692a5c..c2152463 100644
--- a/poppler/Lexer.h
+++ b/poppler/Lexer.h
@@ -71,7 +71,7 @@ public:
// Get stream.
Stream *getStream()
- { return curStr.isStream() ? curStr.getStream() : (Stream *)NULL; }
+ { return curStr.isStream() ? curStr.getStream() : nullptr; }
// Get current position in file. This is only used for error
// messages.
diff --git a/poppler/Link.h b/poppler/Link.h
index 3dbe57fd..c92ec5f5 100644
--- a/poppler/Link.h
+++ b/poppler/Link.h
@@ -184,10 +184,10 @@ public:
private:
- LinkDest *dest; // regular destination (NULL for remote
+ LinkDest *dest; // regular destination (nullptr for remote
// link with bad destination)
GooString *namedDest; // named destination (only one of dest and
- // and namedDest may be non-NULL)
+ // and namedDest may be non-nullptr)
};
//------------------------------------------------------------------------
@@ -216,10 +216,10 @@ public:
private:
GooString *fileName; // file name
- LinkDest *dest; // regular destination (NULL for remote
+ LinkDest *dest; // regular destination (nullptr for remote
// link with bad destination)
GooString *namedDest; // named destination (only one of dest and
- // and namedDest may be non-NULL)
+ // and namedDest may be non-nullptr)
};
//------------------------------------------------------------------------
@@ -236,7 +236,7 @@ public:
~LinkLaunch();
// Was the LinkLaunch created successfully?
- GBool isOk() const override { return fileName != NULL; }
+ GBool isOk() const override { return fileName != nullptr; }
// Accessors.
LinkActionKind getKind() const override { return actionLaunch; }
@@ -263,7 +263,7 @@ public:
~LinkURI();
// Was the LinkURI created successfully?
- GBool isOk() const override { return uri != NULL; }
+ GBool isOk() const override { return uri != nullptr; }
// Accessors.
LinkActionKind getKind() const override { return actionURI; }
@@ -286,7 +286,7 @@ public:
~LinkNamed();
- GBool isOk() const override { return name != NULL; }
+ GBool isOk() const override { return name != nullptr; }
LinkActionKind getKind() const override { return actionNamed; }
const GooString *getName() const { return name; }
@@ -314,14 +314,14 @@ public:
LinkMovie(const Object *obj);
~LinkMovie();
- GBool isOk() const override { return annotRef.num >= 0 || annotTitle != NULL; }
+ GBool isOk() const override { return annotRef.num >= 0 || annotTitle != nullptr; }
LinkActionKind getKind() const override { return actionMovie; }
// a movie action stores either an indirect reference to a movie annotation
// or the movie annotation title
GBool hasAnnotRef() const { return annotRef.num >= 0; }
- GBool hasAnnotTitle() const { return annotTitle != NULL; }
+ GBool hasAnnotTitle() const { return annotTitle != nullptr; }
const Ref *getAnnotRef() const { return &annotRef; }
const GooString *getAnnotTitle() const { return annotTitle; }
@@ -395,7 +395,7 @@ public:
~LinkSound();
- GBool isOk() const override { return sound != NULL; }
+ GBool isOk() const override { return sound != nullptr; }
LinkActionKind getKind() const override { return actionSound; }
@@ -426,7 +426,7 @@ public:
~LinkJavaScript();
- GBool isOk() const override { return js != NULL; }
+ GBool isOk() const override { return js != nullptr; }
LinkActionKind getKind() const override { return actionJavaScript; }
const GooString *getScript() const { return js; }
@@ -445,7 +445,7 @@ public:
~LinkOCGState();
- GBool isOk() const override { return stateList != NULL; }
+ GBool isOk() const override { return stateList != nullptr; }
LinkActionKind getKind() const override { return actionOCGState; }
@@ -514,7 +514,7 @@ public:
~LinkUnknown();
// Was the LinkUnknown create successfully?
- GBool isOk() const override { return action != NULL; }
+ GBool isOk() const override { return action != nullptr; }
// Accessors.
LinkActionKind getKind() const override { return actionUnknown; }
@@ -546,7 +546,7 @@ public:
AnnotLink *getLink(int i) const { return links[i]; }
// If point <x>,<y> is in a link, return the associated action;
- // else return NULL.
+ // else return nullptr.
LinkAction *find(double x, double y) const;
// Return true if <x>,<y> is in a link.
diff --git a/poppler/LocalPDFDocBuilder.h b/poppler/LocalPDFDocBuilder.h
index 0ebfdc68..32e41a5d 100644
--- a/poppler/LocalPDFDocBuilder.h
+++ b/poppler/LocalPDFDocBuilder.h
@@ -5,7 +5,7 @@
// This file is licensed under the GPLv2 or later
//
// Copyright 2010 Hib Eris <hib@hiberis.nl>
-// Copyright 2010 Albert Astals Cid <aacid@kde.org>
+// Copyright 2010, 2018 Albert Astals Cid <aacid@kde.org>
//
//========================================================================
@@ -23,8 +23,8 @@
class LocalPDFDocBuilder : public PDFDocBuilder {
public:
- PDFDoc *buildPDFDoc(const GooString &uri, GooString *ownerPassword = NULL,
- GooString *userPassword = NULL, void *guiDataA = NULL) override;
+ PDFDoc *buildPDFDoc(const GooString &uri, GooString *ownerPassword = nullptr,
+ GooString *userPassword = nullptr, void *guiDataA = nullptr) override;
GBool supports(const GooString &uri) override;
};
diff --git a/poppler/OptionalContent.h b/poppler/OptionalContent.h
index 6e9c52a6..e1e73d41 100644
--- a/poppler/OptionalContent.h
+++ b/poppler/OptionalContent.h
@@ -53,9 +53,9 @@ public:
OCDisplayNode *getDisplayRoot();
Array* getOrderArray()
- { return (order.isArray() && order.arrayGetLength() > 0) ? order.getArray() : NULL; }
+ { return (order.isArray() && order.arrayGetLength() > 0) ? order.getArray() : nullptr; }
Array* getRBGroupsArray()
- { return (rbgroups.isArray() && rbgroups.arrayGetLength()) ? rbgroups.getArray() : NULL; }
+ { return (rbgroups.isArray() && rbgroups.arrayGetLength()) ? rbgroups.getArray() : nullptr; }
bool optContentIsVisible( Object *dictRef );
@@ -142,9 +142,9 @@ private:
void addChildren(GooList *childrenA);
GooList *takeChildren();
- GooString *name; // display name (may be NULL)
- OptionalContentGroup *ocg; // NULL for display labels
- GooList *children; // NULL if there are no children
+ GooString *name; // display name (may be nullptr)
+ OptionalContentGroup *ocg; // nullptr for display labels
+ GooList *children; // nullptr if there are no children
// [OCDisplayNode]
};
diff --git a/poppler/OutputDev.h b/poppler/OutputDev.h
index 48b6a8a0..40796c95 100644
--- a/poppler/OutputDev.h
+++ b/poppler/OutputDev.h
@@ -19,7 +19,7 @@
// Copyright (C) 2007, 2011, 2017 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2009-2013, 2015 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2009, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2009, 2012, 2013 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2009, 2012, 2013, 2018 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
// Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
// Copyright (C) 2012 William Bader <williambader@hotmail.com>
@@ -142,10 +142,10 @@ public:
int rotate, GBool useMediaBox, GBool crop,
int sliceX, int sliceY, int sliceW, int sliceH,
GBool printing,
- GBool (* abortCheckCbk)(void *data) = NULL,
- void * abortCheckCbkData = NULL,
- GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = NULL,
- void *annotDisplayDecideCbkData = NULL)
+ GBool (* abortCheckCbk)(void *data) = nullptr,
+ void * abortCheckCbkData = nullptr,
+ GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = nullptr,
+ void *annotDisplayDecideCbkData = nullptr)
{ return gTrue; }
// Start a page.
diff --git a/poppler/PDFDoc.h b/poppler/PDFDoc.h
index 4165fbcf..729431ab 100644
--- a/poppler/PDFDoc.h
+++ b/poppler/PDFDoc.h
@@ -118,22 +118,22 @@ enum PDFSubtypeConformance {
class PDFDoc {
public:
- PDFDoc(const GooString *fileNameA, const GooString *ownerPassword = NULL,
- const GooString *userPassword = NULL, void *guiDataA = NULL);
+ PDFDoc(const GooString *fileNameA, const GooString *ownerPassword = nullptr,
+ const GooString *userPassword = nullptr, void *guiDataA = nullptr);
#ifdef _WIN32
- PDFDoc(wchar_t *fileNameA, int fileNameLen, GooString *ownerPassword = NULL,
- GooString *userPassword = NULL, void *guiDataA = NULL);
+ PDFDoc(wchar_t *fileNameA, int fileNameLen, GooString *ownerPassword = nullptr,
+ GooString *userPassword = nullptr, void *guiDataA = nullptr);
#endif
- PDFDoc(BaseStream *strA, const GooString *ownerPassword = NULL,
- const GooString *userPassword = NULL, void *guiDataA = NULL);
+ PDFDoc(BaseStream *strA, const GooString *ownerPassword = nullptr,
+ const GooString *userPassword = nullptr, void *guiDataA = nullptr);
~PDFDoc();
PDFDoc(const PDFDoc &) = delete;
PDFDoc& operator=(const PDFDoc &) = delete;
- static PDFDoc *ErrorPDFDoc(int errorCode, const GooString *fileNameA = NULL);
+ static PDFDoc *ErrorPDFDoc(int errorCode, const GooString *fileNameA = nullptr);
// Was PDF document successfully opened?
GBool isOk() const { return ok; }
@@ -182,7 +182,7 @@ public:
// Get number of pages.
int getNumPages();
- // Return the contents of the metadata stream, or NULL if there is
+ // Return the contents of the metadata stream, or nullptr if there is
// no metadata.
const GooString *readMetadata() const { return catalog->readMetadata(); }
@@ -196,29 +196,29 @@ public:
void displayPage(OutputDev *out, int page,
double hDPI, double vDPI, int rotate,
GBool useMediaBox, GBool crop, GBool printing,
- GBool (*abortCheckCbk)(void *data) = NULL,
- void *abortCheckCbkData = NULL,
- GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = NULL,
- void *annotDisplayDecideCbkData = NULL, GBool copyXRef = gFalse);
+ GBool (*abortCheckCbk)(void *data) = nullptr,
+ void *abortCheckCbkData = nullptr,
+ GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = nullptr,
+ void *annotDisplayDecideCbkData = nullptr, GBool copyXRef = gFalse);
// Display a range of pages.
void displayPages(OutputDev *out, int firstPage, int lastPage,
double hDPI, double vDPI, int rotate,
GBool useMediaBox, GBool crop, GBool printing,
- GBool (*abortCheckCbk)(void *data) = NULL,
- void *abortCheckCbkData = NULL,
- GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = NULL,
- void *annotDisplayDecideCbkData = NULL);
+ GBool (*abortCheckCbk)(void *data) = nullptr,
+ void *abortCheckCbkData = nullptr,
+ GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = nullptr,
+ void *annotDisplayDecideCbkData = nullptr);
// Display part of a page.
void displayPageSlice(OutputDev *out, int page,
double hDPI, double vDPI, int rotate,
GBool useMediaBox, GBool crop, GBool printing,
int sliceX, int sliceY, int sliceW, int sliceH,
- GBool (*abortCheckCbk)(void *data) = NULL,
- void *abortCheckCbkData = NULL,
- GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = NULL,
- void *annotDisplayDecideCbkData = NULL, GBool copyXRef = gFalse);
+ GBool (*abortCheckCbk)(void *data) = nullptr,
+ void *abortCheckCbkData = nullptr,
+ GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = nullptr,
+ void *annotDisplayDecideCbkData = nullptr, GBool copyXRef = gFalse);
// Find a page, given its object ID. Returns page number, or 0 if
// not found.
@@ -229,7 +229,7 @@ public:
Links *getLinks(int page);
// Find a named destination. Returns the link destination, or
- // NULL if <name> is not a destination.
+ // nullptr if <name> is not a destination.
LinkDest *findDest(const GooString *name)
{ return catalog->findDest(name); }
@@ -277,12 +277,12 @@ public:
// Remove the document's Info dictionary and update the trailer dictionary.
void removeDocInfo() { xref->removeDocInfo(); }
- // Set doc info string entry. NULL or empty value will cause a removal.
+ // Set doc info string entry. nullptr or empty value will cause a removal.
// Takes ownership of value.
void setDocInfoStringEntry(const char *key, GooString *value);
// Set document's properties in document's Info dictionary.
- // NULL or empty value will cause a removal.
+ // nullptr or empty value will cause a removal.
// Takes ownership of value.
void setDocInfoTitle(GooString *title) { setDocInfoStringEntry("Title", title); }
void setDocInfoAuthor(GooString *author) { setDocInfoStringEntry("Author", author); }
@@ -294,7 +294,7 @@ public:
void setDocInfoModDate(GooString *modDate) { setDocInfoStringEntry("ModDate", modDate); }
// Get document's properties from document's Info dictionary.
- // Returns NULL on fail.
+ // Returns nullptr on fail.
// Returned GooStrings should be freed by the caller.
GooString *getDocInfoStringEntry(const char *key);
diff --git a/poppler/PDFDocBuilder.h b/poppler/PDFDocBuilder.h
index 8239f682..6d94b0d3 100644
--- a/poppler/PDFDocBuilder.h
+++ b/poppler/PDFDocBuilder.h
@@ -35,8 +35,8 @@ public:
// Builds a new PDFDoc. Returns a PDFDoc. You should check this PDFDoc
// with PDFDoc::isOk() for failures.
// The caller is responsible for deleting ownerPassword, userPassWord and guiData.
- virtual PDFDoc *buildPDFDoc(const GooString &uri, GooString *ownerPassword = NULL,
- GooString *userPassword = NULL, void *guiDataA = NULL) = 0;
+ virtual PDFDoc *buildPDFDoc(const GooString &uri, GooString *ownerPassword = nullptr,
+ GooString *userPassword = nullptr, void *guiDataA = nullptr) = 0;
// Returns gTrue if the builder supports building a PDFDoc from the URI.
virtual GBool supports(const GooString &uri) = 0;
diff --git a/poppler/PDFDocFactory.h b/poppler/PDFDocFactory.h
index 8e14fd6b..6dba0bed 100644
--- a/poppler/PDFDocFactory.h
+++ b/poppler/PDFDocFactory.h
@@ -34,7 +34,7 @@ class PDFDocFactory {
public:
- PDFDocFactory(GooList *pdfDocBuilders = NULL);
+ PDFDocFactory(GooList *pdfDocBuilders = nullptr);
~PDFDocFactory();
PDFDocFactory(const PDFDocFactory &) = delete;
@@ -43,8 +43,8 @@ public:
// Create a PDFDoc. Returns a PDFDoc. You should check this PDFDoc
// with PDFDoc::isOk() for failures.
// The caller is responsible for deleting ownerPassword, userPassWord and guiData.
- PDFDoc *createPDFDoc(const GooString &uri, GooString *ownerPassword = NULL,
- GooString *userPassword = NULL, void *guiDataA = NULL);
+ PDFDoc *createPDFDoc(const GooString &uri, GooString *ownerPassword = nullptr,
+ GooString *userPassword = nullptr, void *guiDataA = nullptr);
// Extend supported URIs with the ones from the PDFDocBuilder.
void registerPDFDocBuilder(PDFDocBuilder *pdfDocBuilder);
diff --git a/poppler/PSOutputDev.h b/poppler/PSOutputDev.h
index c0abab04..9a503469 100644
--- a/poppler/PSOutputDev.h
+++ b/poppler/PSOutputDev.h
@@ -15,7 +15,7 @@
//
// Copyright (C) 2005 Martin Kretzschmar <martink@gnome.org>
// Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
-// Copyright (C) 2006-2008, 2012, 2013, 2015, 2017 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006-2008, 2012, 2013, 2015, 2017, 2018 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2007 Brad Hards <bradh@kde.org>
// Copyright (C) 2009-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2009 Till Kamppeter <till.kamppeter@gmail.com>
@@ -110,8 +110,8 @@ public:
int imgURXA = 0, int imgURYA = 0,
GBool forceRasterizeA = gFalse,
GBool manualCtrlA = gFalse,
- PSOutCustomCodeCbk customCodeCbkA = NULL,
- void *customCodeCbkDataA = NULL);
+ PSOutCustomCodeCbk customCodeCbkA = nullptr,
+ void *customCodeCbkDataA = nullptr);
// Open a PSOutputDev that will write to a generic stream.
// pages has to be sorted in increasing order
@@ -126,8 +126,8 @@ public:
int imgURXA = 0, int imgURYA = 0,
GBool forceRasterizeA = gFalse,
GBool manualCtrlA = gFalse,
- PSOutCustomCodeCbk customCodeCbkA = NULL,
- void *customCodeCbkDataA = NULL);
+ PSOutCustomCodeCbk customCodeCbkA = nullptr,
+ void *customCodeCbkDataA = nullptr);
// Destructor -- writes the trailer and closes the file.
virtual ~PSOutputDev();
@@ -191,10 +191,10 @@ public:
int rotate, GBool useMediaBox, GBool crop,
int sliceX, int sliceY, int sliceW, int sliceH,
GBool printing,
- GBool (*abortCheckCbk)(void *data) = NULL,
- void *abortCheckCbkData = NULL,
- GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = NULL,
- void *annotDisplayDecideCbkData = NULL) override;
+ GBool (*abortCheckCbk)(void *data) = nullptr,
+ void *abortCheckCbkData = nullptr,
+ GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = nullptr,
+ void *annotDisplayDecideCbkData = nullptr) override;
// Start a page.
void startPage(int pageNum, GfxState *state, XRef *xref) override;
diff --git a/poppler/Page.h b/poppler/Page.h
index c2f888d8..4e2fffe1 100644
--- a/poppler/Page.h
+++ b/poppler/Page.h
@@ -78,7 +78,7 @@ public:
// Construct a new PageAttrs object by merging a dictionary
// (of type Pages or Page) into another PageAttrs object. If
- // <attrs> is NULL, uses defaults.
+ // <attrs> is nullptr, uses defaults.
PageAttrs(PageAttrs *attrs, Dict *dict);
// Destructor.
@@ -96,18 +96,18 @@ public:
{ return lastModified.isString()
? lastModified.getString() : nullptr; }
Dict *getBoxColorInfo()
- { return boxColorInfo.isDict() ? boxColorInfo.getDict() : (Dict *)NULL; }
+ { return boxColorInfo.isDict() ? boxColorInfo.getDict() : nullptr; }
Dict *getGroup()
- { return group.isDict() ? group.getDict() : (Dict *)NULL; }
+ { return group.isDict() ? group.getDict() : nullptr; }
Stream *getMetadata()
- { return metadata.isStream() ? metadata.getStream() : (Stream *)NULL; }
+ { return metadata.isStream() ? metadata.getStream() : nullptr; }
Dict *getPieceInfo()
- { return pieceInfo.isDict() ? pieceInfo.getDict() : (Dict *)NULL; }
+ { return pieceInfo.isDict() ? pieceInfo.getDict() : nullptr; }
Dict *getSeparationInfo()
{ return separationInfo.isDict()
- ? separationInfo.getDict() : (Dict *)NULL; }
+ ? separationInfo.getDict() : nullptr; }
Dict *getResourceDict()
- { return resources.isDict() ? resources.getDict() : (Dict *)NULL; }
+ { return resources.isDict() ? resources.getDict() : nullptr; }
Object *getResourceDictObject()
{ return &resources; }
void replaceResource(Object &&obj1)
@@ -197,7 +197,7 @@ public:
Links *getLinks();
// Return a list of annots. It will be valid until the page is destroyed
- Annots *getAnnots(XRef *xrefA = NULL);
+ Annots *getAnnots(XRef *xrefA = nullptr);
// Get contents.
Object getContents() { return contents.fetch(xref); }
@@ -232,16 +232,16 @@ public:
int sliceX, int sliceY, int sliceW, int sliceH,
GBool printing,
GBool (*abortCheckCbk)(void *data),
- void *abortCheckCbkData, XRef *xrefA = NULL);
+ void *abortCheckCbkData, XRef *xrefA = nullptr);
// Display a page.
void display(OutputDev *out, double hDPI, double vDPI,
int rotate, GBool useMediaBox, GBool crop,
GBool printing,
- GBool (*abortCheckCbk)(void *data) = NULL,
- void *abortCheckCbkData = NULL,
- GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = NULL,
- void *annotDisplayDecideCbkData = NULL,
+ GBool (*abortCheckCbk)(void *data) = nullptr,
+ void *abortCheckCbkData = nullptr,
+ GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = nullptr,
+ void *annotDisplayDecideCbkData = nullptr,
GBool copyXRef = gFalse);
// Display part of a page.
@@ -249,10 +249,10 @@ public:
int rotate, GBool useMediaBox, GBool crop,
int sliceX, int sliceY, int sliceW, int sliceH,
GBool printing,
- GBool (*abortCheckCbk)(void *data) = NULL,
- void *abortCheckCbkData = NULL,
- GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = NULL,
- void *annotDisplayDecideCbkData = NULL,
+ GBool (*abortCheckCbk)(void *data) = nullptr,
+ void *abortCheckCbkData = nullptr,
+ GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = nullptr,
+ void *annotDisplayDecideCbkData = nullptr,
GBool copyXRef = gFalse);
void display(Gfx *gfx);
diff --git a/poppler/Parser.h b/poppler/Parser.h
index c85effc4..6390119d 100644
--- a/poppler/Parser.h
+++ b/poppler/Parser.h
@@ -52,7 +52,7 @@ public:
// true, do not parse compound objects (arrays, dictionaries, or
// streams).
Object getObj(GBool simpleOnly = gFalse,
- Guchar *fileKey = NULL,
+ Guchar *fileKey = nullptr,
CryptAlgorithm encAlgorithm = cryptRC4, int keyLength = 0,
int objNum = 0, int objGen = 0, int recursion = 0,
GBool strict = gFalse);
diff --git a/poppler/StdinPDFDocBuilder.h b/poppler/StdinPDFDocBuilder.h
index acc43b05..51818e9e 100644
--- a/poppler/StdinPDFDocBuilder.h
+++ b/poppler/StdinPDFDocBuilder.h
@@ -5,7 +5,7 @@
// This file is licensed under the GPLv2 or later
//
// Copyright 2010 Hib Eris <hib@hiberis.nl>
-// Copyright 2010 Albert Astals Cid <aacid@kde.org>
+// Copyright 2010, 2018 Albert Astals Cid <aacid@kde.org>
//
//========================================================================
@@ -23,8 +23,8 @@
class StdinPDFDocBuilder : public PDFDocBuilder {
public:
- PDFDoc *buildPDFDoc(const GooString &uri, GooString *ownerPassword = NULL,
- GooString *userPassword = NULL, void *guiDataA = NULL) override;
+ PDFDoc *buildPDFDoc(const GooString &uri, GooString *ownerPassword = nullptr,
+ GooString *userPassword = nullptr, void *guiDataA = nullptr) override;
GBool supports(const GooString &uri) override;
};
diff --git a/poppler/Stream.h b/poppler/Stream.h
index 0b78f87a..14925b08 100644
--- a/poppler/Stream.h
+++ b/poppler/Stream.h
@@ -223,7 +223,7 @@ public:
StreamColorSpaceMode * /*csMode*/) {}
// Return the next stream in the "stack".
- virtual Stream *getNextStream() { return NULL; }
+ virtual Stream *getNextStream() { return nullptr; }
// Add filters to this stream according to the parameters in <dict>.
// Returns the new stream.
@@ -317,7 +317,7 @@ public:
Stream *getUndecodedStream() override { return this; }
Dict *getDict() override { return dict.getDict(); }
Object *getDictObject() override { return &dict; }
- virtual GooString *getFileName() { return NULL; }
+ virtual GooString *getFileName() { return nullptr; }
virtual Goffset getLength() { return length; }
// Get/set position of first byte of stream within the file.
@@ -1158,7 +1158,7 @@ public:
void reset() override {}
int getChar() override { return EOF; }
int lookChar() override { return EOF; }
- GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) override { return NULL; }
+ GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) override { return nullptr; }
GBool isBinary(GBool /*last = gTrue*/) override { return gFalse; }
};
@@ -1176,7 +1176,7 @@ public:
int getChar() override;
int lookChar() override;
GooString *getPSFilter(int psLevel, const char *indent) override
- { return NULL; }
+ { return nullptr; }
GBool isBinary(GBool last = gTrue) override;
int lookChar(int idx);
@@ -1200,7 +1200,7 @@ public:
void reset() override;
int getChar() override;
int lookChar() override;
- GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) override { return NULL; }
+ GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) override { return nullptr; }
GBool isBinary(GBool /*last = gTrue*/) override;
GBool isEncoder() override { return gTrue; }
@@ -1225,7 +1225,7 @@ public:
{ return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr++ & 0xff); }
int lookChar() override
{ return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr & 0xff); }
- GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) override { return NULL; }
+ GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) override { return nullptr; }
GBool isBinary(GBool /*last = gTrue*/) override { return gFalse; }
GBool isEncoder() override { return gTrue; }
@@ -1255,7 +1255,7 @@ public:
{ return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr++ & 0xff); }
int lookChar() override
{ return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr & 0xff); }
- GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) override { return NULL; }
+ GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) override { return nullptr; }
GBool isBinary(GBool /*last = gTrue*/) override { return gFalse; }
GBool isEncoder() override { return gTrue; }
@@ -1285,7 +1285,7 @@ public:
{ return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr++ & 0xff); }
int lookChar() override
{ return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr & 0xff); }
- GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) override { return NULL; }
+ GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) override { return nullptr; }
GBool isBinary(GBool /*last = gTrue*/) override { return gTrue; }
GBool isEncoder() override { return gTrue; }
@@ -1320,7 +1320,7 @@ public:
int getChar() override;
int lookChar() override;
GooString *getPSFilter(int psLevel, const char *indent) override
- { return NULL; }
+ { return nullptr; }
GBool isBinary(GBool last = gTrue) override { return gTrue; }
GBool isEncoder() override { return gTrue; }
@@ -1353,7 +1353,7 @@ public:
{ return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr++ & 0xff); }
int lookChar() override
{ return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr & 0xff); }
- GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) override { return NULL; }
+ GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) override { return nullptr; }
GBool isBinary(GBool /*last = gTrue*/) override { return gFalse; }
GBool isEncoder() override { return gTrue; }
@@ -1382,7 +1382,7 @@ public:
{ return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr++ & 0xff); }
int lookChar() override
{ return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr & 0xff); }
- GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) override { return NULL; }
+ GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) override { return nullptr; }
GBool isBinary(GBool /*last = gTrue*/) override { return gFalse; }
GBool isEncoder() override { return gTrue; }
diff --git a/poppler/StructElement.h b/poppler/StructElement.h
index f5fcc524..0a9d6979 100644
--- a/poppler/StructElement.h
+++ b/poppler/StructElement.h
@@ -99,9 +99,9 @@ public:
GBool isHidden() const { return hidden; }
void setHidden(GBool hiddenA) { hidden = hiddenA; }
- // The formatted value may be in the PDF, or be left undefined (NULL).
+ // The formatted value may be in the PDF, or be left undefined (nullptr).
// In the later case the user agent should provide a default representation.
- const char *getFormattedValue() const { return formatted ? formatted->getCString() : NULL; }
+ const char *getFormattedValue() const { return formatted ? formatted->getCString() : nullptr; }
void setFormattedValue(const char *formattedA);
~Attribute();
@@ -115,8 +115,8 @@ private:
GBool hidden;
GooString *formatted;
- GBool checkType(StructElement *element = NULL);
- static Type getTypeForName(const char *name, StructElement *element = NULL);
+ GBool checkType(StructElement *element = nullptr);
+ static Type getTypeForName(const char *name, StructElement *element = nullptr);
static Attribute *parseUserProperty(Dict *property);
friend class StructElement;
@@ -175,11 +175,11 @@ public:
// Optional ISO language name, e.g. en_US
GooString *getLanguage() {
if (!isContent() && s->language) return s->language;
- return parent ? parent->getLanguage() : NULL;
+ return parent ? parent->getLanguage() : nullptr;
}
const GooString *getLanguage() const {
if (!isContent() && s->language) return s->language;
- return parent ? parent->getLanguage() : NULL;
+ return parent ? parent->getLanguage() : nullptr;
}
// Optional revision number, defaults to zero.
@@ -232,7 +232,7 @@ public:
// enclosed by *all* the child MCID reference elements of the subtree
// is returned. The text is assembled by traversing the leaf MCID
// reference elements in logical order.
- // - In any other case, the function returns NULL.
+ // - In any other case, the function returns nullptr.
//
// A new string is returned, and the ownership passed to the caller.
//
diff --git a/poppler/StructTreeRoot.h b/poppler/StructTreeRoot.h
index 90848649..75978058 100644
--- a/poppler/StructTreeRoot.h
+++ b/poppler/StructTreeRoot.h
@@ -38,8 +38,8 @@ public:
StructTreeRoot(const StructTreeRoot &) = delete;
PDFDoc *getDoc() { return doc; }
- Dict *getRoleMap() { return roleMap.isDict() ? roleMap.getDict() : NULL; }
- Dict *getClassMap() { return classMap.isDict() ? classMap.getDict() : NULL; }
+ Dict *getRoleMap() { return roleMap.isDict() ? roleMap.getDict() : nullptr; }
+ Dict *getClassMap() { return classMap.isDict() ? classMap.getDict() : nullptr; }
unsigned getNumChildren() const { return elements.size(); }
const StructElement *getChild(int i) const { return elements.at(i); }
StructElement *getChild(int i) { return elements.at(i); }
@@ -57,7 +57,7 @@ public:
return it->second[mcid].element;
}
}
- return NULL;
+ return nullptr;
}
private:
diff --git a/poppler/XRef.h b/poppler/XRef.h
index 4facedc9..933930af 100644
--- a/poppler/XRef.h
+++ b/poppler/XRef.h
@@ -98,7 +98,7 @@ public:
// Constructor, create an empty XRef but with info dict, used for PDF writing
XRef(const Object *trailerDictA);
// Constructor. Read xref table from stream.
- XRef(BaseStream *strA, Goffset pos, Goffset mainXRefEntriesOffsetA = 0, GBool *wasReconstructed = NULL, GBool reconstruct = false);
+ XRef(BaseStream *strA, Goffset pos, Goffset mainXRefEntriesOffsetA = 0, GBool *wasReconstructed = nullptr, GBool reconstruct = false);
// Destructor.
~XRef();
@@ -248,7 +248,7 @@ private:
GBool readXRefStream(Stream *xrefStr, Goffset *pos);
GBool constructXRef(GBool *wasReconstructed, GBool needCatalogDict = gFalse);
GBool parseEntry(Goffset offset, XRefEntry *entry);
- void readXRefUntil(int untilEntryNum, std::vector<int> *xrefStreamObjsNum = NULL);
+ void readXRefUntil(int untilEntryNum, std::vector<int> *xrefStreamObjsNum = nullptr);
void markUnencrypted(Object *obj);
class XRefWriter {
diff --git a/splash/Splash.h b/splash/Splash.h
index 8817dc0a..86e7a1b4 100644
--- a/splash/Splash.h
+++ b/splash/Splash.h
@@ -92,7 +92,7 @@ public:
// Create a new rasterizer object.
Splash(SplashBitmap *bitmapA, GBool vectorAntialiasA,
- SplashScreenParams *screenParams = NULL);
+ SplashScreenParams *screenParams = nullptr);
Splash(SplashBitmap *bitmapA, GBool vectorAntialiasA,
SplashScreen *screenA);
diff --git a/splash/SplashBitmap.h b/splash/SplashBitmap.h
index ff4b5a4e..6ca20d3c 100644
--- a/splash/SplashBitmap.h
+++ b/splash/SplashBitmap.h
@@ -55,7 +55,7 @@ public:
// upside-down, i.e., with the last row first in memory.
SplashBitmap(int widthA, int heightA, int rowPad,
SplashColorMode modeA, GBool alphaA,
- GBool topDown = gTrue, GooList *separationList = NULL);
+ GBool topDown = gTrue, GooList *separationList = nullptr);
static SplashBitmap *copy(SplashBitmap *src);
~SplashBitmap();
diff --git a/splash/SplashScreen.h b/splash/SplashScreen.h
index da17ab02..b8fe7940 100644
--- a/splash/SplashScreen.h
+++ b/splash/SplashScreen.h
@@ -49,7 +49,7 @@ public:
// level <value> at (<x>, <y>).
int test(int x, int y, Guchar value) {
int xx, yy;
- if (mat == NULL) createMatrix();
+ if (mat == nullptr) createMatrix();
xx = x & sizeM1;
yy = y & sizeM1;
return value < mat[(yy << log2Size) + xx] ? 0 : 1;
@@ -58,7 +58,7 @@ public:
// Returns true if value is above the white threshold or below the
// black threshold, i.e., if the corresponding halftone will be
// solid white or black.
- GBool isStatic(Guchar value) { if (mat == NULL) createMatrix(); return value < minVal || value >= maxVal; }
+ GBool isStatic(Guchar value) { if (mat == nullptr) createMatrix(); return value < minVal || value >= maxVal; }
private:
void createMatrix();
diff --git a/utils/HtmlOutputDev.h b/utils/HtmlOutputDev.h
index 7ce6225a..1b44c05c 100644
--- a/utils/HtmlOutputDev.h
+++ b/utils/HtmlOutputDev.h
@@ -235,7 +235,7 @@ private:
class HtmlOutputDev: public OutputDev {
public:
- // Open a text output file. If <fileName> is NULL, no file is written
+ // Open a text output file. If <fileName> is nullptr, no file is written
// (this is useful, e.g., for searching text). If <useASCII7> is true,
// text is converted to 7-bit ASCII; otherwise, text is converted to
// 8-bit ISO Latin-1. <useASCII7> should also be set for Japanese
@@ -279,10 +279,10 @@ public:
int rotate, GBool useMediaBox, GBool crop,
int sliceX, int sliceY, int sliceW, int sliceH,
GBool printing,
- GBool (* abortCheckCbk)(void *data) = NULL,
- void * abortCheckCbkData = NULL,
- GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = NULL,
- void *annotDisplayDecideCbkData = NULL) override
+ GBool (* abortCheckCbk)(void *data) = nullptr,
+ void * abortCheckCbkData = nullptr,
+ GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = nullptr,
+ void *annotDisplayDecideCbkData = nullptr) override
{
docPage = page;
return gTrue;
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-12 22:08:01 +0000