noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Replace remaining uses of NULL with nullptr

Browse Source 
Follow-up to #38736 (these uses were likely added after this PR was merged).
This commit is contained in:
Rémi Verschelde
2021-04-29 11:47:24 +02:00
parent c11502711e
commit 5b16020846
32 changed files with 98 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/camera/camera_osx.mm
View File

@@ -106,15 +106,15 @@
if (input) {
[self removeInput:input];
// don't release this
input = NULL;
input = nullptr;
}
// free up our output
if (output) {
[self removeOutput:output];
[output setSampleBufferDelegate:nil queue:NULL];
[output setSampleBufferDelegate:nil queue:nullptr];
[output release];
output = NULL;
output = nullptr;
}
[self commitConfiguration];
@@ -141,9 +141,9 @@
// get our buffers
unsigned char *dataY = (unsigned char *)CVPixelBufferGetBaseAddressOfPlane(pixelBuffer, 0);
unsigned char *dataCbCr = (unsigned char *)CVPixelBufferGetBaseAddressOfPlane(pixelBuffer, 1);
if (dataY == NULL) {
if (dataY == nullptr) {
print_line("Couldn't access Y pixel buffer data");
} else if (dataCbCr == NULL) {
} else if (dataCbCr == nullptr) {
print_line("Couldn't access CbCr pixel buffer data");
} else {
Ref<Image> img[2];
@@ -220,8 +220,8 @@ AVCaptureDevice *CameraFeedOSX::get_device() const {
};
CameraFeedOSX::CameraFeedOSX() {
device = NULL;
capture_session = NULL;
device = nullptr;
capture_session = nullptr;
};
void CameraFeedOSX::set_device(AVCaptureDevice *p_device) {
@@ -240,14 +240,14 @@ void CameraFeedOSX::set_device(AVCaptureDevice *p_device) {
};
CameraFeedOSX::~CameraFeedOSX() {
if (capture_session != NULL) {
if (capture_session != nullptr) {
[capture_session release];
capture_session = NULL;
capture_session = nullptr;
};
if (device != NULL) {
if (device != nullptr) {
[device release];
device = NULL;
device = nullptr;
};
};
@@ -267,7 +267,7 @@ void CameraFeedOSX::deactivate_feed() {
if (capture_session) {
[capture_session cleanup];
[capture_session release];
capture_session = NULL;
capture_session = nullptr;
};
};