From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat --- source/blender/imbuf/IMB_colormanagement.h | 321 +++++++++++++++++++---------- 1 file changed, 214 insertions(+), 107 deletions(-) (limited to 'source/blender/imbuf/IMB_colormanagement.h') diff --git a/source/blender/imbuf/IMB_colormanagement.h b/source/blender/imbuf/IMB_colormanagement.h index c042e17cf80..5978066f4a8 100644 --- a/source/blender/imbuf/IMB_colormanagement.h +++ b/source/blender/imbuf/IMB_colormanagement.h @@ -29,7 +29,6 @@ #define BCM_CONFIG_FILE "config.ocio" - struct ColorManagedColorspaceSettings; struct ColorManagedDisplaySettings; struct ColorManagedViewSettings; @@ -47,8 +46,9 @@ struct ColorSpace; void IMB_colormanagement_check_file_config(struct Main *bmain); -void IMB_colormanagement_validate_settings(const struct ColorManagedDisplaySettings *display_settings, - struct ColorManagedViewSettings *view_settings); +void IMB_colormanagement_validate_settings( + const struct ColorManagedDisplaySettings *display_settings, + struct ColorManagedViewSettings *view_settings); const char *IMB_colormanagement_role_colorspace_name_get(int role); void IMB_colormanagement_check_is_data(struct ImBuf *ibuf, const char *name); @@ -64,28 +64,65 @@ BLI_INLINE void IMB_colormangement_xyz_to_rgb(float rgb[3], const float xyz[3]); BLI_INLINE void IMB_colormangement_rgb_to_xyz(float xyz[3], const float rgb[3]); /* ** Color space transformation functions ** */ -void IMB_colormanagement_transform(float *buffer, int width, int height, int channels, - const char *from_colorspace, const char *to_colorspace, bool predivide); -void IMB_colormanagement_transform_threaded(float *buffer, int width, int height, int channels, - const char *from_colorspace, const char *to_colorspace, bool predivide); -void IMB_colormanagement_transform_byte(unsigned char *buffer, int width, int height, int channels, - const char *from_colorspace, const char *to_colorspace); -void IMB_colormanagement_transform_byte_threaded(unsigned char *buffer, int width, int height, int channels, - const char *from_colorspace, const char *to_colorspace); -void IMB_colormanagement_transform_from_byte(float *float_buffer, unsigned char *byte_buffer, - int width, int height, int channels, - const char *from_colorspace, const char *to_colorspace); -void IMB_colormanagement_transform_from_byte_threaded(float *float_buffer, unsigned char *byte_buffer, - int width, int height, int channels, - const char *from_colorspace, const char *to_colorspace); -void IMB_colormanagement_transform_v4(float pixel[4], const char *from_colorspace, const char *to_colorspace); - -void IMB_colormanagement_colorspace_to_scene_linear_v3(float pixel[3], struct ColorSpace *colorspace); -void IMB_colormanagement_colorspace_to_scene_linear_v4(float pixel[4], bool predivide, struct ColorSpace *colorspace); - -void IMB_colormanagement_scene_linear_to_colorspace_v3(float pixel[3], struct ColorSpace *colorspace); - -void IMB_colormanagement_colorspace_to_scene_linear(float *buffer, int width, int height, int channels, struct ColorSpace *colorspace, bool predivide); +void IMB_colormanagement_transform(float *buffer, + int width, + int height, + int channels, + const char *from_colorspace, + const char *to_colorspace, + bool predivide); +void IMB_colormanagement_transform_threaded(float *buffer, + int width, + int height, + int channels, + const char *from_colorspace, + const char *to_colorspace, + bool predivide); +void IMB_colormanagement_transform_byte(unsigned char *buffer, + int width, + int height, + int channels, + const char *from_colorspace, + const char *to_colorspace); +void IMB_colormanagement_transform_byte_threaded(unsigned char *buffer, + int width, + int height, + int channels, + const char *from_colorspace, + const char *to_colorspace); +void IMB_colormanagement_transform_from_byte(float *float_buffer, + unsigned char *byte_buffer, + int width, + int height, + int channels, + const char *from_colorspace, + const char *to_colorspace); +void IMB_colormanagement_transform_from_byte_threaded(float *float_buffer, + unsigned char *byte_buffer, + int width, + int height, + int channels, + const char *from_colorspace, + const char *to_colorspace); +void IMB_colormanagement_transform_v4(float pixel[4], + const char *from_colorspace, + const char *to_colorspace); + +void IMB_colormanagement_colorspace_to_scene_linear_v3(float pixel[3], + struct ColorSpace *colorspace); +void IMB_colormanagement_colorspace_to_scene_linear_v4(float pixel[4], + bool predivide, + struct ColorSpace *colorspace); + +void IMB_colormanagement_scene_linear_to_colorspace_v3(float pixel[3], + struct ColorSpace *colorspace); + +void IMB_colormanagement_colorspace_to_scene_linear(float *buffer, + int width, + int height, + int channels, + struct ColorSpace *colorspace, + bool predivide); void IMB_colormanagement_scene_linear_to_color_picking_v3(float pixel[3]); void IMB_colormanagement_color_picking_to_scene_linear_v3(float pixel[3]); @@ -93,44 +130,74 @@ void IMB_colormanagement_color_picking_to_scene_linear_v3(float pixel[3]); void IMB_colormanagement_scene_linear_to_srgb_v3(float pixel[3]); void IMB_colormanagement_srgb_to_scene_linear_v3(float pixel[3]); -void IMB_colormanagement_scene_linear_to_display_v3(float pixel[3], struct ColorManagedDisplay *display); -void IMB_colormanagement_display_to_scene_linear_v3(float pixel[3], struct ColorManagedDisplay *display); - -void IMB_colormanagement_pixel_to_display_space_v4(float result[4], const float pixel[4], const struct ColorManagedViewSettings *view_settings, - const struct ColorManagedDisplaySettings *display_settings); - -void IMB_colormanagement_pixel_to_display_space_v3(float result[3], const float pixel[3], const struct ColorManagedViewSettings *view_settings, - const struct ColorManagedDisplaySettings *display_settings); - -void IMB_colormanagement_imbuf_make_display_space(struct ImBuf *ibuf, const struct ColorManagedViewSettings *view_settings, - const struct ColorManagedDisplaySettings *display_settings); - -struct ImBuf *IMB_colormanagement_imbuf_for_write(struct ImBuf *ibuf, bool save_as_render, bool allocate_result, - const struct ColorManagedViewSettings *view_settings, - const struct ColorManagedDisplaySettings *display_settings, - struct ImageFormatData *image_format_data); - -void IMB_colormanagement_buffer_make_display_space(float *buffer, unsigned char *display_buffer, - int width, int height, int channels, float dither, - const struct ColorManagedViewSettings *view_settings, - const struct ColorManagedDisplaySettings *display_settings); +void IMB_colormanagement_scene_linear_to_display_v3(float pixel[3], + struct ColorManagedDisplay *display); +void IMB_colormanagement_display_to_scene_linear_v3(float pixel[3], + struct ColorManagedDisplay *display); + +void IMB_colormanagement_pixel_to_display_space_v4( + float result[4], + const float pixel[4], + const struct ColorManagedViewSettings *view_settings, + const struct ColorManagedDisplaySettings *display_settings); + +void IMB_colormanagement_pixel_to_display_space_v3( + float result[3], + const float pixel[3], + const struct ColorManagedViewSettings *view_settings, + const struct ColorManagedDisplaySettings *display_settings); + +void IMB_colormanagement_imbuf_make_display_space( + struct ImBuf *ibuf, + const struct ColorManagedViewSettings *view_settings, + const struct ColorManagedDisplaySettings *display_settings); + +struct ImBuf *IMB_colormanagement_imbuf_for_write( + struct ImBuf *ibuf, + bool save_as_render, + bool allocate_result, + const struct ColorManagedViewSettings *view_settings, + const struct ColorManagedDisplaySettings *display_settings, + struct ImageFormatData *image_format_data); + +void IMB_colormanagement_buffer_make_display_space( + float *buffer, + unsigned char *display_buffer, + int width, + int height, + int channels, + float dither, + const struct ColorManagedViewSettings *view_settings, + const struct ColorManagedDisplaySettings *display_settings); /* ** Public display buffers interfaces ** */ -void IMB_colormanagement_display_settings_from_ctx(const struct bContext *C, - struct ColorManagedViewSettings **view_settings_r, - struct ColorManagedDisplaySettings **display_settings_r); - -const char *IMB_colormanagement_get_display_colorspace_name(const struct ColorManagedViewSettings *view_settings, - const struct ColorManagedDisplaySettings *display_settings); - -unsigned char *IMB_display_buffer_acquire(struct ImBuf *ibuf, const struct ColorManagedViewSettings *view_settings, - const struct ColorManagedDisplaySettings *display_settings, void **cache_handle); -unsigned char *IMB_display_buffer_acquire_ctx(const struct bContext *C, struct ImBuf *ibuf, void **cache_handle); - -void IMB_display_buffer_transform_apply(unsigned char *display_buffer, float *linear_buffer, int width, int height, - int channels, const struct ColorManagedViewSettings *view_settings, - const struct ColorManagedDisplaySettings *display_settings, bool predivide); +void IMB_colormanagement_display_settings_from_ctx( + const struct bContext *C, + struct ColorManagedViewSettings **view_settings_r, + struct ColorManagedDisplaySettings **display_settings_r); + +const char *IMB_colormanagement_get_display_colorspace_name( + const struct ColorManagedViewSettings *view_settings, + const struct ColorManagedDisplaySettings *display_settings); + +unsigned char *IMB_display_buffer_acquire( + struct ImBuf *ibuf, + const struct ColorManagedViewSettings *view_settings, + const struct ColorManagedDisplaySettings *display_settings, + void **cache_handle); +unsigned char *IMB_display_buffer_acquire_ctx(const struct bContext *C, + struct ImBuf *ibuf, + void **cache_handle); + +void IMB_display_buffer_transform_apply(unsigned char *display_buffer, + float *linear_buffer, + int width, + int height, + int channels, + const struct ColorManagedViewSettings *view_settings, + const struct ColorManagedDisplaySettings *display_settings, + bool predivide); void IMB_display_buffer_release(void *cache_handle); @@ -141,7 +208,7 @@ const char *IMB_colormanagement_display_get_default_name(void); struct ColorManagedDisplay *IMB_colormanagement_display_get_named(const char *name); const char *IMB_colormanagement_display_get_none_name(void); const char *IMB_colormanagement_display_get_default_view_transform_name( - struct ColorManagedDisplay *display); + struct ColorManagedDisplay *display); /* ** View functions ** */ int IMB_colormanagement_view_get_named_index(const char *name); @@ -156,46 +223,78 @@ int IMB_colormanagement_colorspace_get_named_index(const char *name); const char *IMB_colormanagement_colorspace_get_indexed_name(int index); const char *IMB_colormanagement_view_get_default_name(const char *display_name); -void IMB_colormanagement_colorspace_from_ibuf_ftype(struct ColorManagedColorspaceSettings *colorspace_settings, struct ImBuf *ibuf); +void IMB_colormanagement_colorspace_from_ibuf_ftype( + struct ColorManagedColorspaceSettings *colorspace_settings, struct ImBuf *ibuf); /* ** RNA helper functions ** */ void IMB_colormanagement_display_items_add(struct EnumPropertyItem **items, int *totitem); -void IMB_colormanagement_view_items_add(struct EnumPropertyItem **items, int *totitem, const char *display_name); -void IMB_colormanagement_look_items_add(struct EnumPropertyItem **items, int *totitem, const char *view_name); +void IMB_colormanagement_view_items_add(struct EnumPropertyItem **items, + int *totitem, + const char *display_name); +void IMB_colormanagement_look_items_add(struct EnumPropertyItem **items, + int *totitem, + const char *view_name); void IMB_colormanagement_colorspace_items_add(struct EnumPropertyItem **items, int *totitem); /* ** Tile-based buffer management ** */ -void IMB_partial_display_buffer_update(struct ImBuf *ibuf, const float *linear_buffer, const unsigned char *buffer_byte, - int stride, int offset_x, int offset_y, +void IMB_partial_display_buffer_update(struct ImBuf *ibuf, + const float *linear_buffer, + const unsigned char *buffer_byte, + int stride, + int offset_x, + int offset_y, const struct ColorManagedViewSettings *view_settings, const struct ColorManagedDisplaySettings *display_settings, - int xmin, int ymin, int xmax, int ymax, + int xmin, + int ymin, + int xmax, + int ymax, bool copy_display_to_byte_buffer); -void IMB_partial_display_buffer_update_threaded(struct ImBuf *ibuf, - const float *linear_buffer, - const unsigned char *buffer_byte, - int stride, - int offset_x, int offset_y, - const struct ColorManagedViewSettings *view_settings, - const struct ColorManagedDisplaySettings *display_settings, - int xmin, int ymin, int xmax, int ymax, - bool copy_display_to_byte_buffer); - -void IMB_partial_display_buffer_update_delayed(struct ImBuf *ibuf, int xmin, int ymin, int xmax, int ymax); +void IMB_partial_display_buffer_update_threaded( + struct ImBuf *ibuf, + const float *linear_buffer, + const unsigned char *buffer_byte, + int stride, + int offset_x, + int offset_y, + const struct ColorManagedViewSettings *view_settings, + const struct ColorManagedDisplaySettings *display_settings, + int xmin, + int ymin, + int xmax, + int ymax, + bool copy_display_to_byte_buffer); + +void IMB_partial_display_buffer_update_delayed( + struct ImBuf *ibuf, int xmin, int ymin, int xmax, int ymax); /* ** Pixel processor functions ** */ -struct ColormanageProcessor *IMB_colormanagement_display_processor_new(const struct ColorManagedViewSettings *view_settings, - const struct ColorManagedDisplaySettings *display_settings); -struct ColormanageProcessor *IMB_colormanagement_colorspace_processor_new(const char *from_colorspace, const char *to_colorspace); -void IMB_colormanagement_processor_apply_v4(struct ColormanageProcessor *cm_processor, float pixel[4]); -void IMB_colormanagement_processor_apply_v4_predivide(struct ColormanageProcessor *cm_processor, float pixel[4]); -void IMB_colormanagement_processor_apply_v3(struct ColormanageProcessor *cm_processor, float pixel[3]); -void IMB_colormanagement_processor_apply_pixel(struct ColormanageProcessor *cm_processor, float *pixel, int channels); -void IMB_colormanagement_processor_apply(struct ColormanageProcessor *cm_processor, float *buffer, int width, int height, - int channels, bool predivide); +struct ColormanageProcessor *IMB_colormanagement_display_processor_new( + const struct ColorManagedViewSettings *view_settings, + const struct ColorManagedDisplaySettings *display_settings); +struct ColormanageProcessor *IMB_colormanagement_colorspace_processor_new( + const char *from_colorspace, const char *to_colorspace); +void IMB_colormanagement_processor_apply_v4(struct ColormanageProcessor *cm_processor, + float pixel[4]); +void IMB_colormanagement_processor_apply_v4_predivide(struct ColormanageProcessor *cm_processor, + float pixel[4]); +void IMB_colormanagement_processor_apply_v3(struct ColormanageProcessor *cm_processor, + float pixel[3]); +void IMB_colormanagement_processor_apply_pixel(struct ColormanageProcessor *cm_processor, + float *pixel, + int channels); +void IMB_colormanagement_processor_apply(struct ColormanageProcessor *cm_processor, + float *buffer, + int width, + int height, + int channels, + bool predivide); void IMB_colormanagement_processor_apply_byte(struct ColormanageProcessor *cm_processor, - unsigned char *buffer, int width, int height, int channels); + unsigned char *buffer, + int width, + int height, + int channels); void IMB_colormanagement_processor_free(struct ColormanageProcessor *cm_processor); /* ** OpenGL drawing routines using GLSL for color space transform ** */ @@ -203,37 +302,45 @@ void IMB_colormanagement_processor_free(struct ColormanageProcessor *cm_processo /* Test if GLSL drawing is supported for combination of graphics card and this configuration */ bool IMB_colormanagement_support_glsl_draw(const struct ColorManagedViewSettings *view_settings); /* Configures GLSL shader for conversion from scene linear to display space */ -bool IMB_colormanagement_setup_glsl_draw(const struct ColorManagedViewSettings *view_settings, - const struct ColorManagedDisplaySettings *display_settings, - float dither, bool predivide); +bool IMB_colormanagement_setup_glsl_draw( + const struct ColorManagedViewSettings *view_settings, + const struct ColorManagedDisplaySettings *display_settings, + float dither, + bool predivide); /* Same as above, but display space conversion happens from a specified space */ -bool IMB_colormanagement_setup_glsl_draw_from_space(const struct ColorManagedViewSettings *view_settings, - const struct ColorManagedDisplaySettings *display_settings, - struct ColorSpace *colorspace, - float dither, bool predivide); +bool IMB_colormanagement_setup_glsl_draw_from_space( + const struct ColorManagedViewSettings *view_settings, + const struct ColorManagedDisplaySettings *display_settings, + struct ColorSpace *colorspace, + float dither, + bool predivide); /* Same as setup_glsl_draw, but color management settings are guessing from a given context */ -bool IMB_colormanagement_setup_glsl_draw_ctx(const struct bContext *C, float dither, bool predivide); +bool IMB_colormanagement_setup_glsl_draw_ctx(const struct bContext *C, + float dither, + bool predivide); /* Same as setup_glsl_draw_from_space, but color management settings are guessing from a given context */ -bool IMB_colormanagement_setup_glsl_draw_from_space_ctx(const struct bContext *C, struct ColorSpace *colorspace, - float dither, bool predivide); +bool IMB_colormanagement_setup_glsl_draw_from_space_ctx(const struct bContext *C, + struct ColorSpace *colorspace, + float dither, + bool predivide); /* Finish GLSL-based display space conversion */ void IMB_colormanagement_finish_glsl_draw(void); /* ** View transform ** */ void IMB_colormanagement_init_default_view_settings( - struct ColorManagedViewSettings *view_settings, - const struct ColorManagedDisplaySettings *display_settings); + struct ColorManagedViewSettings *view_settings, + const struct ColorManagedDisplaySettings *display_settings); /* Roles */ enum { - COLOR_ROLE_SCENE_LINEAR = 0, - COLOR_ROLE_COLOR_PICKING, - COLOR_ROLE_TEXTURE_PAINTING, - COLOR_ROLE_DEFAULT_SEQUENCER, - COLOR_ROLE_DEFAULT_BYTE, - COLOR_ROLE_DEFAULT_FLOAT, + COLOR_ROLE_SCENE_LINEAR = 0, + COLOR_ROLE_COLOR_PICKING, + COLOR_ROLE_TEXTURE_PAINTING, + COLOR_ROLE_DEFAULT_SEQUENCER, + COLOR_ROLE_DEFAULT_BYTE, + COLOR_ROLE_DEFAULT_FLOAT, }; #include "intern/colormanagement_inline.c" -#endif /* __IMB_COLORMANAGEMENT_H__ */ +#endif /* __IMB_COLORMANAGEMENT_H__ */ -- cgit v1.2.3