From ed44167c0e99d4aed9f2142be6a3347b4e015f4b Mon Sep 17 00:00:00 2001 From: uvos Date: Sat, 18 Nov 2023 16:26:20 +0100 Subject: [PATCH] use correct deleter for data pointer --- jpeg_img.cpp | 4 ++-- webcam.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jpeg_img.cpp b/jpeg_img.cpp index 0615343..d5656a9 100644 --- a/jpeg_img.cpp +++ b/jpeg_img.cpp @@ -25,7 +25,7 @@ Image decompressJpegImage(const unsigned char* buffer, size_t size) image.channels = info.num_components; // 3 = RGB, 4 = RGBA // read RGB(A) scanlines one at a time into jdata[] - image.data = std::shared_ptr(new unsigned char[image.size()], std::default_delete()); + image.data = std::shared_ptr(new unsigned char[image.size()], std::default_delete()); unsigned char* rowptr; while(info.output_scanline < image.height) { @@ -58,7 +58,7 @@ Image decompressJpegImage(FILE *file) image.channels = info.num_components; // 3 = RGB, 4 = RGBA // read RGB(A) scanlines one at a time into jdata[] - image.data = std::shared_ptr(new unsigned char[image.size()], std::default_delete()); + image.data = std::shared_ptr(new unsigned char[image.size()], std::default_delete()); unsigned char* rowptr; while ( info.output_scanline < image.height ) { diff --git a/webcam.cpp b/webcam.cpp index 9817d30..26576a7 100644 --- a/webcam.cpp +++ b/webcam.cpp @@ -100,7 +100,7 @@ Webcam::Webcam(const string& device, int width, int height, bool mjpeg, bool pas rgb_frame.width = xres; rgb_frame.height = yres; rgb_frame.channels = 3; - rgb_frame.data = std::shared_ptr(new unsigned char[rgb_frame.size()], std::default_delete()); + rgb_frame.data = std::shared_ptr(new unsigned char[rgb_frame.size()], std::default_delete()); start_capturing(); } @@ -162,12 +162,12 @@ const Image& Webcam::frame(int timeout) { if(format == V4L2_PIX_FMT_YUYV) { - rgb_frame.setBuffer(std::shared_ptr(new unsigned char[buffers[idx].size], std::default_delete()), + rgb_frame.setBuffer(std::shared_ptr(new unsigned char[buffers[idx].size], std::default_delete()), buffers[idx].size, Image::FORMAT_YUYV); } else if(format == V4L2_PIX_FMT_MJPEG) { - rgb_frame.setBuffer(std::shared_ptr(new unsigned char[buffers[idx].size], std::default_delete()), + rgb_frame.setBuffer(std::shared_ptr(new unsigned char[buffers[idx].size], std::default_delete()), buffers[idx].size, Image::FORMAT_RGB); } else