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/cairo-renderer.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/extension/internal/cairo-renderer.cpp') diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp index b48be2ed7..05605a9d9 100644 --- a/src/extension/internal/cairo-renderer.cpp +++ b/src/extension/internal/cairo-renderer.cpp @@ -117,9 +117,9 @@ CairoRenderContext* CairoRenderer::createContext(void) { CairoRenderContext *new_context = new CairoRenderContext(this); - g_assert( new_context != NULL ); + g_assert( new_context != nullptr ); - new_context->_state = NULL; + new_context->_state = nullptr; // create initial render state CairoRenderState *state = new_context->_createState(); @@ -516,7 +516,7 @@ static void sp_asbitmap_render(SPItem *item, CairoRenderContext *ctx) SPDocument *document = item->document; std::unique_ptr pb( - sp_generate_internal_bitmap(document, NULL, + sp_generate_internal_bitmap(document, nullptr, bbox->min()[Geom::X], bbox->min()[Geom::Y], bbox->max()[Geom::X], bbox->max()[Geom::Y], width, height, res, res, (guint32) 0xffffff00, item )); @@ -653,7 +653,7 @@ CairoRenderer::setupDocument(CairoRenderContext *ctx, SPDocument *doc, bool page { // PLEASE note when making changes to the boundingbox and transform calculation, corresponding changes should be made to PDFLaTeXRenderer::setupDocument !!! - g_assert( ctx != NULL ); + g_assert( ctx != nullptr ); if (!base) { base = doc->getRoot(); @@ -710,9 +710,9 @@ CairoRenderer::setupDocument(CairoRenderContext *ctx, SPDocument *doc, bool page void CairoRenderer::applyClipPath(CairoRenderContext *ctx, SPClipPath const *cp) { - g_assert( ctx != NULL && ctx->_is_valid ); + g_assert( ctx != nullptr && ctx->_is_valid ); - if (cp == NULL) + if (cp == nullptr) return; CairoRenderContext::CairoRenderMode saved_mode = ctx->getRenderMode(); @@ -766,9 +766,9 @@ CairoRenderer::applyClipPath(CairoRenderContext *ctx, SPClipPath const *cp) void CairoRenderer::applyMask(CairoRenderContext *ctx, SPMask const *mask) { - g_assert( ctx != NULL && ctx->_is_valid ); + g_assert( ctx != nullptr && ctx->_is_valid ); - if (mask == NULL) + if (mask == nullptr) return; // FIXME: the access to the first mask view to obtain the bbox is completely bogus -- cgit v1.2.3