=== modified file 'src/2geom/convex-cover.cpp' --- src/2geom/convex-cover.cpp 2008-05-07 15:41:04 +0000 +++ src/2geom/convex-cover.cpp 2008-05-07 16:42:51 +0000 @@ -264,7 +264,8 @@ */ bool ConvexHull::no_colinear_points() const { - + // Urgh + return false; } bool @@ -350,6 +351,7 @@ // al and bl now point to the top of the first pair of edges that overlap in y value double sweep_y = std::min(a.boundary[al][Y], b.boundary[bl][Y]); + return ret; } /*** ConvexHull intersection(ConvexHull a, ConvexHull b); === modified file 'src/2geom/poly-laguerre-solve.cpp' --- src/2geom/poly-laguerre-solve.cpp 2008-05-07 15:41:04 +0000 +++ src/2geom/poly-laguerre-solve.cpp 2008-05-07 16:44:43 +0000 @@ -133,6 +133,9 @@ laguerre_real_interval(Poly const & ply, const double lo, const double hi, const double tol) { + std::vector retval; + + return retval; } /* === modified file 'src/display/nr-filter-specularlighting.cpp' --- src/display/nr-filter-specularlighting.cpp 2008-05-07 15:41:04 +0000 +++ src/display/nr-filter-specularlighting.cpp 2008-05-07 15:41:27 +0000 @@ -108,8 +108,9 @@ data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_RED]); data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_GREEN]); data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_BLUE]); - data_o[j++] = MAX(MAX(data_o[j-3], data_o[j-2]), data_o[j-1]); - } + data_o[j] = MAX(MAX(data_o[j-3], data_o[j-2]), data_o[j-1]); + j++; + } out->empty = FALSE; delete dl; } @@ -135,7 +136,8 @@ data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_RED]); data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_GREEN]); data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_BLUE]); - data_o[j++] = MAX(MAX(data_o[j-3], data_o[j-2]), data_o[j-1]); + data_o[j] = MAX(MAX(data_o[j-3], data_o[j-2]), data_o[j-1]); + j++; } out->empty = FALSE; delete pl; @@ -162,7 +164,8 @@ data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_RED]); data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_GREEN]); data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_BLUE]); - data_o[j++] = MAX(MAX(data_o[j-3], data_o[j-2]), data_o[j-1]); + data_o[j] = MAX(MAX(data_o[j-3], data_o[j-2]), data_o[j-1]); + j++; } out->empty = FALSE; delete sl; === modified file 'src/extension/internal/pov-out.cpp' --- src/extension/internal/pov-out.cpp 2008-05-07 15:41:04 +0000 +++ src/extension/internal/pov-out.cpp 2008-05-07 15:41:27 +0000 @@ -133,9 +133,9 @@ void PovOutput::vec2(double a, double b) { out("<"); - out(dstr(a).c_str()); + out("%s", dstr(a).c_str()); out(", "); - out(dstr(b).c_str()); + out("%s", dstr(b).c_str()); out(">"); } @@ -147,11 +147,11 @@ void PovOutput::vec3(double a, double b, double c) { out("<"); - out(dstr(a).c_str()); - out(", "); - out(dstr(b).c_str()); - out(", "); - out(dstr(c).c_str()); + out("%s", dstr(a).c_str()); + out(", "); + out("%s", dstr(b).c_str()); + out(", "); + out("%s", dstr(c).c_str()); out(">"); } @@ -163,13 +163,13 @@ void PovOutput::vec4(double a, double b, double c, double d) { out("<"); - out(dstr(a).c_str()); - out(", "); - out(dstr(b).c_str()); - out(", "); - out(dstr(c).c_str()); - out(", "); - out(dstr(d).c_str()); + out("%s", dstr(a).c_str()); + out(", "); + out("%s", dstr(b).c_str()); + out(", "); + out("%s", dstr(c).c_str()); + out(", "); + out("%s", dstr(d).c_str()); out(">"); } === modified file 'src/libgdl/gdl-dock-placeholder.c' --- src/libgdl/gdl-dock-placeholder.c 2008-05-07 15:41:04 +0000 +++ src/libgdl/gdl-dock-placeholder.c 2008-05-07 15:41:27 +0000 @@ -491,7 +491,7 @@ GdlDockObject *toplevel; if (!gdl_dock_object_is_bound (GDL_DOCK_OBJECT (ph))) { - g_warning (_("Attempt to dock a dock object to an unbound placeholder")); + g_warning ("%s", _("Attempt to dock a dock object to an unbound placeholder")); return; } === modified file 'src/libgdl/gdl-stock.c' --- src/libgdl/gdl-stock.c 2008-05-07 15:41:04 +0000 +++ src/libgdl/gdl-stock.c 2008-05-07 15:41:27 +0000 @@ -60,7 +60,7 @@ pixbuf = gdk_pixbuf_new_from_inline (data_size, icon_data, FALSE, &err); if (err) { - g_warning (err->message); + g_warning ("%s", err->message); g_error_free (err); err = NULL; g_object_unref (source); === modified file 'src/libgdl/gdl-switcher.c' --- src/libgdl/gdl-switcher.c 2008-05-07 15:41:04 +0000 +++ src/libgdl/gdl-switcher.c 2008-05-07 16:45:53 +0000 @@ -524,6 +524,7 @@ } GDL_CALL_PARENT_WITH_DEFAULT (GTK_WIDGET_CLASS, expose_event, (widget, event), FALSE); + return 0; } static void