dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged from trunk: 

2008-08-23  Lars-Peter Clausen  <lars@metafoo.de>

	Merged from trunk:
	
	* tools/pdbgen/pdb/gradient.pdb
	(gimp_gradient_segment_range_blend_(colors|opacity)): Don't crash 
	if the index of the last segment is out of range.

	* app/pdb/gradient-cmds.c: regenerated.


svn path=/branches/gimp-2-4/; revision=26726
This commit is contained in:
Lars-Peter Clausen 2008-08-23 13:33:39 +00:00 committed by Lars-Peter Clausen
parent 63eaa36906
commit 52294e79da
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2008-08-23 Lars-Peter Clausen <lars@metafoo.de>
Merged from trunk:
* tools/pdbgen/pdb/gradient.pdb
(gimp_gradient_segment_range_blend_(colors|opacity)): Don't crash
if the index of the last segment is out of range.
* app/pdb/gradient-cmds.c: regenerated.
2008-08-23 Sven Neumann <sven@gimp.org>
* plug-ins/twain/Makefile.am: merged changes from trunk (bug #548940).

6
app/pdb/gradient_cmds.c
View File

@ -1226,6 +1226,9 @@ gradient_segment_range_blend_colors_invoker (GimpProcedure *procedure,
if (start_seg && GIMP_DATA (gradient)->writable)
{
if (!end_seg)
end_seg = gimp_gradient_segment_get_last (start_seg);
gimp_gradient_segment_range_blend (gradient,
start_seg, end_seg,
&start_seg->left_color,
@ -1266,6 +1269,9 @@ gradient_segment_range_blend_opacity_invoker (GimpProcedure *procedure,
if (start_seg && GIMP_DATA (gradient)->writable)
{
if (!end_seg)
end_seg = gimp_gradient_segment_get_last (start_seg);
gimp_gradient_segment_range_blend (gradient,
start_seg, end_seg,
&start_seg->left_color,

6
tools/pdbgen/pdb/gradient.pdb
View File

@ -1227,6 +1227,9 @@ HELP
if (start_seg && GIMP_DATA (gradient)->writable)
{
if (!end_seg)
end_seg = gimp_gradient_segment_get_last (start_seg);
gimp_gradient_segment_range_blend (gradient,
start_seg, end_seg,
&start_seg->left_color,
@ -1273,6 +1276,9 @@ HELP
if (start_seg && GIMP_DATA (gradient)->writable)
{
if (!end_seg)
end_seg = gimp_gradient_segment_get_last (start_seg);
gimp_gradient_segment_range_blend (gradient,
start_seg, end_seg,
&start_seg->left_color,