griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: ASAN error running tests with color management processing

Browse Source 
processor_apply_func expected a different return type.

Pull Request: https://projects.blender.org/blender/blender/pulls/133885
This commit is contained in:
Brecht Van Lommel
2025-01-31 18:45:46 +01:00
committed by Brecht Van Lommel
parent 12748e5521
commit e2fd3f64fa
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/imbuf/IMB_imbuf.hh
View File

@@ -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,

10
source/blender/imbuf/intern/colormanagement.cc
View File

@@ -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,

2
source/blender/imbuf/intern/imageprocess.cc
View File

@@ -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;