callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: improve gradient color-sampling speed

Browse Source 
Improve the speed of gimp_gradient_get_color_at(), which is used by
gimp:gradient during processing when the gradient cache is too big,
by disabling type checking, and inlining and avoiding some function
calls.

(cherry picked from commit 93f4b18704)
This commit is contained in:
Ell
2018-12-20 08:29:33 -05:00
parent 3943530c50
commit d70aeea550
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/core/gimpgradient.c
View File

@ -70,7 +70,7 @@ static gint gimp_gradient_compare (GimpData *data1
static gchar * gimp_gradient_get_checksum (GimpTagged *tagged); static gchar * gimp_gradient_get_checksum (GimpTagged *tagged);
static GimpGradientSegment * static inline GimpGradientSegment *
gimp_gradient_get_segment_at_internal (GimpGradient *gradient, gimp_gradient_get_segment_at_internal (GimpGradient *gradient,
GimpGradientSegment *seg, GimpGradientSegment *seg,
gdouble pos); gdouble pos);
@ -460,7 +460,8 @@ gimp_gradient_get_color_at (GimpGradient *gradient,
GimpRGB right_color; GimpRGB right_color;
GimpRGB rgb; GimpRGB rgb;
g_return_val_if_fail (GIMP_IS_GRADIENT (gradient), NULL); /* type-check disabled to improve speed */
/* g_return_val_if_fail (GIMP_IS_GRADIENT (gradient), NULL); */
g_return_val_if_fail (color != NULL, NULL); g_return_val_if_fail (color != NULL, NULL);
pos = CLAMP (pos, 0.0, 1.0); pos = CLAMP (pos, 0.0, 1.0);
@ -516,11 +517,19 @@ gimp_gradient_get_color_at (GimpGradient *gradient,
/* Get left/right colors */ /* Get left/right colors */
gimp_gradient_segment_get_left_flat_color (gradient, if (context)
context, seg, &left_color); {
gimp_gradient_segment_get_left_flat_color (gradient,
context, seg, &left_color);
gimp_gradient_segment_get_right_flat_color (gradient, gimp_gradient_segment_get_right_flat_color (gradient,
context, seg, &right_color); context, seg, &right_color);
}
else
{
left_color = seg->left_color;
right_color = seg->right_color;
}
/* Calculate color components */ /* Calculate color components */
@ -2160,7 +2169,7 @@ gimp_gradient_segment_range_move (GimpGradient *gradient,
/* private functions */ /* private functions */
static GimpGradientSegment * static inline GimpGradientSegment *
gimp_gradient_get_segment_at_internal (GimpGradient *gradient, gimp_gradient_get_segment_at_internal (GimpGradient *gradient,
GimpGradientSegment *seg, GimpGradientSegment *seg,
gdouble pos) gdouble pos)