fix callback ptr from PR realsenseai#9336

Author: maloel

src/rs.cpp

@@ -3234,12 +3234,8 @@ const rs2_raw_data_buffer* rs2_run_tare_calibration_cpp(rs2_device* device, floa
 
     auto auto_calib = VALIDATE_INTERFACE(device->device, librealsense::auto_calibrated_interface);
 
-    std::vector<uint8_t> buffer;
     std::string json((char*)json_content, (char*)json_content + content_size);
-    if (progress_callback == nullptr)
-        buffer = auto_calib->run_tare_calibration(timeout_ms, ground_truth_mm, json, nullptr);
-    else
-        buffer = auto_calib->run_tare_calibration(timeout_ms, ground_truth_mm, json, { progress_callback, [](rs2_update_progress_callback* p) { p->release(); } });
+    std::vector< uint8_t > buffer = auto_calib->run_tare_calibration( timeout_ms, ground_truth_mm, json, callback_ptr );
 
     return new rs2_raw_data_buffer{ buffer };
 }
@@ -3782,6 +3778,12 @@ NOEXCEPT_RETURN(, to_pixel)
 const rs2_raw_data_buffer* rs2_run_focal_length_calibration_cpp(rs2_device* device, rs2_frame_queue* left, rs2_frame_queue* right, float target_w, float target_h, 
     int adjust_both_sides, float* ratio, float* angle, rs2_update_progress_callback * progress_callback, rs2_error** error) BEGIN_API_CALL
 {
+    // Take ownership of the callback ASAP or else memory leaks could result if we throw! (the caller usually does a
+    // 'new' when calling us)
+    update_progress_callback_ptr callback_ptr;
+    if( progress_callback )
+        callback_ptr.reset( progress_callback, []( rs2_update_progress_callback * p ) { p->release(); } );
+
     VALIDATE_NOT_NULL(device);
     VALIDATE_NOT_NULL(left);
     VALIDATE_NOT_NULL(right);
@@ -3794,11 +3796,8 @@ const rs2_raw_data_buffer* rs2_run_focal_length_calibration_cpp(rs2_device* devi
     VALIDATE_RANGE(adjust_both_sides, 0, 1);
 
     auto auto_calib = VALIDATE_INTERFACE(device->device, librealsense::auto_calibrated_interface);
-    std::vector<uint8_t> buffer;
-    if (progress_callback == nullptr)
-        buffer = auto_calib->run_focal_length_calibration(left, right, target_w, target_h, adjust_both_sides, ratio, angle, nullptr);
-    else
-        buffer = auto_calib->run_focal_length_calibration(left, right, target_w, target_h, adjust_both_sides, ratio, angle, { progress_callback, [](rs2_update_progress_callback* p) { p->release(); } });
+    std::vector< uint8_t > buffer =
+        auto_calib->run_focal_length_calibration( left, right, target_w, target_h, adjust_both_sides, ratio, angle, callback_ptr );
 
     return new rs2_raw_data_buffer{ buffer };
 }
@@ -3835,6 +3834,12 @@ HANDLE_EXCEPTIONS_AND_RETURN(nullptr, device, left, right, ratio, angle)
 const rs2_raw_data_buffer* rs2_run_uv_map_calibration_cpp(rs2_device* device, rs2_frame_queue* left, rs2_frame_queue* color, rs2_frame_queue* depth, int py_px_only,
     float* health, int health_size, rs2_update_progress_callback* progress_callback, rs2_error** error) BEGIN_API_CALL
 {
+    // Take ownership of the callback ASAP or else memory leaks could result if we throw! (the caller usually does a
+    // 'new' when calling us)
+    update_progress_callback_ptr callback_ptr;
+    if( progress_callback )
+        callback_ptr.reset( progress_callback, []( rs2_update_progress_callback * p ) { p->release(); } );
+
     VALIDATE_NOT_NULL(device);
     VALIDATE_NOT_NULL(left);
     VALIDATE_NOT_NULL(color);
@@ -3847,11 +3852,8 @@ const rs2_raw_data_buffer* rs2_run_uv_map_calibration_cpp(rs2_device* device, rs
     VALIDATE_RANGE(py_px_only, 0, 1);
 
     auto auto_calib = VALIDATE_INTERFACE(device->device, librealsense::auto_calibrated_interface);
-    std::vector<uint8_t> buffer;
-    if (progress_callback == nullptr)
-        buffer = auto_calib->run_uv_map_calibration(left, color, depth, py_px_only, health, health_size, nullptr);
-    else
-        buffer = auto_calib->run_uv_map_calibration(left, color, depth, py_px_only, health, health_size, { progress_callback, [](rs2_update_progress_callback* p) { p->release(); } });
+    std::vector< uint8_t > buffer
+        = auto_calib->run_uv_map_calibration( left, color, depth, py_px_only, health, health_size, callback_ptr );
 
     return new rs2_raw_data_buffer{ buffer };
 }
@@ -3889,20 +3891,20 @@ HANDLE_EXCEPTIONS_AND_RETURN(nullptr, device, left, color, depth, health)
 float rs2_calculate_target_z_cpp(rs2_device* device, rs2_frame_queue* queue, float target_width, float target_height,
     rs2_update_progress_callback* progress_callback, rs2_error** error) BEGIN_API_CALL
 {
+    // Take ownership of the callback ASAP or else memory leaks could result if we throw! (the caller usually does a
+    // 'new' when calling us)
+    update_progress_callback_ptr callback_ptr;
+    if( progress_callback )
+        callback_ptr.reset( progress_callback, []( rs2_update_progress_callback * p ) { p->release(); } );
+
     VALIDATE_NOT_NULL(device);
     VALIDATE_NOT_NULL(queue);
     VALIDATE_GT(target_width, 0.f);
     VALIDATE_GT(target_height, 0.f);
     VALIDATE_GT(rs2_frame_queue_size(queue, error), 0);
 
     auto auto_calib = VALIDATE_INTERFACE(device->device, librealsense::auto_calibrated_interface);
-
-    if (progress_callback == NULL)
-        return auto_calib->calculate_target_z(queue, target_width, target_height, nullptr);
-    else
-    {
-        return auto_calib->calculate_target_z(queue, target_width, target_height, { progress_callback, [](rs2_update_progress_callback* p) { p->release(); } });
-    }
+    return auto_calib->calculate_target_z( queue, target_width, target_height, callback_ptr );
 }
 HANDLE_EXCEPTIONS_AND_RETURN(-1.f, device, queue, target_width, target_height)