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

depend on glib 2.14.1 

2007-10-31  Michael Natterer  <mitch@gimp.org>

	* configure.in: depend on glib 2.14.1

	* app/tools/gimpdrawtool.c
	* app/vectors/gimpvectors-import.c: use g_slice_dup() instead of
	g_slice_new() and memcpy().


svn path=/trunk/; revision=24014
This commit is contained in:
Michael Natterer 2007-10-31 10:59:44 +00:00 committed by Michael Natterer
parent 694c7d188e
commit de65da8d96
4 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2007-10-31 Michael Natterer <mitch@gimp.org>
* configure.in: depend on glib 2.14.1
* app/tools/gimpdrawtool.c
* app/vectors/gimpvectors-import.c: use g_slice_dup() instead of
g_slice_new() and memcpy().
2007-10-31 Sven Neumann <sven@gimp.org> 2007-10-31 Sven Neumann <sven@gimp.org>
* plug-ins/common/retinex.c: use a combo-box instead of radio * plug-ins/common/retinex.c: use a combo-box instead of radio

5
app/tools/gimpdrawtool.c
View File

@ -353,10 +353,7 @@ gimp_draw_tool_set_transform (GimpDrawTool *draw_tool,
} }
if (transform) if (transform)
{ draw_tool->transform = g_slice_dup (GimpMatrix3, transform);
draw_tool->transform = g_slice_new (GimpMatrix3);
memcpy (draw_tool->transform, transform, sizeof (GimpMatrix3));
}
gimp_draw_tool_resume (draw_tool); gimp_draw_tool_resume (draw_tool);
} }

18
app/vectors/gimpvectors-import.c
View File

@ -566,8 +566,7 @@ svg_handler_group_start (SvgHandler *handler,
if (parse_svg_transform (*values, &matrix)) if (parse_svg_transform (*values, &matrix))
{ {
handler->transform = g_slice_new (GimpMatrix3); handler->transform = g_slice_dup (GimpMatrix3, &matrix);
memcpy (handler->transform, &matrix, sizeof (GimpMatrix3));
#ifdef DEBUG_VECTORS_IMPORT #ifdef DEBUG_VECTORS_IMPORT
g_printerr ("transform %s: %g %g %g %g %g %g %g %g %g\n", g_printerr ("transform %s: %g %g %g %g %g %g %g %g %g\n",
@ -619,8 +618,7 @@ svg_handler_path_start (SvgHandler *handler,
if (parse_svg_transform (*values, &matrix)) if (parse_svg_transform (*values, &matrix))
{ {
handler->transform = g_slice_new (GimpMatrix3); handler->transform = g_slice_dup (GimpMatrix3, &matrix);
memcpy (handler->transform, &matrix, sizeof (GimpMatrix3));
} }
} }
break; break;
@ -702,8 +700,7 @@ svg_handler_rect_start (SvgHandler *handler,
if (parse_svg_transform (*values, &matrix)) if (parse_svg_transform (*values, &matrix))
{ {
handler->transform = g_slice_new (GimpMatrix3); handler->transform = g_slice_dup (GimpMatrix3, &matrix);
memcpy (handler->transform, &matrix, sizeof (GimpMatrix3));
} }
} }
break; break;
@ -853,8 +850,7 @@ svg_handler_ellipse_start (SvgHandler *handler,
if (parse_svg_transform (*values, &matrix)) if (parse_svg_transform (*values, &matrix))
{ {
handler->transform = g_slice_new (GimpMatrix3); handler->transform = g_slice_dup (GimpMatrix3, &matrix);
memcpy (handler->transform, &matrix, sizeof (GimpMatrix3));
} }
} }
break; break;
@ -922,8 +918,7 @@ svg_handler_line_start (SvgHandler *handler,
if (parse_svg_transform (*values, &matrix)) if (parse_svg_transform (*values, &matrix))
{ {
handler->transform = g_slice_new (GimpMatrix3); handler->transform = g_slice_dup (GimpMatrix3, &matrix);
memcpy (handler->transform, &matrix, sizeof (GimpMatrix3));
} }
} }
break; break;
@ -1011,8 +1006,7 @@ svg_handler_poly_start (SvgHandler *handler,
if (parse_svg_transform (*values, &matrix)) if (parse_svg_transform (*values, &matrix))
{ {
handler->transform = g_slice_new (GimpMatrix3); handler->transform = g_slice_dup (GimpMatrix3, &matrix);
memcpy (handler->transform, &matrix, sizeof (GimpMatrix3));
} }
} }
break; break;

2
configure.in
View File

@ -40,7 +40,7 @@ m4_define([gimp_stable],
m4_define([gimp_full_name], [GNU Image Manipulation Program]) m4_define([gimp_full_name], [GNU Image Manipulation Program])
# required versions of other packages # required versions of other packages
m4_define([glib_required_version], [2.12.3]) m4_define([glib_required_version], [2.14.1])
m4_define([gtk_required_version], [2.10.13]) m4_define([gtk_required_version], [2.10.13])
m4_define([gdk_pixbuf_required_version], [gtk_required_version]) m4_define([gdk_pixbuf_required_version], [gtk_required_version])
m4_define([pangoft2_required_version], [1.12.2]) m4_define([pangoft2_required_version], [1.12.2])