diff --git a/ChangeLog b/ChangeLog index 1c1c2f8fcf..b878729a30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,31 @@ +2006-10-30 Michael Natterer + + * plug-ins/Lighting/lighting_apply.c + * plug-ins/Lighting/lighting_preview.c + * plug-ins/MapObject/mapobject_apply.c + * plug-ins/common/spheredesigner.c + * plug-ins/flame/libifs.c + * plug-ins/gfig/gfig-arc.c + * plug-ins/gfig/gfig-bezier.c + * plug-ins/gfig/gfig-circle.c + * plug-ins/gfig/gfig-ellipse.c + * plug-ins/gfig/gfig-line.c + * plug-ins/gfig/gfig-poly.c + * plug-ins/gfig/gfig-spiral.c + * plug-ins/gfig/gfig-star.c + * plug-ins/gimpressionist/general.c + * plug-ins/gimpressionist/ppmtool.c + * plug-ins/gimpressionist/preview.c + * plug-ins/gimpressionist/preview.h + * plug-ins/gimpressionist/size.h + * plug-ins/jpeg/jpeg-save.c + * plug-ins/uri/uri-backend-gnomevfs.c + * plug-ins/uri/uri-backend-libcurl.c + * plug-ins/uri/uri-backend-wget.c + * plug-ins/winicon/icoload.c + * plug-ins/winicon/icosave.c: another bunch of missing includes, + missing "static" and wrong declarations found by -Wmissing-foo + 2006-10-30 Michael Natterer * plug-ins/script-fu/script-fu-text-console.c: include our own diff --git a/plug-ins/Lighting/lighting_apply.c b/plug-ins/Lighting/lighting_apply.c index 0dac4e91a7..2107430329 100644 --- a/plug-ins/Lighting/lighting_apply.c +++ b/plug-ins/Lighting/lighting_apply.c @@ -11,6 +11,7 @@ #include "lighting_main.h" #include "lighting_image.h" #include "lighting_shade.h" +#include "lighting_apply.h" #include "libgimp/stdplugins-intl.h" diff --git a/plug-ins/Lighting/lighting_preview.c b/plug-ins/Lighting/lighting_preview.c index d49b197a4a..f803ce7c90 100644 --- a/plug-ins/Lighting/lighting_preview.c +++ b/plug-ins/Lighting/lighting_preview.c @@ -220,7 +220,7 @@ compute_preview_rectangle (gint * xp, gint * yp, gint * wid, gint * heig) /* light marker. Return TRUE if so, FALSE if not */ /*************************************************/ -gboolean +static gboolean check_handle_hit (gint xpos, gint ypos) { gint dx,dy,r; diff --git a/plug-ins/MapObject/mapobject_apply.c b/plug-ins/MapObject/mapobject_apply.c index 57490ec2f9..f204875842 100644 --- a/plug-ins/MapObject/mapobject_apply.c +++ b/plug-ins/MapObject/mapobject_apply.c @@ -14,6 +14,7 @@ #include "mapobject_main.h" #include "mapobject_image.h" #include "mapobject_shade.h" +#include "mapobject_apply.h" #include "libgimp/stdplugins-intl.h" @@ -188,7 +189,7 @@ init_compute (void) max_depth = (gint) mapvals.maxdepth; } -void +static void render (gdouble x, gdouble y, GimpRGB *col, @@ -203,7 +204,7 @@ render (gdouble x, *col = get_ray_color (&pos); } -void +static void show_progress (gint min, gint max, gint curr, diff --git a/plug-ins/common/spheredesigner.c b/plug-ins/common/spheredesigner.c index 035c5be071..87f8750704 100644 --- a/plug-ins/common/spheredesigner.c +++ b/plug-ins/common/spheredesigner.c @@ -2525,7 +2525,7 @@ sphere_response (GtkWidget *widget, } } -GtkWidget * +static GtkWidget * makewindow (void) { GtkListStore *store; diff --git a/plug-ins/flame/libifs.c b/plug-ins/flame/libifs.c index b33478a319..d20d6dda46 100644 --- a/plug-ins/flame/libifs.c +++ b/plug-ins/flame/libifs.c @@ -204,13 +204,14 @@ void mult_matrix(s1, s2, d) d[1][1] = s1[0][1] * s2[1][0] + s1[1][1] * s2[1][1]; } -double det_matrix(s) +static double det_matrix(s) double s[2][2]; { return s[0][0] * s[1][1] - s[0][1] * s[1][0]; } -void flip_matrix(m, h) +#if 0 +static void flip_matrix(m, h) double m[2][2]; int h; { @@ -234,7 +235,7 @@ void flip_matrix(m, h) } } -void transpose_matrix(m) +static void transpose_matrix(m) double m[2][2]; { double t; @@ -242,8 +243,10 @@ void transpose_matrix(m) m[0][1] = m[1][0]; m[1][0] = t; } +#endif -void choose_evector(m, r, v) +#if 0 +static void choose_evector(m, r, v) double m[3][2], r; double v[2]; { @@ -270,7 +273,7 @@ void choose_evector(m, r, v) transforms. */ -void diagonalize_matrix(m, r, v) +static void diagonalize_matrix(m, r, v) double m[3][2]; double r[2][2]; double v[2][2]; @@ -351,7 +354,7 @@ void diagonalize_matrix(m, r, v) } -void undiagonalize_matrix(r, v, m) +static void undiagonalize_matrix(r, v, m) double r[2][2]; double v[2][2]; double m[3][2]; @@ -385,8 +388,9 @@ void undiagonalize_matrix(r, v, m) m[1][0] = t2[1][0]; m[1][1] = t2[1][1]; } +#endif -void interpolate_angle(t, s, v1, v2, v3, tie, cross) +static void interpolate_angle(t, s, v1, v2, v3, tie, cross) double t, s; double *v1, *v2, *v3; int tie; @@ -425,7 +429,7 @@ void interpolate_angle(t, s, v1, v2, v3, tie, cross) *v3 = s * x + t * y; } -void interpolate_complex(t, s, r1, r2, r3, flip, tie, cross) +static void interpolate_complex(t, s, r1, r2, r3, flip, tie, cross) double t, s; double r1[2], r2[2], r3[2]; int flip, tie, cross; @@ -471,7 +475,7 @@ void interpolate_complex(t, s, r1, r2, r3, flip, tie, cross) } -void interpolate_matrix(t, m1, m2, m3) +static void interpolate_matrix(t, m1, m2, m3) double m1[3][2], m2[3][2], m3[3][2]; double t; { @@ -688,7 +692,7 @@ void tokenize(ss, argv, argc) *argc = i; } -int compare_xforms(a, b) +static int compare_xforms(a, b) xform *a, *b; { double aa[2][2]; @@ -1094,7 +1098,8 @@ double standard_metric(cp1, cp2) return dist; } -void +#if 0 +static void stat_matrix(f, m) FILE *f; double m[3][2]; @@ -1116,6 +1121,7 @@ stat_matrix(f, m) fprintf(f, "theta = %g det = %g\n", a, m[0][0] * m[1][1] - m[0][1] * m[1][0]); } +#endif #if 0 diff --git a/plug-ins/gfig/gfig-arc.c b/plug-ins/gfig/gfig-arc.c index 1b1134fd38..8e948aa4e0 100644 --- a/plug-ins/gfig/gfig-arc.c +++ b/plug-ins/gfig/gfig-arc.c @@ -34,6 +34,7 @@ #include "gfig.h" #include "gfig-dobject.h" +#include "gfig-arc.h" #include "libgimp/stdplugins-intl.h" diff --git a/plug-ins/gfig/gfig-bezier.c b/plug-ins/gfig/gfig-bezier.c index f5e562b474..8d5b096526 100644 --- a/plug-ins/gfig/gfig-bezier.c +++ b/plug-ins/gfig/gfig-bezier.c @@ -32,6 +32,7 @@ #include "gfig-line.h" #include "gfig-dobject.h" #include "gfig-dialog.h" +#include "gfig-bezier.h" #include "libgimp/stdplugins-intl.h" diff --git a/plug-ins/gfig/gfig-circle.c b/plug-ins/gfig/gfig-circle.c index 8fdf84e8d3..5da8c52aa5 100644 --- a/plug-ins/gfig/gfig-circle.c +++ b/plug-ins/gfig/gfig-circle.c @@ -31,6 +31,7 @@ #include "gfig.h" #include "gfig-dobject.h" #include "gfig-poly.h" +#include "gfig-circle.h" #include "libgimp/stdplugins-intl.h" diff --git a/plug-ins/gfig/gfig-ellipse.c b/plug-ins/gfig/gfig-ellipse.c index 30b657a415..cedb7222f3 100644 --- a/plug-ins/gfig/gfig-ellipse.c +++ b/plug-ins/gfig/gfig-ellipse.c @@ -32,6 +32,7 @@ #include "gfig.h" #include "gfig-dobject.h" +#include "gfig-ellipse.h" #include "libgimp/stdplugins-intl.h" diff --git a/plug-ins/gfig/gfig-line.c b/plug-ins/gfig/gfig-line.c index dd75e10ec1..90e58fa587 100644 --- a/plug-ins/gfig/gfig-line.c +++ b/plug-ins/gfig/gfig-line.c @@ -30,6 +30,7 @@ #include "gfig.h" #include "gfig-dobject.h" +#include "gfig-line.h" #include "libgimp/stdplugins-intl.h" diff --git a/plug-ins/gfig/gfig-poly.c b/plug-ins/gfig/gfig-poly.c index 0f6ebcf55b..8b253dbecd 100644 --- a/plug-ins/gfig/gfig-poly.c +++ b/plug-ins/gfig/gfig-poly.c @@ -32,6 +32,7 @@ #include "gfig-dobject.h" #include "gfig-line.h" #include "gfig-dialog.h" +#include "gfig-poly.h" #include "libgimp/stdplugins-intl.h" diff --git a/plug-ins/gfig/gfig-spiral.c b/plug-ins/gfig/gfig-spiral.c index 2fb5366249..bffa644402 100644 --- a/plug-ins/gfig/gfig-spiral.c +++ b/plug-ins/gfig/gfig-spiral.c @@ -33,6 +33,7 @@ #include "gfig.h" #include "gfig-dobject.h" #include "gfig-line.h" +#include "gfig-spiral.h" #include "gfig-dialog.h" #include "libgimp/stdplugins-intl.h" diff --git a/plug-ins/gfig/gfig-star.c b/plug-ins/gfig/gfig-star.c index 1796787c49..dc419320f8 100644 --- a/plug-ins/gfig/gfig-star.c +++ b/plug-ins/gfig/gfig-star.c @@ -31,6 +31,7 @@ #include "gfig.h" #include "gfig-line.h" #include "gfig-dobject.h" +#include "gfig-star.h" #include "gfig-dialog.h" #include "libgimp/stdplugins-intl.h" diff --git a/plug-ins/gimpressionist/general.c b/plug-ins/gimpressionist/general.c index 04d6aeef06..065c9cfe70 100644 --- a/plug-ins/gimpressionist/general.c +++ b/plug-ins/gimpressionist/general.c @@ -7,6 +7,7 @@ #include "gimpressionist.h" #include "infile.h" +#include "general.h" #include "libgimp/stdplugins-intl.h" diff --git a/plug-ins/gimpressionist/ppmtool.c b/plug-ins/gimpressionist/ppmtool.c index 0666259b84..f11f5de54d 100644 --- a/plug-ins/gimpressionist/ppmtool.c +++ b/plug-ins/gimpressionist/ppmtool.c @@ -14,7 +14,7 @@ #include "libgimp/stdplugins-intl.h" -int +static int readline (FILE *f, char *buffer, int len) { do @@ -212,7 +212,7 @@ struct _BrushHeader unsigned int spacing; /* brush spacing */ }; -void +static void msb2lsb (unsigned int *i) { guchar *p = (guchar *)i, c; @@ -237,7 +237,7 @@ fopen_from_search_path (const gchar * fn, const char * mode) return f; } -void +static void load_gimp_brush (const gchar *fn, ppm_t *p) { FILE *f; diff --git a/plug-ins/gimpressionist/preview.c b/plug-ins/gimpressionist/preview.c index 649b8f8afe..35b3e61d5b 100644 --- a/plug-ins/gimpressionist/preview.c +++ b/plug-ins/gimpressionist/preview.c @@ -10,6 +10,7 @@ #include "gimpressionist.h" #include "ppmtool.h" #include "infile.h" +#include "preview.h" #include "libgimp/stdplugins-intl.h" diff --git a/plug-ins/gimpressionist/preview.h b/plug-ins/gimpressionist/preview.h index 7dabecc16d..bc772d65b2 100644 --- a/plug-ins/gimpressionist/preview.h +++ b/plug-ins/gimpressionist/preview.h @@ -4,6 +4,6 @@ GtkWidget* create_preview (void); void updatepreview (GtkWidget *wg, gpointer d); void preview_free_resources(void); -void preview_set_button_label(gchar * text); +void preview_set_button_label(const gchar * text); #endif /* #ifndef __PREVIEW_H */ diff --git a/plug-ins/gimpressionist/size.h b/plug-ins/gimpressionist/size.h index f35f49b338..b186f1d2fb 100644 --- a/plug-ins/gimpressionist/size.h +++ b/plug-ins/gimpressionist/size.h @@ -18,6 +18,6 @@ void size_restore (void); void create_sizepage (GtkNotebook *); int size_type_input (int in); -void size_map_free_resources (); +void size_map_free_resources (void); #endif /* #ifndef __SIZE_H */ diff --git a/plug-ins/jpeg/jpeg-save.c b/plug-ins/jpeg/jpeg-save.c index 3ab2504958..e04d89baa8 100644 --- a/plug-ins/jpeg/jpeg-save.c +++ b/plug-ins/jpeg/jpeg-save.c @@ -1085,12 +1085,12 @@ typedef struct typedef my_destination_mgr *my_dest_ptr; -void +static void init_destination (j_compress_ptr cinfo) { } -gboolean +static gboolean empty_output_buffer (j_compress_ptr cinfo) { my_dest_ptr dest = (my_dest_ptr) cinfo->dest; @@ -1105,7 +1105,7 @@ empty_output_buffer (j_compress_ptr cinfo) return TRUE; } -void +static void term_destination (j_compress_ptr cinfo) { my_dest_ptr dest = (my_dest_ptr) cinfo->dest; diff --git a/plug-ins/uri/uri-backend-gnomevfs.c b/plug-ins/uri/uri-backend-gnomevfs.c index fd0c589e8c..7806b2b926 100644 --- a/plug-ins/uri/uri-backend-gnomevfs.c +++ b/plug-ins/uri/uri-backend-gnomevfs.c @@ -30,6 +30,8 @@ #include #include +#include "uri-backend.h" + #include "libgimp/stdplugins-intl.h" diff --git a/plug-ins/uri/uri-backend-libcurl.c b/plug-ins/uri/uri-backend-libcurl.c index 1c7af9d12f..307aa00742 100644 --- a/plug-ins/uri/uri-backend-libcurl.c +++ b/plug-ins/uri/uri-backend-libcurl.c @@ -30,6 +30,8 @@ #include #include +#include "uri-backend.h" + #include "libgimp/stdplugins-intl.h" diff --git a/plug-ins/uri/uri-backend-wget.c b/plug-ins/uri/uri-backend-wget.c index 8a044ad472..2f762c3c3c 100644 --- a/plug-ins/uri/uri-backend-wget.c +++ b/plug-ins/uri/uri-backend-wget.c @@ -34,6 +34,8 @@ #include #include +#include "uri-backend.h" + #include "libgimp/stdplugins-intl.h" diff --git a/plug-ins/winicon/icoload.c b/plug-ins/winicon/icoload.c index 49fb08ed96..d746eb047d 100644 --- a/plug-ins/winicon/icoload.c +++ b/plug-ins/winicon/icoload.c @@ -138,7 +138,7 @@ ico_read_init (FILE *fp) } -gboolean +static gboolean ico_read_size (FILE *fp, IcoLoadInfo *info) { @@ -577,7 +577,7 @@ ico_read_icon (FILE *fp, return TRUE; } -gint32 +static gint32 ico_load_layer (FILE *fp, gint32 image, gint32 icon_num, diff --git a/plug-ins/winicon/icosave.c b/plug-ins/winicon/icosave.c index 8a3ed20aad..39ad5c0366 100644 --- a/plug-ins/winicon/icosave.c +++ b/plug-ins/winicon/icosave.c @@ -35,6 +35,7 @@ #include "main.h" #include "icoload.h" +#include "icosave.h" #include "icodialog.h" #include "libgimp/stdplugins-intl.h"