Convert some NULL instances to nullptr.

diff --git a/analyzer.cpp b/analyzer.cpp
index d48176036a1df67c3b9e132757351c4c9fb2e726..b24b46a26ff52457ae3893f7cbf6b1253a1b2f24 100644 (file)
--- a/analyzer.cpp
+++ b/analyzer.cpp
@@ -69,7 +69,7 @@ Analyzer::Analyzer()
 
         glGenBuffers(1, &pbo);
         glBindBuffer(GL_PIXEL_PACK_BUFFER_ARB, pbo);
-        glBufferData(GL_PIXEL_PACK_BUFFER_ARB, global_flags.width * global_flags.height * 4, NULL, GL_STREAM_READ);
+        glBufferData(GL_PIXEL_PACK_BUFFER_ARB, global_flags.width * global_flags.height * 4, nullptr, GL_STREAM_READ);
 
        ui->histogram->xAxis->setVisible(true);
        ui->histogram->yAxis->setVisible(false);

diff --git a/chroma_subsampler.cpp b/chroma_subsampler.cpp
index 80e24670a0a5f8acbcbfe24cfcbcff524aa027fc..96adef1eedb9d360aea76136a17abafa760e8f29 100644 (file)
--- a/chroma_subsampler.cpp
+++ b/chroma_subsampler.cpp
@@ -237,7 +237,7 @@ void main()
                check_error();
                if (success == GL_FALSE) {
                        GLchar error_log[1024] = {0};
-                       glGetProgramInfoLog(v210_program_num, 1024, NULL, error_log);
+                       glGetProgramInfoLog(v210_program_num, 1024, nullptr, error_log);
                        fprintf(stderr, "Error linking program: %s\n", error_log);
                        exit(1);
                }

diff --git a/decklink_output.cpp b/decklink_output.cpp
index 2285bb2a7ceed3b7ac1237224447f8c70ce78380..091e1b769018026af491d34b4d0df63bd7f2b5c0 100644 (file)
--- a/decklink_output.cpp
+++ b/decklink_output.cpp
@@ -524,7 +524,7 @@ unique_ptr<DeckLinkOutput::Frame> DeckLinkOutput::get_frame()
        check_error();
        glBindBuffer(GL_PIXEL_PACK_BUFFER, frame->pbo);
        check_error();
-       glBufferStorage(GL_PIXEL_PACK_BUFFER, stride * height, NULL, GL_MAP_READ_BIT | GL_MAP_PERSISTENT_BIT);
+       glBufferStorage(GL_PIXEL_PACK_BUFFER, stride * height, nullptr, GL_MAP_READ_BIT | GL_MAP_PERSISTENT_BIT);
        check_error();
        frame->uyvy_ptr = (uint8_t *)glMapBufferRange(GL_PIXEL_PACK_BUFFER, 0, stride * height, GL_MAP_READ_BIT | GL_MAP_PERSISTENT_BIT);
        check_error();

diff --git a/pbo_frame_allocator.cpp b/pbo_frame_allocator.cpp
index 84a75e442fee38ff96bc61913f143e091d0d7ee3..bdd9beb8f0a034c6ba777178e916697a78e7d0d6 100644 (file)
--- a/pbo_frame_allocator.cpp
+++ b/pbo_frame_allocator.cpp
@@ -36,7 +36,7 @@ PBOFrameAllocator::PBOFrameAllocator(bmusb::PixelFormat pixel_format, size_t fra
                check_error();
                glBindBuffer(buffer, pbo);
                check_error();
-               glBufferStorage(buffer, frame_size, NULL, permissions | GL_MAP_PERSISTENT_BIT);
+               glBufferStorage(buffer, frame_size, nullptr, permissions | GL_MAP_PERSISTENT_BIT);
                check_error();
 
                Frame frame;
@@ -117,7 +117,7 @@ PBOFrameAllocator::PBOFrameAllocator(bmusb::PixelFormat pixel_format, size_t fra
                                check_error();
                                if (field == 0) {
                                        userdata[i].last_v210_width[0] = v210_width;
-                                       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB10_A2, v210_width, height, 0, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, NULL);
+                                       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB10_A2, v210_width, height, 0, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, nullptr);
                                        check_error();
                                }
 
@@ -125,7 +125,7 @@ PBOFrameAllocator::PBOFrameAllocator(bmusb::PixelFormat pixel_format, size_t fra
                                check_error();
                                set_clamp_to_edge();
                                if (field == 0) {
-                                       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB10_A2, width, height, 0, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, NULL);
+                                       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB10_A2, width, height, 0, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, nullptr);
                                        check_error();
                                }
                                break;
@@ -135,7 +135,7 @@ PBOFrameAllocator::PBOFrameAllocator(bmusb::PixelFormat pixel_format, size_t fra
                                check_error();
                                set_clamp_to_edge();
                                if (field == 0) {
-                                       glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, width, height, 0, GL_RED, GL_UNSIGNED_BYTE, NULL);
+                                       glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, width, height, 0, GL_RED, GL_UNSIGNED_BYTE, nullptr);
                                        check_error();
                                }
 
