From f4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Fri, 15 Jun 2018 12:46:15 +0200 Subject: =?UTF-8?q?Run=20clang-tidy=E2=80=99s=20modernize-use-nullptr=20pa?= =?UTF-8?q?ss.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This replaces all NULL or 0 with nullptr when assigned to or returned as a pointer. --- src/extension/internal/pdfinput/pdf-input.cpp | 18 +-- src/extension/internal/pdfinput/pdf-parser.cpp | 158 ++++++++++++------------ src/extension/internal/pdfinput/pdf-parser.h | 6 +- src/extension/internal/pdfinput/svg-builder.cpp | 104 ++++++++-------- src/extension/internal/pdfinput/svg-builder.h | 2 +- 5 files changed, 144 insertions(+), 144 deletions(-) (limited to 'src/extension/internal/pdfinput') diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp index 552051eed..d078b5a9b 100644 --- a/src/extension/internal/pdfinput/pdf-input.cpp +++ b/src/extension/internal/pdfinput/pdf-input.cpp @@ -357,7 +357,7 @@ PdfImportDialog::PdfImportDialog(PDFDoc *doc, const gchar */*uri*/) _preview_height = 300; // Init preview - _thumb_data = NULL; + _thumb_data = nullptr; _pageNumberSpin_adj->set_value(1.0); _current_page = 1; _setPreviewPage(_current_page); @@ -594,7 +594,7 @@ void PdfImportDialog::_setPreviewPage(int page) { if (!_render_thumb) { if (_thumb_data) { gfree(_thumb_data); - _thumb_data = NULL; + _thumb_data = nullptr; } if (!_previewed_page->loadThumb(&_thumb_data, &_thumb_width, &_thumb_height, &_thumb_rowstride)) { @@ -714,7 +714,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) { // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from // glib gstdio.c GooString *filename_goo = new GooString(uri); - PDFDoc *pdf_doc = new PDFDoc(filename_goo, NULL, NULL, NULL); // TODO: Could ask for password + PDFDoc *pdf_doc = new PDFDoc(filename_goo, nullptr, nullptr, nullptr); // TODO: Could ask for password //delete filename_goo; #else wchar_t *wfilename = reinterpret_cast(g_utf8_to_utf16 (uri, -1, NULL, NULL, NULL)); @@ -754,17 +754,17 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) { g_message("Failed to load document from data (error %d)", error); } - return NULL; + return nullptr; } - PdfImportDialog *dlg = NULL; + PdfImportDialog *dlg = nullptr; if (INKSCAPE.use_gui()) { dlg = new PdfImportDialog(pdf_doc, uri); if (!dlg->showDialog()) { _cancelled = true; delete dlg; delete pdf_doc; - return NULL; + return nullptr; } } @@ -779,12 +779,12 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) { #endif } - SPDocument *doc = NULL; + SPDocument *doc = nullptr; bool saved = false; if(!is_importvia_poppler) { // native importer - doc = SPDocument::createNewDoc(NULL, TRUE, TRUE); + doc = SPDocument::createNewDoc(nullptr, TRUE, TRUE); saved = DocumentUndo::getUndoSensitive(doc); DocumentUndo::setUndoSensitive(doc, false); // No need to undo in this temporary document @@ -802,7 +802,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) { dlg->getImportSettings(prefs); // Apply crop settings - PDFRectangle *clipToBox = NULL; + PDFRectangle *clipToBox = nullptr; double crop_setting; sp_repr_get_double(prefs, "cropTo", &crop_setting); diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp index caaeca18e..fbcb708fe 100644 --- a/src/extension/internal/pdfinput/pdf-parser.cpp +++ b/src/extension/internal/pdfinput/pdf-parser.cpp @@ -264,13 +264,13 @@ GfxPatch blankPatch() class ClipHistoryEntry { public: - ClipHistoryEntry(GfxPath *clipPath = NULL, GfxClipType clipType = clipNormal); + ClipHistoryEntry(GfxPath *clipPath = nullptr, GfxClipType clipType = clipNormal); virtual ~ClipHistoryEntry(); // Manipulate clip path stack ClipHistoryEntry *save(); ClipHistoryEntry *restore(); - GBool hasSaves() { return saved != NULL; } + GBool hasSaves() { return saved != nullptr; } void setClip(GfxPath *newClipPath, GfxClipType newClipType = clipNormal); GfxPath *getClipPath() { return clipPath; } GfxClipType getClipType() { return clipType; } @@ -300,18 +300,18 @@ PdfParser::PdfParser(XRef *xrefA, builder(builderA), subPage(gFalse), printCommands(false), - res(new GfxResources(xref, resDict, NULL)), // start the resource stack + res(new GfxResources(xref, resDict, nullptr)), // start the resource stack state(new GfxState(72.0, 72.0, box, rotate, gTrue)), fontChanged(gFalse), clip(clipNone), ignoreUndef(0), baseMatrix(), formDepth(0), - parser(NULL), + parser(nullptr), colorDeltas(), maxDepths(), clipHistory(new ClipHistoryEntry()), - operatorHistory(NULL) + operatorHistory(nullptr) { setDefaultApproximationPrecision(); builder->setDocumentSize(Inkscape::Util::Quantity::convert(state->getPageWidth(), "pt", "px"), @@ -357,18 +357,18 @@ PdfParser::PdfParser(XRef *xrefA, builder(builderA), subPage(gTrue), printCommands(false), - res(new GfxResources(xref, resDict, NULL)), // start the resource stack + res(new GfxResources(xref, resDict, nullptr)), // start the resource stack state(new GfxState(72, 72, box, 0, gFalse)), fontChanged(gFalse), clip(clipNone), ignoreUndef(0), baseMatrix(), formDepth(0), - parser(NULL), + parser(nullptr), colorDeltas(), maxDepths(), clipHistory(new ClipHistoryEntry()), - operatorHistory(NULL) + operatorHistory(nullptr) { setDefaultApproximationPrecision(); @@ -399,12 +399,12 @@ PdfParser::~PdfParser() { if (state) { delete state; - state = NULL; + state = nullptr; } if (clipHistory) { delete clipHistory; - clipHistory = NULL; + clipHistory = nullptr; } } @@ -436,7 +436,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) { parser = new Parser(xref, new Lexer(xref, obj), gFalse); go(topLevel); delete parser; - parser = NULL; + parser = nullptr; } void PdfParser::go(GBool /*topLevel*/) @@ -531,38 +531,38 @@ void PdfParser::pushOperator(const char *name) { OpHistoryEntry *newEntry = new OpHistoryEntry; newEntry->name = name; - newEntry->state = NULL; - newEntry->depth = (operatorHistory != NULL ? (operatorHistory->depth+1) : 0); + newEntry->state = nullptr; + newEntry->depth = (operatorHistory != nullptr ? (operatorHistory->depth+1) : 0); newEntry->next = operatorHistory; operatorHistory = newEntry; // Truncate list if needed if (operatorHistory->depth > maxOperatorHistoryDepth) { OpHistoryEntry *curr = operatorHistory; - OpHistoryEntry *prev = NULL; - while (curr && curr->next != NULL) { + OpHistoryEntry *prev = nullptr; + while (curr && curr->next != nullptr) { curr->depth--; prev = curr; curr = curr->next; } if (prev) { - if (curr->state != NULL) + if (curr->state != nullptr) delete curr->state; delete curr; - prev->next = NULL; + prev->next = nullptr; } } } const char *PdfParser::getPreviousOperator(unsigned int look_back) { - OpHistoryEntry *prev = NULL; - if (operatorHistory != NULL && look_back > 0) { + OpHistoryEntry *prev = nullptr; + if (operatorHistory != nullptr && look_back > 0) { prev = operatorHistory->next; - while (--look_back > 0 && prev != NULL) { + while (--look_back > 0 && prev != nullptr) { prev = prev->next; } } - if (prev != NULL) { + if (prev != nullptr) { return prev->name; } else { return ""; @@ -635,7 +635,7 @@ PdfOperator* PdfParser::findOp(char *name) { a = b = m; } if (cmp != 0) - return NULL; + return nullptr; return &opTab[a]; } @@ -712,7 +712,7 @@ void PdfParser::opConcat(Object args[], int /*numArgs*/) // TODO not good that numArgs is ignored but args[] is used: void PdfParser::opSetDash(Object args[], int /*numArgs*/) { - double *dash = 0; + double *dash = nullptr; Array *a = args[0].getArray(); int length = a->getLength(); @@ -770,7 +770,7 @@ void PdfParser::opSetLineWidth(Object args[], int /*numArgs*/) void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) { Object obj1, obj2, obj3, obj4, obj5; - Function *funcs[4] = {0, 0, 0, 0}; + Function *funcs[4] = {nullptr, nullptr, nullptr, nullptr}; GfxColor backdropColor; GBool haveBackdropColor = gFalse; GBool alpha = gFalse; @@ -876,7 +876,7 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) } if (obj2.isName(const_cast("Default")) || obj2.isName(const_cast("Identity"))) { - funcs[0] = funcs[1] = funcs[2] = funcs[3] = NULL; + funcs[0] = funcs[1] = funcs[2] = funcs[3] = nullptr; state->setTransfer(funcs); } else if (obj2.isArray() && obj2.arrayGetLength() == 4) { int pos = 4; @@ -900,7 +900,7 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) } } else if (obj2.isName() || obj2.isDict() || obj2.isStream()) { if ((funcs[0] = Function::parse(&obj2))) { - funcs[1] = funcs[2] = funcs[3] = NULL; + funcs[1] = funcs[2] = funcs[3] = nullptr; state->setTransfer(funcs); } } else if (!obj2.isNull()) { @@ -931,7 +931,7 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) #if !defined(POPPLER_NEW_OBJECT_API) obj3.free(); #endif - funcs[0] = NULL; + funcs[0] = nullptr; #if defined(POPPLER_NEW_OBJECT_API) if (!((obj3 = obj2.dictLookup(const_cast("TR"))).isNull())) { #else @@ -942,7 +942,7 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) funcs[0]->getOutputSize() != 1) { error(errSyntaxError, getPos(), "Invalid transfer function in soft mask in ExtGState"); delete funcs[0]; - funcs[0] = NULL; + funcs[0] = nullptr; } } #if defined(POPPLER_NEW_OBJECT_API) @@ -976,7 +976,7 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) if (obj2.dictLookup(const_cast("G"), &obj3)->isStream()) { if (obj3.streamGetDict()->lookup(const_cast("Group"), &obj4)->isDict()) { #endif - GfxColorSpace *blendingColorSpace = 0; + GfxColorSpace *blendingColorSpace = nullptr; GBool isolated = gFalse; GBool knockout = gFalse; #if defined(POPPLER_NEW_OBJECT_API) @@ -985,7 +985,7 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) if (!obj4.dictLookup(const_cast("CS"), &obj5)->isNull()) { #endif #if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) - blendingColorSpace = GfxColorSpace::parse(NULL, &obj5, NULL, NULL); + blendingColorSpace = GfxColorSpace::parse(nullptr, &obj5, nullptr, nullptr); #elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL); #else @@ -1140,7 +1140,7 @@ void PdfParser::doSoftMask(Object *str, GBool alpha, #else dict->lookup(const_cast("Resources"), &obj1); #endif - resDict = obj1.isDict() ? obj1.getDict() : (Dict *)NULL; + resDict = obj1.isDict() ? obj1.getDict() : (Dict *)nullptr; // draw it ++formDepth; @@ -1170,7 +1170,7 @@ void PdfParser::opSetFillGray(Object args[], int /*numArgs*/) { GfxColor color; - state->setFillPattern(NULL); + state->setFillPattern(nullptr); state->setFillColorSpace(new GfxDeviceGrayColorSpace()); color.c[0] = dblToCol(args[0].getNum()); state->setFillColor(&color); @@ -1182,7 +1182,7 @@ void PdfParser::opSetStrokeGray(Object args[], int /*numArgs*/) { GfxColor color; - state->setStrokePattern(NULL); + state->setStrokePattern(nullptr); state->setStrokeColorSpace(new GfxDeviceGrayColorSpace()); color.c[0] = dblToCol(args[0].getNum()); state->setStrokeColor(&color); @@ -1195,7 +1195,7 @@ void PdfParser::opSetFillCMYKColor(Object args[], int /*numArgs*/) GfxColor color; int i; - state->setFillPattern(NULL); + state->setFillPattern(nullptr); state->setFillColorSpace(new GfxDeviceCMYKColorSpace()); for (i = 0; i < 4; ++i) { color.c[i] = dblToCol(args[i].getNum()); @@ -1209,7 +1209,7 @@ void PdfParser::opSetStrokeCMYKColor(Object args[], int /*numArgs*/) { GfxColor color; - state->setStrokePattern(NULL); + state->setStrokePattern(nullptr); state->setStrokeColorSpace(new GfxDeviceCMYKColorSpace()); for (int i = 0; i < 4; ++i) { color.c[i] = dblToCol(args[i].getNum()); @@ -1223,7 +1223,7 @@ void PdfParser::opSetFillRGBColor(Object args[], int /*numArgs*/) { GfxColor color; - state->setFillPattern(NULL); + state->setFillPattern(nullptr); state->setFillColorSpace(new GfxDeviceRGBColorSpace()); for (int i = 0; i < 3; ++i) { color.c[i] = dblToCol(args[i].getNum()); @@ -1236,7 +1236,7 @@ void PdfParser::opSetFillRGBColor(Object args[], int /*numArgs*/) void PdfParser::opSetStrokeRGBColor(Object args[], int /*numArgs*/) { GfxColor color; - state->setStrokePattern(NULL); + state->setStrokePattern(nullptr); state->setStrokeColorSpace(new GfxDeviceRGBColorSpace()); for (int i = 0; i < 3; ++i) { color.c[i] = dblToCol(args[i].getNum()); @@ -1250,19 +1250,19 @@ void PdfParser::opSetFillColorSpace(Object args[], int /*numArgs*/) { Object obj; - state->setFillPattern(NULL); + state->setFillPattern(nullptr); #if defined(POPPLER_NEW_OBJECT_API) obj = res->lookupColorSpace(args[0].getName()); #else res->lookupColorSpace(args[0].getName(), &obj); #endif - GfxColorSpace *colorSpace = 0; + GfxColorSpace *colorSpace = nullptr; #if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) if (obj.isNull()) { - colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL); + colorSpace = GfxColorSpace::parse(nullptr, &args[0], nullptr, nullptr); } else { - colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL); + colorSpace = GfxColorSpace::parse(nullptr, &obj, nullptr, nullptr); } #elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) if (obj.isNull()) { @@ -1295,9 +1295,9 @@ void PdfParser::opSetFillColorSpace(Object args[], int /*numArgs*/) void PdfParser::opSetStrokeColorSpace(Object args[], int /*numArgs*/) { Object obj; - GfxColorSpace *colorSpace = 0; + GfxColorSpace *colorSpace = nullptr; - state->setStrokePattern(NULL); + state->setStrokePattern(nullptr); #if defined(POPPLER_NEW_OBJECT_API) obj = res->lookupColorSpace(args[0].getName()); #else @@ -1305,9 +1305,9 @@ void PdfParser::opSetStrokeColorSpace(Object args[], int /*numArgs*/) #endif #if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) if (obj.isNull()) { - colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL); + colorSpace = GfxColorSpace::parse(nullptr, &args[0], nullptr, nullptr); } else { - colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL); + colorSpace = GfxColorSpace::parse(nullptr, &obj, nullptr, nullptr); } #elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) if (obj.isNull()) { @@ -1344,7 +1344,7 @@ void PdfParser::opSetFillColor(Object args[], int numArgs) { error(errSyntaxError, getPos(), "Incorrect number of arguments in 'sc' command"); return; } - state->setFillPattern(NULL); + state->setFillPattern(nullptr); for (i = 0; i < numArgs; ++i) { color.c[i] = dblToCol(args[i].getNum()); } @@ -1360,7 +1360,7 @@ void PdfParser::opSetStrokeColor(Object args[], int numArgs) { error(errSyntaxError, getPos(), "Incorrect number of arguments in 'SC' command"); return; } - state->setStrokePattern(NULL); + state->setStrokePattern(nullptr); for (i = 0; i < numArgs; ++i) { color.c[i] = dblToCol(args[i].getNum()); } @@ -1391,7 +1391,7 @@ void PdfParser::opSetFillColorN(Object args[], int numArgs) { GfxPattern *pattern; #if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) if (args[numArgs-1].isName() && - (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) { + (pattern = res->lookupPattern(args[numArgs-1].getName(), nullptr, nullptr))) { state->setFillPattern(pattern); builder->updateStyle(state); } @@ -1408,7 +1408,7 @@ void PdfParser::opSetFillColorN(Object args[], int numArgs) { error(errSyntaxError, getPos(), "Incorrect number of arguments in 'scn' command"); return; } - state->setFillPattern(NULL); + state->setFillPattern(nullptr); for (i = 0; i < numArgs && i < gfxColorMaxComps; ++i) { if (args[i].isNum()) { color.c[i] = dblToCol(args[i].getNum()); @@ -1443,7 +1443,7 @@ void PdfParser::opSetStrokeColorN(Object args[], int numArgs) { GfxPattern *pattern; #if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) if (args[numArgs-1].isName() && - (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) { + (pattern = res->lookupPattern(args[numArgs-1].getName(), nullptr, nullptr))) { state->setStrokePattern(pattern); builder->updateStyle(state); } @@ -1460,7 +1460,7 @@ void PdfParser::opSetStrokeColorN(Object args[], int numArgs) { error(errSyntaxError, getPos(), "Incorrect number of arguments in 'SCN' command"); return; } - state->setStrokePattern(NULL); + state->setStrokePattern(nullptr); for (i = 0; i < numArgs && i < gfxColorMaxComps; ++i) { if (args[i].isNum()) { color.c[i] = dblToCol(args[i].getNum()); @@ -1856,16 +1856,16 @@ void PdfParser::doShadingPatternFillFallback(GfxShadingPattern *sPat, // TODO not good that numArgs is ignored but args[] is used: void PdfParser::opShFill(Object args[], int /*numArgs*/) { - GfxShading *shading = 0; - GfxPath *savedPath = NULL; + GfxShading *shading = nullptr; + GfxPath *savedPath = nullptr; double xMin, yMin, xMax, yMax; double xTemp, yTemp; double gradientTransform[6]; - double *matrix = NULL; + double *matrix = nullptr; GBool savedState = gFalse; #if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) - if (!(shading = res->lookupShading(args[0].getName(), NULL, NULL))) { + if (!(shading = res->lookupShading(args[0].getName(), nullptr, nullptr))) { return; } #else @@ -1883,7 +1883,7 @@ void PdfParser::opShFill(Object args[], int /*numArgs*/) // check proper operator sequence // first there should be one W(*) and then one 'cm' somewhere before 'sh' GBool seenClip, seenConcat; - seenClip = (clipHistory->getClipPath() != NULL); + seenClip = (clipHistory->getClipPath() != nullptr); seenConcat = gFalse; int i = 1; while (i <= maxOperatorHistoryDepth) { @@ -1909,7 +1909,7 @@ void PdfParser::opShFill(Object args[], int /*numArgs*/) // clip to bbox if (shading->getHasBBox()) { shading->getBBox(&xMin, &yMin, &xMax, &yMax); - if (matrix != NULL) { + if (matrix != nullptr) { xTemp = matrix[0]*xMin + matrix[2]*yMin + matrix[4]; yTemp = matrix[1]*xMin + matrix[3]*yMin + matrix[5]; state->moveTo(xTemp, yTemp); @@ -2374,7 +2374,7 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/) if (!font) { // unsetting the font (drawing no text) is better than using the // previous one and drawing random glyphs from it - state->setFont(NULL, args[1].getNum()); + state->setFont(nullptr, args[1].getNum()); fontChanged = gTrue; return; } @@ -2539,7 +2539,7 @@ void PdfParser::opMoveSetShowText(Object args[], int /*numArgs*/) // TODO not good that numArgs is ignored but args[] is used: void PdfParser::opShowSpaceText(Object args[], int /*numArgs*/) { - Array *a = 0; + Array *a = nullptr; Object obj; int wMode = 0; @@ -2586,7 +2586,7 @@ void PdfParser::doShowText(const GooString *s) { int wMode; double riseX, riseY; CharCode code; - Unicode *u = NULL; + Unicode *u = nullptr; double x, y, dx, dy, tdx, tdy; double originX, originY, tOriginX, tOriginY; double oldCTM[6], newCTM[6]; @@ -3009,7 +3009,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) } if (!obj1.isNull()) { #if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) - colorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL); + colorSpace = GfxColorSpace::parse(nullptr, &obj1, nullptr, nullptr); #elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); #else @@ -3022,7 +3022,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) } else if (csMode == streamCSDeviceCMYK) { colorSpace = new GfxDeviceCMYKColorSpace(); } else { - colorSpace = NULL; + colorSpace = nullptr; } #if !defined(POPPLER_NEW_OBJECT_API) obj1.free(); @@ -3055,11 +3055,11 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) // get the mask int maskColors[2*gfxColorMaxComps]; haveColorKeyMask = haveExplicitMask = haveSoftMask = gFalse; - Stream *maskStr = NULL; + Stream *maskStr = nullptr; int maskWidth = 0; int maskHeight = 0; maskInvert = gFalse; - GfxImageColorMap *maskColorMap = NULL; + GfxImageColorMap *maskColorMap = nullptr; #if defined(POPPLER_NEW_OBJECT_API) maskObj = dict->lookup(const_cast("Mask")); smaskObj = dict->lookup(const_cast("SMask")); @@ -3180,7 +3180,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) } } #if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) - GfxColorSpace *maskColorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL); + GfxColorSpace *maskColorSpace = GfxColorSpace::parse(nullptr, &obj1, nullptr, nullptr); #elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); #else @@ -3355,7 +3355,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) maskStr, maskWidth, maskHeight, maskInvert, maskInterpolate); } else { builder->addImage(state, str, width, height, colorMap, interpolate, - haveColorKeyMask ? maskColors : static_cast(NULL)); + haveColorKeyMask ? maskColors : static_cast(nullptr)); } delete colorMap; @@ -3468,11 +3468,11 @@ void PdfParser::doForm(Object *str) { #else dict->lookup(const_cast("Resources"), &resObj); #endif - resDict = resObj.isDict() ? resObj.getDict() : (Dict *)NULL; + resDict = resObj.isDict() ? resObj.getDict() : (Dict *)nullptr; // check for a transparency group transpGroup = isolated = knockout = gFalse; - blendingColorSpace = NULL; + blendingColorSpace = nullptr; #if defined(POPPLER_NEW_OBJECT_API) if ((obj1 = dict->lookup(const_cast("Group"))).isDict()) { if ((obj2 = obj1.dictLookup(const_cast("S"))).isName(const_cast("Transparency"))) { @@ -3487,7 +3487,7 @@ void PdfParser::doForm(Object *str) { if (!obj1.dictLookup(const_cast("CS"), &obj3)->isNull()) { #endif #if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) - blendingColorSpace = GfxColorSpace::parse(NULL, &obj3, NULL, NULL); + blendingColorSpace = GfxColorSpace::parse(nullptr, &obj3, nullptr, nullptr); #elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL); #else @@ -3640,7 +3640,7 @@ void PdfParser::opBeginImage(Object /*args*/[], int /*numArgs*/) // display the image if (str) { - doImage(NULL, str, gTrue); + doImage(nullptr, str, gTrue); // skip 'EI' tag int c1 = str->getUndecodedStream()->getChar(); @@ -3701,7 +3701,7 @@ Stream *PdfParser::buildImageStream() { obj.free(); dict.free(); #endif - return NULL; + return nullptr; } #if !defined(POPPLER_NEW_OBJECT_API) obj.free(); @@ -3806,7 +3806,7 @@ void PdfParser::saveState() { bool is_radial = false; GfxPattern *pattern = state->getFillPattern(); - if (pattern != NULL) + if (pattern != nullptr) if (pattern->getType() == 2 ) { GfxShadingPattern *shading_pattern = static_cast(pattern); GfxShading *shading = shading_pattern->getShading(); @@ -3861,8 +3861,8 @@ void PdfParser::setApproximationPrecision(int shadingType, double colorDelta, //------------------------------------------------------------------------ ClipHistoryEntry::ClipHistoryEntry(GfxPath *clipPathA, GfxClipType clipTypeA) : - saved(NULL), - clipPath((clipPathA) ? clipPathA->copy() : NULL), + saved(nullptr), + clipPath((clipPathA) ? clipPathA->copy() : nullptr), clipType(clipTypeA) { } @@ -3871,7 +3871,7 @@ ClipHistoryEntry::~ClipHistoryEntry() { if (clipPath) { delete clipPath; - clipPath = NULL; + clipPath = nullptr; } } @@ -3884,7 +3884,7 @@ void ClipHistoryEntry::setClip(GfxPath *clipPathA, GfxClipType clipTypeA) { clipPath = clipPathA->copy(); clipType = clipTypeA; } else { - clipPath = NULL; + clipPath = nullptr; clipType = clipNormal; } } @@ -3901,7 +3901,7 @@ ClipHistoryEntry *ClipHistoryEntry::restore() { if (saved) { oldEntry = saved; - saved = NULL; + saved = nullptr; delete this; // TODO really should avoid deleting from inside. } else { oldEntry = this; @@ -3915,10 +3915,10 @@ ClipHistoryEntry::ClipHistoryEntry(ClipHistoryEntry *other) { this->clipPath = other->clipPath->copy(); this->clipType = other->clipType; } else { - this->clipPath = NULL; + this->clipPath = nullptr; this->clipType = clipNormal; } - saved = NULL; + saved = nullptr; } #endif /* HAVE_POPPLER */ diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h index f985b15ca..755e6741b 100644 --- a/src/extension/internal/pdfinput/pdf-parser.h +++ b/src/extension/internal/pdfinput/pdf-parser.h @@ -295,10 +295,10 @@ private: void doForm(Object *str); void doForm1(Object *str, Dict *resDict, double *matrix, 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); // in-line image operators void opBeginImage(Object args[], int numArgs); diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp index 8e5a5f639..59481b9eb 100644 --- a/src/extension/internal/pdfinput/svg-builder.cpp +++ b/src/extension/internal/pdfinput/svg-builder.cpp @@ -109,14 +109,14 @@ SvgBuilder::~SvgBuilder() { } void SvgBuilder::_init() { - _font_style = NULL; - _current_font = NULL; - _font_specification = NULL; + _font_style = nullptr; + _current_font = nullptr; + _font_specification = nullptr; _font_scaling = 1; _need_font_update = true; _in_text_object = false; _invalidated_style = true; - _current_state = NULL; + _current_state = nullptr; _width = 0; _height = 0; @@ -128,9 +128,9 @@ void SvgBuilder::_init() { _availableFontNames.push_back(pango_font_family_get_name(*iter)); } - _transp_group_stack = NULL; + _transp_group_stack = nullptr; SvgGraphicsState initial_state; - initial_state.softmask = NULL; + initial_state.softmask = nullptr; initial_state.group_depth = 0; _state_stack.push_back(initial_state); _node_stack.push_back(_container); @@ -186,7 +186,7 @@ Inkscape::XML::Node *SvgBuilder::pushNode(const char *name) { } Inkscape::XML::Node *SvgBuilder::popNode() { - Inkscape::XML::Node *node = NULL; + Inkscape::XML::Node *node = nullptr; if ( _node_stack.size() > 1 ) { node = _node_stack.back(); _node_stack.pop_back(); @@ -215,7 +215,7 @@ Inkscape::XML::Node *SvgBuilder::pushGroup() { setAsLayer(_docname); } } - if (_container->parent()->attribute("inkscape:groupmode") != NULL) { + if (_container->parent()->attribute("inkscape:groupmode") != nullptr) { _ttm[0] = _ttm[3] = 1.0; // clear ttm if parent is a layer _ttm[1] = _ttm[2] = _ttm[4] = _ttm[5] = 0.0; _ttm_is_set = false; @@ -379,7 +379,7 @@ void SvgBuilder::_setStrokeStyle(SPCSSAttr *css, GfxState *state) { sp_repr_css_set_property(css, "stroke-dashoffset", os_offset.str().c_str()); } else { sp_repr_css_set_property(css, "stroke-dasharray", "none"); - sp_repr_css_set_property(css, "stroke-dashoffset", NULL); + sp_repr_css_set_property(css, "stroke-dashoffset", nullptr); } } @@ -503,7 +503,7 @@ void SvgBuilder::addShadedFill(GfxShading *shading, double *matrix, GfxPath *pat SPObject *clip_obj = _doc->getObjectById(clip_path_id); if (clip_obj) { clip_obj->deleteObject(); - node->setAttribute("clip-path", NULL); + node->setAttribute("clip-path", nullptr); TRACE(("removed clipping path: %s\n", clip_path_id)); } break; @@ -570,7 +570,7 @@ bool SvgBuilder::getTransform(double *transform) { void SvgBuilder::setTransform(double c0, double c1, double c2, double c3, double c4, double c5) { // do not remember the group which is a layer - if ((_container->attribute("inkscape:groupmode") == NULL) && !_ttm_is_set) { + if ((_container->attribute("inkscape:groupmode") == nullptr) && !_ttm_is_set) { _ttm[0] = c0; _ttm[1] = c1; _ttm[2] = c2; @@ -581,7 +581,7 @@ void SvgBuilder::setTransform(double c0, double c1, double c2, double c3, } // Avoid transforming a group with an already set clip-path - if ( _container->attribute("clip-path") != NULL ) { + if ( _container->attribute("clip-path") != nullptr ) { pushGroup(); } TRACE(("setTransform: %f %f %f %f %f %f\n", c0, c1, c2, c3, c4, c5)); @@ -598,7 +598,7 @@ void SvgBuilder::setTransform(double const *transform) { * Used by PdfParser to decide when to do fallback operations. */ bool SvgBuilder::isPatternTypeSupported(GfxPattern *pattern) { - if ( pattern != NULL ) { + if ( pattern != nullptr ) { if ( pattern->getType() == 2 ) { // shading pattern GfxShading *shading = (static_cast(pattern))->getShading(); int shadingType = shading->getType(); @@ -622,8 +622,8 @@ bool SvgBuilder::isPatternTypeSupported(GfxPattern *pattern) { * \return a url pointing to the created pattern */ gchar *SvgBuilder::_createPattern(GfxPattern *pattern, GfxState *state, bool is_stroke) { - gchar *id = NULL; - if ( pattern != NULL ) { + gchar *id = nullptr; + if ( pattern != nullptr ) { if ( pattern->getType() == 2 ) { // Shading pattern GfxShadingPattern *shading_pattern = static_cast(pattern); double *ptm; @@ -656,7 +656,7 @@ gchar *SvgBuilder::_createPattern(GfxPattern *pattern, GfxState *state, bool is_ id = _createTilingPattern(static_cast(pattern), state, is_stroke); } } else { - return NULL; + return nullptr; } gchar *urltext = g_strdup_printf ("url(#%s)", id); g_free(id); @@ -719,7 +719,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern, GfxPatternColorSpace *pat_cs = (GfxPatternColorSpace *)( is_stroke ? state->getStrokeColorSpace() : state->getFillColorSpace() ); // Set fill/stroke colors if this is an uncolored tiling pattern - GfxColorSpace *cs = NULL; + GfxColorSpace *cs = nullptr; if ( tiling_pattern->getPaintType() == 2 && ( cs = pat_cs->getUnder() ) ) { GfxState *pattern_state = pdf_parser->getState(); pattern_state->setFillColorSpace(cs->copy()); @@ -785,7 +785,7 @@ gchar *SvgBuilder::_createGradient(GfxShading *shading, double *matrix, bool for num_funcs = radial_shading->getNFuncs(); func = radial_shading->getFunc(0); } else { // Unsupported shading type - return NULL; + return nullptr; } gradient->setAttribute("gradientUnits", "userSpaceOnUse"); // If needed, flip the gradient transform around the y axis @@ -807,7 +807,7 @@ gchar *SvgBuilder::_createGradient(GfxShading *shading, double *matrix, bool for if ( num_funcs > 1 || !_addGradientStops(gradient, shading, func) ) { Inkscape::GC::release(gradient); - return NULL; + return nullptr; } Inkscape::XML::Node *defs = _doc->getDefs()->getRepr(); @@ -827,8 +827,8 @@ void SvgBuilder::_addStopToGradient(Inkscape::XML::Node *gradient, double offset Inkscape::XML::Node *stop = _xml_doc->createElement("svg:stop"); SPCSSAttr *css = sp_repr_css_attr_new(); Inkscape::CSSOStringStream os_opacity; - gchar *color_text = NULL; - if ( _transp_group_stack != NULL && _transp_group_stack->for_softmask ) { + gchar *color_text = nullptr; + if ( _transp_group_stack != nullptr && _transp_group_stack->for_softmask ) { double gray = (double)color->r / 65535.0; gray = CLAMP(gray, 0.0, 1.0); os_opacity << gray; @@ -1028,9 +1028,9 @@ void SvgBuilder::updateFont(GfxState *state) { // Prune the font name to get the correct font family name // In a PDF font names can look like this: IONIPB+MetaPlusBold-Italic - char *font_family = NULL; - char *font_style = NULL; - char *font_style_lowercase = NULL; + char *font_family = nullptr; + char *font_style = nullptr; + char *font_style_lowercase = nullptr; char *plus_sign = strstr(_font_specification, "+"); if (plus_sign) { font_family = g_strdup(plus_sign + 1); @@ -1038,7 +1038,7 @@ void SvgBuilder::updateFont(GfxState *state) { } else { font_family = g_strdup(_font_specification); } - char *style_delim = NULL; + char *style_delim = nullptr; if ( ( style_delim = g_strrstr(font_family, "-") ) || ( style_delim = g_strrstr(font_family, ",") ) ) { font_style = style_delim + 1; @@ -1077,7 +1077,7 @@ void SvgBuilder::updateFont(GfxState *state) { // Font weight GfxFont::Weight font_weight = font->getWeight(); - char *css_font_weight = NULL; + char *css_font_weight = nullptr; if ( font_weight != GfxFont::WeightNotDefined ) { if ( font_weight == GfxFont::W400 ) { css_font_weight = (char*) "normal"; @@ -1109,7 +1109,7 @@ void SvgBuilder::updateFont(GfxState *state) { // Font stretch GfxFont::Stretch font_stretch = font->getStretch(); - gchar *stretch_value = NULL; + gchar *stretch_value = nullptr; switch (font_stretch) { case GfxFont::UltraCondensed: stretch_value = (char*) "ultra-condensed"; @@ -1141,7 +1141,7 @@ void SvgBuilder::updateFont(GfxState *state) { default: break; } - if ( stretch_value != NULL ) { + if ( stretch_value != nullptr ) { sp_repr_css_set_property(_font_style, "font-stretch", stretch_value); } @@ -1250,7 +1250,7 @@ void SvgBuilder::_flushText() { bool same_coords[2] = {true, true}; Geom::Point last_delta_pos; unsigned int glyphs_in_a_row = 0; - Inkscape::XML::Node *tspan_node = NULL; + Inkscape::XML::Node *tspan_node = nullptr; Glib::ustring x_coords; Glib::ustring y_coords; Glib::ustring text_buffer; @@ -1415,7 +1415,7 @@ void SvgBuilder::addChar(GfxState *state, double x, double y, uu[i] = u[i]; } - gchar *tmp = g_utf16_to_utf8(uu, uLen, NULL, NULL, NULL); + gchar *tmp = g_utf16_to_utf8(uu, uLen, nullptr, nullptr, nullptr); if ( tmp && *tmp ) { new_glyph.code = tmp; } else { @@ -1492,20 +1492,20 @@ Inkscape::XML::Node *SvgBuilder::_createImage(Stream *str, int width, int height bool invert_alpha) { // Create PNG write struct - png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - if ( png_ptr == NULL ) { - return NULL; + png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr); + if ( png_ptr == nullptr ) { + return nullptr; } // Create PNG info struct png_infop info_ptr = png_create_info_struct(png_ptr); - if ( info_ptr == NULL ) { - png_destroy_write_struct(&png_ptr, NULL); - return NULL; + if ( info_ptr == nullptr ) { + png_destroy_write_struct(&png_ptr, nullptr); + return nullptr; } // Set error handler if (setjmp(png_jmpbuf(png_ptr))) { png_destroy_write_struct(&png_ptr, &info_ptr); - return NULL; + return nullptr; } // Decide whether we should embed this image int attr_value = 1; @@ -1514,8 +1514,8 @@ Inkscape::XML::Node *SvgBuilder::_createImage(Stream *str, int width, int height // Set read/write functions Inkscape::IO::StringOutputStream base64_string; Inkscape::IO::Base64OutputStream base64_stream(base64_string); - FILE *fp = NULL; - gchar *file_name = NULL; + FILE *fp = nullptr; + gchar *file_name = nullptr; if (embed_image) { base64_stream.setColumnWidth(0); // Disable line breaks png_set_write_fn(png_ptr, &base64_stream, png_write_base64stream, png_flush_base64stream); @@ -1523,10 +1523,10 @@ Inkscape::XML::Node *SvgBuilder::_createImage(Stream *str, int width, int height static int counter = 0; file_name = g_strdup_printf("%s_img%d.png", _docname, counter++); fp = fopen(file_name, "wb"); - if ( fp == NULL ) { + if ( fp == nullptr ) { png_destroy_write_struct(&png_ptr, &info_ptr); g_free(file_name); - return NULL; + return nullptr; } png_init_io(png_ptr, fp); } @@ -1646,7 +1646,7 @@ Inkscape::XML::Node *SvgBuilder::_createImage(Stream *str, int width, int height fclose(fp); g_free(file_name); } - return NULL; + return nullptr; } delete image_stream; str->close(); @@ -1712,7 +1712,7 @@ Inkscape::XML::Node *SvgBuilder::_createMask(double width, double height) { if ( !( defs && !strcmp(defs->name(), "svg:defs") ) ) { // Create node defs = _xml_doc->createElement("svg:defs"); - _root->addChild(defs, NULL); + _root->addChild(defs, nullptr); Inkscape::GC::release(defs); defs = _root->firstChild(); } @@ -1754,12 +1754,12 @@ void SvgBuilder::addImageMask(GfxState *state, Stream *str, int width, int heigh // Scaling 1x1 surfaces might not work so skip setting a mask with this size if ( width > 1 || height > 1 ) { Inkscape::XML::Node *mask_image_node = - _createImage(str, width, height, NULL, interpolate, NULL, true, invert); + _createImage(str, width, height, nullptr, interpolate, nullptr, true, invert); if (mask_image_node) { // Create the mask Inkscape::XML::Node *mask_node = _createMask(1.0, 1.0); // Remove unnecessary transformation from the mask image - mask_image_node->setAttribute("transform", NULL); + mask_image_node->setAttribute("transform", nullptr); mask_node->appendChild(mask_image_node); Inkscape::GC::release(mask_image_node); gchar *mask_url = g_strdup_printf("url(#%s)", mask_node->attribute("id")); @@ -1779,13 +1779,13 @@ void SvgBuilder::addMaskedImage(GfxState * /*state*/, Stream *str, int width, in bool invert_mask, bool mask_interpolate) { Inkscape::XML::Node *mask_image_node = _createImage(mask_str, mask_width, mask_height, - NULL, mask_interpolate, NULL, true, invert_mask); - Inkscape::XML::Node *image_node = _createImage(str, width, height, color_map, interpolate, NULL); + nullptr, mask_interpolate, nullptr, true, invert_mask); + Inkscape::XML::Node *image_node = _createImage(str, width, height, color_map, interpolate, nullptr); if ( mask_image_node && image_node ) { // Create mask for the image Inkscape::XML::Node *mask_node = _createMask(1.0, 1.0); // Remove unnecessary transformation from the mask image - mask_image_node->setAttribute("transform", NULL); + mask_image_node->setAttribute("transform", nullptr); mask_node->appendChild(mask_image_node); // Scale the mask to the size of the image Geom::Affine mask_transform((double)width, 0.0, 0.0, (double)height, 0.0, 0.0); @@ -1812,13 +1812,13 @@ void SvgBuilder::addSoftMaskedImage(GfxState * /*state*/, Stream *str, int width GfxImageColorMap *mask_color_map, bool mask_interpolate) { Inkscape::XML::Node *mask_image_node = _createImage(mask_str, mask_width, mask_height, - mask_color_map, mask_interpolate, NULL, true); - Inkscape::XML::Node *image_node = _createImage(str, width, height, color_map, interpolate, NULL); + mask_color_map, mask_interpolate, nullptr, true); + Inkscape::XML::Node *image_node = _createImage(str, width, height, color_map, interpolate, nullptr); if ( mask_image_node && image_node ) { // Create mask for the image Inkscape::XML::Node *mask_node = _createMask(1.0, 1.0); // Remove unnecessary transformation from the mask image - mask_image_node->setAttribute("transform", NULL); + mask_image_node->setAttribute("transform", nullptr); mask_node->appendChild(mask_image_node); // Set mask and add image gchar *mask_url = g_strdup_printf("url(#%s)", mask_node->attribute("id")); @@ -1902,7 +1902,7 @@ void SvgBuilder::setSoftMask(GfxState * /*state*/, double * /*bbox*/, bool /*alp void SvgBuilder::clearSoftMask(GfxState * /*state*/) { if (_state_stack.back().softmask) { - _state_stack.back().softmask = NULL; + _state_stack.back().softmask = nullptr; popGroup(); } } diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h index ed2a4d48e..499724a4c 100644 --- a/src/extension/internal/pdfinput/svg-builder.h +++ b/src/extension/internal/pdfinput/svg-builder.h @@ -94,7 +94,7 @@ public: // Property setting void setDocumentSize(double width, double height); // Document size in px - void setAsLayer(char *layer_name=NULL); + void setAsLayer(char *layer_name=nullptr); void setGroupOpacity(double opacity); Inkscape::XML::Node *getPreferences() { return _preferences; -- cgit v1.2.3