diff --git a/source/blender/imbuf/IMB_imbuf.hh b/source/blender/imbuf/IMB_imbuf.hh index 78a30c5ca4c..6d112bd7435 100644 --- a/source/blender/imbuf/IMB_imbuf.hh +++ b/source/blender/imbuf/IMB_imbuf.hh @@ -581,7 +581,7 @@ void IMB_processor_apply_threaded( int handle_size, void *init_customdata, void(init_handle)(void *handle, int start_line, int tot_line, void *customdata), - void *(do_thread)(void *)); + void(do_thread)(void *)); using ScanlineThreadFunc = void (*)(void *custom_data, int scanline); void IMB_processor_apply_threaded_scanlines(int total_scanlines, diff --git a/source/blender/imbuf/intern/colormanagement.cc b/source/blender/imbuf/intern/colormanagement.cc index c55393099b3..97e459b4ce6 100644 --- a/source/blender/imbuf/intern/colormanagement.cc +++ b/source/blender/imbuf/intern/colormanagement.cc @@ -1769,13 +1769,13 @@ static void do_display_buffer_apply_no_processor(DisplayBufferThread *handle) } } -static void *do_display_buffer_apply_thread(void *handle_v) +static void do_display_buffer_apply_thread(void *handle_v) { DisplayBufferThread *handle = (DisplayBufferThread *)handle_v; ColormanageProcessor *cm_processor = handle->cm_processor; if (cm_processor == nullptr) { do_display_buffer_apply_no_processor(handle); - return nullptr; + return; } float *display_buffer = handle->display_buffer; @@ -1828,8 +1828,6 @@ static void *do_display_buffer_apply_thread(void *handle_v) } MEM_freeN(linear_buffer); - - return nullptr; } static void display_buffer_apply_threaded(ImBuf *ibuf, @@ -2010,7 +2008,7 @@ static void processor_transform_init_handle(void *handle_v, handle->float_from_byte = float_from_byte; } -static void *do_processor_transform_thread(void *handle_v) +static void do_processor_transform_thread(void *handle_v) { ProcessorTransformThread *handle = (ProcessorTransformThread *)handle_v; uchar *byte_buffer = handle->byte_buffer; @@ -2045,8 +2043,6 @@ static void *do_processor_transform_thread(void *handle_v) handle->cm_processor, float_buffer, width, height, channels, predivide); } } - - return nullptr; } static void processor_transform_apply_threaded(uchar *byte_buffer, diff --git a/source/blender/imbuf/intern/imageprocess.cc b/source/blender/imbuf/intern/imageprocess.cc index 838a6e3e6cf..debbbbdb370 100644 --- a/source/blender/imbuf/intern/imageprocess.cc +++ b/source/blender/imbuf/intern/imageprocess.cc @@ -67,7 +67,7 @@ void IMB_processor_apply_threaded( int handle_size, void *init_customdata, void(init_handle)(void *handle, int start_line, int tot_line, void *customdata), - void *(do_thread)(void *)) + void(do_thread)(void *)) { const int lines_per_task = 64;