@@ -143,7 +143,7 @@ PBOFrameAllocator::PBOFrameAllocator(bmusb::PixelFormat pixel_format, size_t fra
                                check_error();
                                set_clamp_to_edge();
                                if (field == 0) {
-                                       glTexImage2D(GL_TEXTURE_2D, 0, GL_RG8, width / 2, height, 0, GL_RG, GL_UNSIGNED_BYTE, NULL);
+                                       glTexImage2D(GL_TEXTURE_2D, 0, GL_RG8, width / 2, height, 0, GL_RG, GL_UNSIGNED_BYTE, nullptr);
                                        check_error();
                                }
                                break;
@@ -153,9 +153,9 @@ PBOFrameAllocator::PBOFrameAllocator(bmusb::PixelFormat pixel_format, size_t fra
                                set_clamp_to_edge();
                                if (field == 0) {
                                        if (global_flags.can_disable_srgb_decoder) {  // See the comments in tweaked_inputs.h.
-                                               glTexImage2D(GL_TEXTURE_2D, 0, GL_SRGB8_ALPHA8, width, height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
+                                               glTexImage2D(GL_TEXTURE_2D, 0, GL_SRGB8_ALPHA8, width, height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, nullptr);
                                        } else {
-                                               glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
+                                               glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, nullptr);
                                        }
                                        check_error();
                                }
@@ -165,7 +165,7 @@ PBOFrameAllocator::PBOFrameAllocator(bmusb::PixelFormat pixel_format, size_t fra
                                check_error();
                                set_clamp_to_edge();
                                if (field == 0) {
-                                       glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, width, height, 0, GL_RED, GL_UNSIGNED_BYTE, NULL);
+                                       glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, width, height, 0, GL_RED, GL_UNSIGNED_BYTE, nullptr);
                                        check_error();
                                }
 
@@ -173,7 +173,7 @@ PBOFrameAllocator::PBOFrameAllocator(bmusb::PixelFormat pixel_format, size_t fra
                                check_error();
                                set_clamp_to_edge();
                                if (field == 0) {
-                                       glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, width / 2, height, 0, GL_RED, GL_UNSIGNED_BYTE, NULL);
+                                       glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, width / 2, height, 0, GL_RED, GL_UNSIGNED_BYTE, nullptr);
                                        check_error();
                                }
 
@@ -181,7 +181,7 @@ PBOFrameAllocator::PBOFrameAllocator(bmusb::PixelFormat pixel_format, size_t fra
                                check_error();
                                set_clamp_to_edge();
                                if (field == 0) {
-                                       glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, width / 2, height, 0, GL_RED, GL_UNSIGNED_BYTE, NULL);
+                                       glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, width / 2, height, 0, GL_RED, GL_UNSIGNED_BYTE, nullptr);
                                        check_error();
                                }
                                break;
@@ -280,7 +280,7 @@ void PBOFrameAllocator::release_frame(Frame frame)
                check_error();
                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
                check_error();
-               glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, userdata->last_width[field], userdata->last_height[field], 0, GL_RED, GL_UNSIGNED_BYTE, NULL);
+               glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, userdata->last_width[field], userdata->last_height[field], 0, GL_RED, GL_UNSIGNED_BYTE, nullptr);
                check_error();
 
                glBindTexture(GL_TEXTURE_2D, userdata->tex_cbcr[field]);
@@ -291,7 +291,7 @@ void PBOFrameAllocator::release_frame(Frame frame)
                check_error();
                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
                check_error();
-               glTexImage2D(GL_TEXTURE_2D, 0, GL_RG8, userdata->last_width[field] / 2, userdata->last_height[field], 0, GL_RED, GL_UNSIGNED_BYTE, NULL);
+               glTexImage2D(GL_TEXTURE_2D, 0, GL_RG8, userdata->last_width[field] / 2, userdata->last_height[field], 0, GL_RED, GL_UNSIGNED_BYTE, nullptr);
                check_error();
        }
 #endif

diff --git a/v210_converter.cpp b/v210_converter.cpp
index 715dd5f9d796ed5436f62c65249af1a9ea8803e3..d10920b2c6d73c5b0e29acb4e04b2a03909d70bf 100644 (file)
--- a/v210_converter.cpp
+++ b/v210_converter.cpp
@@ -111,7 +111,7 @@ void main()
        check_error();
        if (success == GL_FALSE) {
                GLchar error_log[1024] = {0};
-               glGetProgramInfoLog(shader.glsl_program_num, 1024, NULL, error_log);
+               glGetProgramInfoLog(shader.glsl_program_num, 1024, nullptr, error_log);
                fprintf(stderr, "Error linking program: %s\n", error_log);
                exit(1);
        }