Use nullptr in extensions

This uses clang-tidy's `modernize-use-nullptr` check.

Author: QuLogic

src/_backend_agg.cpp

@@ -10,9 +10,9 @@ RendererAgg::RendererAgg(unsigned int width, unsigned int height, double dpi)
       height(height),
       dpi(dpi),
       NUMBYTES((size_t)width * (size_t)height * 4),
-      pixBuffer(NULL),
+      pixBuffer(nullptr),
       renderingBuffer(),
-      alphaBuffer(NULL),
+      alphaBuffer(nullptr),
       alphaMaskRenderingBuffer(),
       alphaMask(alphaMaskRenderingBuffer),
       pixfmtAlphaMask(alphaMaskRenderingBuffer),
@@ -26,7 +26,7 @@ RendererAgg::RendererAgg(unsigned int width, unsigned int height, double dpi)
       rendererAA(),
       rendererBin(),
       theRasterizer(32768),
-      lastclippath(NULL),
+      lastclippath(nullptr),
       _fill_color(agg::rgba(1, 1, 1, 0))
 {
     if (dpi <= 0.0) {
@@ -75,7 +75,7 @@ BufferRegion *RendererAgg::copy_from_bbox(agg::rect_d in_rect)
     agg::rect_i rect(
         (int)in_rect.x1, height - (int)in_rect.y2, (int)in_rect.x2, height - (int)in_rect.y1);
 
-    BufferRegion *reg = NULL;
+    BufferRegion *reg = nullptr;
     reg = new BufferRegion(rect);
 
     agg::rendering_buffer rbuf;
@@ -90,21 +90,21 @@ BufferRegion *RendererAgg::copy_from_bbox(agg::rect_d in_rect)
 
 void RendererAgg::restore_region(BufferRegion &region)
 {
-    if (region.get_data() == NULL) {
+    if (region.get_data() == nullptr) {
         throw std::runtime_error("Cannot restore_region from NULL data");
     }
 
     agg::rendering_buffer rbuf;
     rbuf.attach(region.get_data(), region.get_width(), region.get_height(), region.get_stride());
 
-    rendererBase.copy_from(rbuf, 0, region.get_rect().x1, region.get_rect().y1);
+    rendererBase.copy_from(rbuf, nullptr, region.get_rect().x1, region.get_rect().y1);
 }
 
 // Restore the part of the saved region with offsets
 void
 RendererAgg::restore_region(BufferRegion &region, int xx1, int yy1, int xx2, int yy2, int x, int y )
 {
-    if (region.get_data() == NULL) {
+    if (region.get_data() == nullptr) {
         throw std::runtime_error("Cannot restore_region from NULL data");
     }
 

src/_backend_agg.h

@@ -883,7 +883,7 @@ inline void RendererAgg::draw_image(GCAgg &gc,
     } else {
         set_clipbox(gc.cliprect, rendererBase);
         rendererBase.blend_from(
-            pixf, 0, (int)x, (int)(height - (y + image.shape(0))), (agg::int8u)(alpha * 255));
+            pixf, nullptr, (int)x, (int)(height - (y + image.shape(0))), (agg::int8u)(alpha * 255));
     }
 
     rendererBase.reset_clipping(true);

src/_c_internal_utils.cpp

@@ -43,11 +43,11 @@ mpl_display_is_valid(void)
         && (libX11 = dlopen("libX11.so.6", RTLD_LAZY))) {
         typedef struct Display* (*XOpenDisplay_t)(char const*);
         typedef int (*XCloseDisplay_t)(struct Display*);
-        struct Display* display = NULL;
+        struct Display* display = nullptr;
         XOpenDisplay_t XOpenDisplay = (XOpenDisplay_t)dlsym(libX11, "XOpenDisplay");
         XCloseDisplay_t XCloseDisplay = (XCloseDisplay_t)dlsym(libX11, "XCloseDisplay");
         if (XOpenDisplay && XCloseDisplay
-                && (display = XOpenDisplay(NULL))) {
+                && (display = XOpenDisplay(nullptr))) {
             XCloseDisplay(display);
         }
         if (dlclose(libX11)) {
@@ -62,13 +62,13 @@ mpl_display_is_valid(void)
         && (libwayland_client = dlopen("libwayland-client.so.0", RTLD_LAZY))) {
         typedef struct wl_display* (*wl_display_connect_t)(char const*);
         typedef void (*wl_display_disconnect_t)(struct wl_display*);
-        struct wl_display* display = NULL;
+        struct wl_display* display = nullptr;
         wl_display_connect_t wl_display_connect =
             (wl_display_connect_t)dlsym(libwayland_client, "wl_display_connect");
         wl_display_disconnect_t wl_display_disconnect =
             (wl_display_disconnect_t)dlsym(libwayland_client, "wl_display_disconnect");
         if (wl_display_connect && wl_display_disconnect
-                && (display = wl_display_connect(NULL))) {
+                && (display = wl_display_connect(nullptr))) {
             wl_display_disconnect(display);
         }
         if (dlclose(libwayland_client)) {

src/_path.h

@@ -1084,7 +1084,7 @@ void __add_number(double val, char format_code, int precision,
         buffer += str;
     } else {
         char *str = PyOS_double_to_string(
-          val, format_code, precision, Py_DTSF_ADD_DOT_0, NULL);
+          val, format_code, precision, Py_DTSF_ADD_DOT_0, nullptr);
         // Delete trailing zeros and decimal point
         char *c = str + strlen(str) - 1;  // Start at last character.
         // Rewind through all the zeros and, if present, the trailing decimal

src/_qhull_wrapper.cpp

@@ -167,13 +167,13 @@ delaunay_impl(py::ssize_t npoints, const double* x, const double* y,
     }
 
     /* qhull expects a FILE* to write errors to. */
-    FILE* error_file = NULL;
+    FILE* error_file = nullptr;
     if (hide_qhull_errors) {
         /* qhull errors are ignored by writing to OS-equivalent of /dev/null.
          * Rather than have OS-specific code here, instead it is determined by
          * meson.build and passed in via the macro MPL_DEVNULL. */
         error_file = fopen(STRINGIFY(MPL_DEVNULL), "w");
-        if (error_file == NULL) {
+        if (error_file == nullptr) {
             throw std::runtime_error("Could not open devnull");
         }
     }
@@ -186,7 +186,7 @@ delaunay_impl(py::ssize_t npoints, const double* x, const double* y,
     QhullInfo info(error_file, qh);
     qh_zero(qh, error_file);
     exitcode = qh_new_qhull(qh, ndim, (int)npoints, points.data(), False,
-                            (char*)"qhull d Qt Qbb Qc Qz", NULL, error_file);
+                            (char*)"qhull d Qt Qbb Qc Qz", nullptr, error_file);
     if (exitcode != qh_ERRnone) {
         std::string msg =
             py::str("Error in qhull Delaunay triangulation calculation: {} (exitcode={})")

src/_tkagg.cpp

@@ -300,7 +300,7 @@ load_tkinter_funcs()
     // Load tkinter global funcs from tkinter compiled module.
 
     // Try loading from the main program namespace first.
-    auto main_program = dlopen(NULL, RTLD_LAZY);
+    auto main_program = dlopen(nullptr, RTLD_LAZY);
     auto success = load_tcl_tk(main_program);
     // We don't need to keep a reference open as the main program always exists.
     if (dlclose(main_program)) {

src/_ttconv.cpp

@@ -28,7 +28,7 @@ class PythonFileWriter : public TTStreamWriter
     virtual void write(const char *a)
     {
         PyObject* decoded = PyUnicode_DecodeLatin1(a, strlen(a), "");
-        if (decoded == NULL) {
+        if (decoded == nullptr) {
             throw py::error_already_set();
         }
         _write_method(py::handle(decoded));

src/ft2font.cpp

@@ -63,12 +63,12 @@ void throw_ft_error(std::string message, FT_Error error) {
     throw std::runtime_error(os.str());
 }
 
-FT2Image::FT2Image() : m_buffer(NULL), m_width(0), m_height(0)
+FT2Image::FT2Image() : m_buffer(nullptr), m_width(0), m_height(0)
 {
 }
 
 FT2Image::FT2Image(unsigned long width, unsigned long height)
-    : m_buffer(NULL), m_width(0), m_height(0)
+    : m_buffer(nullptr), m_width(0), m_height(0)
 {
     resize(width, height);
 }
@@ -91,7 +91,7 @@ void FT2Image::resize(long width, long height)
     if ((unsigned long)width != m_width || (unsigned long)height != m_height) {
         if (numBytes > m_width * m_height) {
             delete[] m_buffer;
-            m_buffer = NULL;
+            m_buffer = nullptr;
             m_buffer = new unsigned char[numBytes];
         }
 
@@ -259,7 +259,7 @@ FT2Font::FT2Font(FT_Open_Args &open_args,
                  long hinting_factor_,
                  std::vector<FT2Font *> &fallback_list,
                  FT2Font::WarnFunc warn)
-    : ft_glyph_warn(warn), image(), face(NULL)
+    : ft_glyph_warn(warn), image(), face(nullptr)
 {
     clear();
 
@@ -280,12 +280,12 @@ FT2Font::FT2Font(FT_Open_Args &open_args,
         throw_ft_error("Could not set the fontsize", error);
     }
 
-    if (open_args.stream != NULL) {
+    if (open_args.stream != nullptr) {
         face->face_flags |= FT_FACE_FLAG_EXTERNAL_STREAM;
     }
 
     FT_Matrix transform = { 65536 / hinting_factor, 0, 0, 65536 };
-    FT_Set_Transform(face, &transform, 0);
+    FT_Set_Transform(face, &transform, nullptr);
 
     // Set fallbacks
     std::copy(fallback_list.begin(), fallback_list.end(), std::back_inserter(fallbacks));
@@ -329,7 +329,7 @@ void FT2Font::set_size(double ptsize, double dpi)
         throw_ft_error("Could not set the fontsize", error);
     }
     FT_Matrix transform = { 65536 / hinting_factor, 0, 0, 65536 };
-    FT_Set_Transform(face, &transform, 0);
+    FT_Set_Transform(face, &transform, nullptr);
 
     for (auto & fallback : fallbacks) {
         fallback->set_size(ptsize, dpi);
@@ -418,7 +418,7 @@ void FT2Font::set_text(
     bbox.xMax = bbox.yMax = -32000;
 
     FT_UInt previous = 0;
-    FT2Font *previous_ft_object = NULL;
+    FT2Font *previous_ft_object = nullptr;
 
     for (auto codepoint : text) {
         FT_UInt glyph_index = 0;
@@ -454,8 +454,8 @@ void FT2Font::set_text(
         FT_Glyph &thisGlyph = glyphs[glyphs.size() - 1];
 
         last_advance = ft_object_with_glyph->get_face()->glyph->advance.x;
-        FT_Glyph_Transform(thisGlyph, 0, &pen);
-        FT_Glyph_Transform(thisGlyph, &matrix, 0);
+        FT_Glyph_Transform(thisGlyph, nullptr, &pen);
+        FT_Glyph_Transform(thisGlyph, &matrix, nullptr);
         xys.push_back(pen.x);
         xys.push_back(pen.y);
 
@@ -490,7 +490,7 @@ void FT2Font::load_char(long charcode, FT_Int32 flags, FT2Font *&ft_object, bool
     if (fallback && char_to_font.find(charcode) != char_to_font.end()) {
         ft_object = char_to_font[charcode];
         // since it will be assigned to ft_object anyway
-        FT2Font *throwaway = NULL;
+        FT2Font *throwaway = nullptr;
         ft_object->load_char(charcode, flags, throwaway, false);
     } else if (fallback) {
         FT_UInt final_glyph_index;
@@ -515,7 +515,7 @@ void FT2Font::load_char(long charcode, FT_Int32 flags, FT2Font *&ft_object, bool
         ft_object = this;
         FT_UInt glyph_index = FT_Get_Char_Index(face, (FT_ULong) charcode);
         if (!glyph_index){
-            glyph_seen_fonts.insert((face != NULL)?face->family_name: NULL);
+            glyph_seen_fonts.insert((face != nullptr)?face->family_name: nullptr);
             ft_glyph_warn((FT_ULong)charcode, glyph_seen_fonts);
         }
         if (FT_Error error = FT_Load_Glyph(face, glyph_index, flags)) {
@@ -634,7 +634,7 @@ void FT2Font::load_glyph(FT_UInt glyph_index, FT_Int32 flags)
 
 FT_UInt FT2Font::get_char_index(FT_ULong charcode, bool fallback = false)
 {
-    FT2Font *ft_object = NULL;
+    FT2Font *ft_object = nullptr;
     if (fallback && char_to_font.find(charcode) != char_to_font.end()) {
         // fallback denotes whether we want to search fallback list.
         // should call set_text/load_char_with_fallback to parent FT2Font before
@@ -674,7 +674,7 @@ void FT2Font::draw_glyphs_to_bitmap(bool antialiased)
 
     for (auto & glyph : glyphs) {
         FT_Error error = FT_Glyph_To_Bitmap(
-            &glyph, antialiased ? FT_RENDER_MODE_NORMAL : FT_RENDER_MODE_MONO, 0, 1);
+            &glyph, antialiased ? FT_RENDER_MODE_NORMAL : FT_RENDER_MODE_MONO, nullptr, 1);
         if (error) {
             throw_ft_error("Could not convert glyph to bitmap", error);
         }

src/ft2font_wrapper.cpp

@@ -180,9 +180,9 @@ PyFT2Font_init(py::object filename, long hinting_factor = 8,
     }
 
     PyFT2Font *self = new PyFT2Font();
-    self->x = NULL;
+    self->x = nullptr;
     memset(&self->stream, 0, sizeof(FT_StreamRec));
-    self->stream.base = NULL;
+    self->stream.base = nullptr;
     self->stream.size = 0x7fffffff;  // Unknown size.
     self->stream.pos = 0;
     self->stream.descriptor.pointer = self;
@@ -219,7 +219,7 @@ PyFT2Font_init(py::object filename, long hinting_factor = 8,
                 "First argument must be a path to a font file or a binary-mode file object");
         }
         self->py_file = filename;
-        self->stream.close = NULL;
+        self->stream.close = nullptr;
     }
 
     self->x = new FT2Font(open_args, hinting_factor, fallback_fonts, ft_glyph_warn);
@@ -368,7 +368,7 @@ PyFT2Font_load_char(PyFT2Font *self, long charcode,
                     FT_Int32 flags = FT_LOAD_FORCE_AUTOHINT)
 {
     bool fallback = true;
-    FT2Font *ft_object = NULL;
+    FT2Font *ft_object = nullptr;
 
     self->x->load_char(charcode, flags, ft_object, fallback);
 
@@ -395,7 +395,7 @@ PyFT2Font_load_glyph(PyFT2Font *self, FT_UInt glyph_index,
                      FT_Int32 flags = FT_LOAD_FORCE_AUTOHINT)
 {
     bool fallback = true;
-    FT2Font *ft_object = NULL;
+    FT2Font *ft_object = nullptr;
 
     self->x->load_glyph(glyph_index, flags, ft_object, fallback);
 
@@ -815,7 +815,7 @@ static const char *
 PyFT2Font_postscript_name(PyFT2Font *self)
 {
     const char *ps_name = FT_Get_Postscript_Name(self->x->get_face());
-    if (ps_name == NULL) {
+    if (ps_name == nullptr) {
         ps_name = "UNAVAILABLE";
     }
 
@@ -832,7 +832,7 @@ static const char *
 PyFT2Font_family_name(PyFT2Font *self)
 {
     const char *name = self->x->get_face()->family_name;
-    if (name == NULL) {
+    if (name == nullptr) {
         name = "UNAVAILABLE";
     }
     return name;
@@ -842,7 +842,7 @@ static const char *
 PyFT2Font_style_name(PyFT2Font *self)
 {
     const char *name = self->x->get_face()->style_name;
-    if (name == NULL) {
+    if (name == nullptr) {
         name = "UNAVAILABLE";
     }
     return name;
@@ -959,7 +959,7 @@ PYBIND11_MODULE(ft2font, m)
         import_array();
         return &m;
     };
-    if (ia() == NULL) {
+    if (ia() == nullptr) {
         throw py::error_already_set();
     }