From 2dbf1b46b2b4e81f0147e48e0541a9ea64b37250 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Tue, 31 Jan 2017 01:43:48 +0100 Subject: [PATCH] app: rename gimp_layer_mode_is_linear() to gimp_layer_mode_wants_linear_data() --- app/Makefile.am | 2 +- app/config/Makefile.am | 2 +- app/core/gimp-layer-modes.c | 2 +- app/core/gimp-layer-modes.h | 2 +- app/gegl/gimp-gegl-nodes.c | 2 +- app/paint/gimpbrushcore.c | 2 +- app/paint/gimpink.c | 2 +- app/paint/gimppaintcore-loops.c | 2 +- app/tests/Makefile.am | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/Makefile.am b/app/Makefile.am index 69c64eefa9..b7933f3742 100644 --- a/app/Makefile.am +++ b/app/Makefile.am @@ -134,7 +134,7 @@ AM_LDFLAGS = \ -Wl,-u,$(SYMPREFIX)internal_procs_init \ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore \ -Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec \ - -Wl,-u,$(SYMPREFIX)gimp_layer_mode_is_linear + -Wl,-u,$(SYMPREFIX)gimp_layer_mode_is_legacy gimpconsoleldadd = \ xcf/libappxcf.a \ diff --git a/app/config/Makefile.am b/app/config/Makefile.am index bf5e4a72c5..f4be5a5131 100644 --- a/app/config/Makefile.am +++ b/app/config/Makefile.am @@ -90,7 +90,7 @@ test_config_LDFLAGS = \ -Wl,-u,$(SYMPREFIX)internal_procs_init \ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore \ -Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec \ - -Wl,-u,$(SYMPREFIX)gimp_layer_mode_is_linear + -Wl,-u,$(SYMPREFIX)gimp_layer_mode_is_legacy test_config_LDADD = \ ../xcf/libappxcf.a \ diff --git a/app/core/gimp-layer-modes.c b/app/core/gimp-layer-modes.c index aab693a842..c3e6433dab 100644 --- a/app/core/gimp-layer-modes.c +++ b/app/core/gimp-layer-modes.c @@ -444,7 +444,7 @@ gimp_layer_mode_is_legacy (GimpLayerMode mode) } gboolean -gimp_layer_mode_is_linear (GimpLayerMode mode) +gimp_layer_mode_wants_linear_data (GimpLayerMode mode) { switch (mode) { diff --git a/app/core/gimp-layer-modes.h b/app/core/gimp-layer-modes.h index 94e6d5f9ee..dbd04df0f6 100644 --- a/app/core/gimp-layer-modes.h +++ b/app/core/gimp-layer-modes.h @@ -24,7 +24,7 @@ gboolean gimp_layer_mode_is_legacy (GimpLayerMode mode); -gboolean gimp_layer_mode_is_linear (GimpLayerMode mode); +gboolean gimp_layer_mode_wants_linear_data (GimpLayerMode mode); GimpLayerColorSpace gimp_layer_mode_get_blend_space (GimpLayerMode mode); GimpLayerColorSpace gimp_layer_mode_get_composite_space (GimpLayerMode mode); diff --git a/app/gegl/gimp-gegl-nodes.c b/app/gegl/gimp-gegl-nodes.c index 8f14855bf9..54b034b91d 100644 --- a/app/gegl/gimp-gegl-nodes.c +++ b/app/gegl/gimp-gegl-nodes.c @@ -159,7 +159,7 @@ gimp_gegl_mode_node_set_mode (GeglNode *node, "operation", gimp_layer_mode_get_operation (mode), "layer-mode", mode, "opacity", opacity, - "linear", gimp_layer_mode_is_linear (mode), + "linear", gimp_layer_mode_wants_linear_data (mode), "blend-space", gimp_layer_mode_get_blend_space (mode), "composite-space", gimp_layer_mode_get_composite_space (mode), "composite-mode", gimp_layer_mode_get_composite_mode (mode), diff --git a/app/paint/gimpbrushcore.c b/app/paint/gimpbrushcore.c index f0ae9f237b..540d6e5f76 100644 --- a/app/paint/gimpbrushcore.c +++ b/app/paint/gimpbrushcore.c @@ -861,7 +861,7 @@ gimp_brush_core_get_paint_buffer (GimpPaintCore *paint_core, GimpTempBuf *temp_buf; const Babl *format; - if (gimp_layer_mode_is_linear (paint_mode)) + if (gimp_layer_mode_wants_linear_data (paint_mode)) format = babl_format ("RGBA float"); else format = babl_format ("R'G'B'A float"); diff --git a/app/paint/gimpink.c b/app/paint/gimpink.c index dd0201e9d8..8f8cf9ec22 100644 --- a/app/paint/gimpink.c +++ b/app/paint/gimpink.c @@ -258,7 +258,7 @@ gimp_ink_get_paint_buffer (GimpPaintCore *paint_core, GimpTempBuf *temp_buf; const Babl *format; - if (gimp_layer_mode_is_linear (paint_mode)) + if (gimp_layer_mode_wants_linear_data (paint_mode)) format = babl_format ("RGBA float"); else format = babl_format ("R'G'B'A float"); diff --git a/app/paint/gimppaintcore-loops.c b/app/paint/gimppaintcore-loops.c index 74eb5b31ab..e72dab1d55 100644 --- a/app/paint/gimppaintcore-loops.c +++ b/app/paint/gimppaintcore-loops.c @@ -314,7 +314,7 @@ do_layer_blend (GeglBuffer *src_buffer, paint_stride = gimp_temp_buf_get_width (paint_buf); paint_data = (gfloat *) gimp_temp_buf_get_data (paint_buf); - linear = gimp_layer_mode_is_linear (paint_mode); + linear = gimp_layer_mode_wants_linear_data (paint_mode); apply_func = gimp_get_layer_mode_function (paint_mode); blend_space = gimp_layer_mode_get_blend_space (paint_mode); composite_space = gimp_layer_mode_get_composite_space (paint_mode); diff --git a/app/tests/Makefile.am b/app/tests/Makefile.am index b7f73d80d5..8ab4c0e37a 100644 --- a/app/tests/Makefile.am +++ b/app/tests/Makefile.am @@ -74,7 +74,7 @@ AM_LDFLAGS = \ -Wl,-u,$(SYMPREFIX)internal_procs_init \ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore \ -Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec \ - -Wl,-u,$(SYMPREFIX)gimp_layer_mode_is_linear \ + -Wl,-u,$(SYMPREFIX)gimp_layer_mode_is_legacy \ -Wl,-u,$(SYMPREFIX)gui_init \ -Wl,-u,$(SYMPREFIX)gimp_lebl_dialog