diff --git a/ChangeLog b/ChangeLog index 8951864814..852fe0253c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2006-11-24 Simon Budig + + * modules/cdisplay_colorblind.c + * modules/cdisplay_gamma.c + * modules/cdisplay_highcontrast.c + * modules/cdisplay_lcms.c + * modules/cdisplay_proof.c + * modules/colorsel_cmyk.c + * modules/colorsel_cmyk_lcms.c + * modules/colorsel_triangle.c + * modules/colorsel_water.c + * modules/controller_linux_input.c + * modules/controller_midi.c: fixed prototype warning, untabbified. + 2006-11-24 Simon Budig * plug-ins/sel2path/sel2path_adv_dialog.c diff --git a/modules/cdisplay_colorblind.c b/modules/cdisplay_colorblind.c index e2c54d2314..ece520660c 100644 --- a/modules/cdisplay_colorblind.c +++ b/modules/cdisplay_colorblind.c @@ -113,6 +113,9 @@ enum }; +G_MODULE_EXPORT const GimpModuleInfo * gimp_module_query (GTypeModule *module); +G_MODULE_EXPORT gboolean gimp_module_register (GTypeModule *module); + static GType cdisplay_colorblind_get_type (GTypeModule *module); static void cdisplay_colorblind_class_init (CdisplayColorblindClass *klass); static void cdisplay_colorblind_init (CdisplayColorblind *colorblind); diff --git a/modules/cdisplay_gamma.c b/modules/cdisplay_gamma.c index 5c07901831..ffc62c78d6 100644 --- a/modules/cdisplay_gamma.c +++ b/modules/cdisplay_gamma.c @@ -62,6 +62,9 @@ enum }; +G_MODULE_EXPORT const GimpModuleInfo * gimp_module_query (GTypeModule *module); +G_MODULE_EXPORT gboolean gimp_module_register (GTypeModule *module); + static GType cdisplay_gamma_get_type (GTypeModule *module); static void cdisplay_gamma_class_init (CdisplayGammaClass *klass); @@ -121,14 +124,14 @@ cdisplay_gamma_get_type (GTypeModule *module) const GTypeInfo display_info = { sizeof (CdisplayGammaClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) cdisplay_gamma_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (CdisplayGamma), - 0, /* n_preallocs */ - NULL /* instance_init */ + (GBaseInitFunc) NULL, + (GBaseFinalizeFunc) NULL, + (GClassInitFunc) cdisplay_gamma_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (CdisplayGamma), + 0, /* n_preallocs */ + NULL /* instance_init */ }; cdisplay_gamma_type = @@ -232,10 +235,10 @@ cdisplay_gamma_convert (GimpColorDisplay *display, { i = width; while (i--) - { - *buf = gamma->lookup[*buf]; - buf++; - } + { + *buf = gamma->lookup[*buf]; + buf++; + } buf += bpl; } } diff --git a/modules/cdisplay_highcontrast.c b/modules/cdisplay_highcontrast.c index cca0f9dc18..fdc2455839 100644 --- a/modules/cdisplay_highcontrast.c +++ b/modules/cdisplay_highcontrast.c @@ -62,6 +62,9 @@ enum }; +G_MODULE_EXPORT const GimpModuleInfo * gimp_module_query (GTypeModule *module); +G_MODULE_EXPORT gboolean gimp_module_register (GTypeModule *module); + static GType cdisplay_contrast_get_type (GTypeModule *module); static void cdisplay_contrast_class_init (CdisplayContrastClass *klass); @@ -121,14 +124,14 @@ cdisplay_contrast_get_type (GTypeModule *module) const GTypeInfo display_info = { sizeof (CdisplayContrastClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) cdisplay_contrast_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (CdisplayContrast), - 0, /* n_preallocs */ - NULL /* instance_init */ + (GBaseInitFunc) NULL, + (GBaseFinalizeFunc) NULL, + (GClassInitFunc) cdisplay_contrast_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (CdisplayContrast), + 0, /* n_preallocs */ + NULL /* instance_init */ }; cdisplay_contrast_type = @@ -232,10 +235,10 @@ cdisplay_contrast_convert (GimpColorDisplay *display, { i = width; while (i--) - { - *buf = contrast->lookup[*buf]; - buf++; - } + { + *buf = contrast->lookup[*buf]; + buf++; + } buf += bpl; } } diff --git a/modules/cdisplay_lcms.c b/modules/cdisplay_lcms.c index 64e05c6251..aebf7981e6 100644 --- a/modules/cdisplay_lcms.c +++ b/modules/cdisplay_lcms.c @@ -67,6 +67,9 @@ enum }; +G_MODULE_EXPORT const GimpModuleInfo * gimp_module_query (GTypeModule *module); +G_MODULE_EXPORT gboolean gimp_module_register (GTypeModule *module); + static GType cdisplay_lcms_get_type (GTypeModule *module); static void cdisplay_lcms_class_init (CdisplayLcmsClass *klass); static void cdisplay_lcms_init (CdisplayLcms *lcms); @@ -149,16 +152,16 @@ cdisplay_lcms_get_type (GTypeModule *module) (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) cdisplay_lcms_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ + NULL, /* class_finalize */ + NULL, /* class_data */ sizeof (CdisplayLcms), - 0, /* n_preallocs */ + 0, /* n_preallocs */ (GInstanceInitFunc) cdisplay_lcms_init, }; cdisplay_lcms_type = - g_type_module_register_type (module, GIMP_TYPE_COLOR_DISPLAY, - "CdisplayLcms", &display_info, 0); + g_type_module_register_type (module, GIMP_TYPE_COLOR_DISPLAY, + "CdisplayLcms", &display_info, 0); } return cdisplay_lcms_type; diff --git a/modules/cdisplay_proof.c b/modules/cdisplay_proof.c index 30f0f23bb8..95b5bd671b 100644 --- a/modules/cdisplay_proof.c +++ b/modules/cdisplay_proof.c @@ -71,6 +71,9 @@ enum }; +G_MODULE_EXPORT const GimpModuleInfo * gimp_module_query (GTypeModule *module); +G_MODULE_EXPORT gboolean gimp_module_register (GTypeModule *module); + static GType cdisplay_proof_get_type (GTypeModule *module); static void cdisplay_proof_class_init (CdisplayProofClass *klass); static void cdisplay_proof_init (CdisplayProof *proof); @@ -135,16 +138,16 @@ cdisplay_proof_get_type (GTypeModule *module) (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) cdisplay_proof_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ + NULL, /* class_finalize */ + NULL, /* class_data */ sizeof (CdisplayProof), - 0, /* n_preallocs */ + 0, /* n_preallocs */ (GInstanceInitFunc) cdisplay_proof_init, }; cdisplay_proof_type = - g_type_module_register_type (module, GIMP_TYPE_COLOR_DISPLAY, - "CdisplayProof", &display_info, 0); + g_type_module_register_type (module, GIMP_TYPE_COLOR_DISPLAY, + "CdisplayProof", &display_info, 0); } return cdisplay_proof_type; @@ -268,8 +271,8 @@ cdisplay_proof_set_property (GObject *object, static void cdisplay_proof_convert (GimpColorDisplay *display, - guchar *buf, - gint width, + guchar *buf, + gint width, gint height, gint bpp, gint bpl) diff --git a/modules/colorsel_cmyk.c b/modules/colorsel_cmyk.c index 9e5987644a..33224e8b55 100644 --- a/modules/colorsel_cmyk.c +++ b/modules/colorsel_cmyk.c @@ -54,6 +54,9 @@ struct _ColorselCmykClass }; +G_MODULE_EXPORT const GimpModuleInfo * gimp_module_query (GTypeModule *module); +G_MODULE_EXPORT gboolean gimp_module_register (GTypeModule *module); + static GType colorsel_cmyk_get_type (GTypeModule *module); static void colorsel_cmyk_class_init (ColorselCmykClass *klass); static void colorsel_cmyk_init (ColorselCmyk *cmyk); @@ -102,14 +105,14 @@ colorsel_cmyk_get_type (GTypeModule *module) const GTypeInfo select_info = { sizeof (ColorselCmykClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) colorsel_cmyk_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (ColorselCmyk), - 0, /* n_preallocs */ - (GInstanceInitFunc) colorsel_cmyk_init, + (GBaseInitFunc) NULL, + (GBaseFinalizeFunc) NULL, + (GClassInitFunc) colorsel_cmyk_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (ColorselCmyk), + 0, /* n_preallocs */ + (GInstanceInitFunc) colorsel_cmyk_init, }; colorsel_cmyk_type = @@ -175,19 +178,19 @@ colorsel_cmyk_init (ColorselCmyk *module) for (i = 0; i < 4; i++) { adj = gimp_scale_entry_new (GTK_TABLE (table), 1, i, - gettext (cmyk_labels[i]), - -1, -1, - 0.0, - 0.0, 100.0, - 1.0, 10.0, - 0, - TRUE, 0.0, 0.0, - gettext (cmyk_tips[i]), - NULL); + gettext (cmyk_labels[i]), + -1, -1, + 0.0, + 0.0, 100.0, + 1.0, 10.0, + 0, + TRUE, 0.0, 0.0, + gettext (cmyk_tips[i]), + NULL); g_signal_connect (adj, "value-changed", - G_CALLBACK (colorsel_cmyk_adj_update), - module); + G_CALLBACK (colorsel_cmyk_adj_update), + module); module->adj[i] = GTK_ADJUSTMENT (adj); } @@ -204,8 +207,8 @@ colorsel_cmyk_init (ColorselCmyk *module) 1.0, 0); gtk_table_attach (GTK_TABLE (table), spinbutton, - 3, 4, i, i + 1, - GTK_SHRINK, GTK_SHRINK, 0, 0); + 3, 4, i, i + 1, + GTK_SHRINK, GTK_SHRINK, 0, 0); gtk_widget_show (spinbutton); gimp_help_set_help_data (spinbutton, @@ -224,8 +227,8 @@ colorsel_cmyk_init (ColorselCmyk *module) static void colorsel_cmyk_set_color (GimpColorSelector *selector, - const GimpRGB *rgb, - const GimpHSV *hsv) + const GimpRGB *rgb, + const GimpHSV *hsv) { ColorselCmyk *module = COLORSEL_CMYK (selector); @@ -239,7 +242,7 @@ colorsel_cmyk_set_color (GimpColorSelector *selector, static void colorsel_cmyk_adj_update (GtkAdjustment *adj, - ColorselCmyk *module) + ColorselCmyk *module) { GimpColorSelector *selector = GIMP_COLOR_SELECTOR (module); gint i; diff --git a/modules/colorsel_cmyk_lcms.c b/modules/colorsel_cmyk_lcms.c index 629496b0e8..cbebd35cec 100644 --- a/modules/colorsel_cmyk_lcms.c +++ b/modules/colorsel_cmyk_lcms.c @@ -69,6 +69,9 @@ struct _ColorselCmykClass }; +G_MODULE_EXPORT const GimpModuleInfo * gimp_module_query (GTypeModule *module); +G_MODULE_EXPORT gboolean gimp_module_register (GTypeModule *module); + static GType colorsel_cmyk_get_type (GTypeModule *module); static void colorsel_cmyk_class_init (ColorselCmykClass *klass); static void colorsel_cmyk_init (ColorselCmyk *cmyk); @@ -121,14 +124,14 @@ colorsel_cmyk_get_type (GTypeModule *module) const GTypeInfo select_info = { sizeof (ColorselCmykClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) colorsel_cmyk_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (ColorselCmyk), - 0, /* n_preallocs */ - (GInstanceInitFunc) colorsel_cmyk_init, + (GBaseInitFunc) NULL, + (GBaseFinalizeFunc) NULL, + (GClassInitFunc) colorsel_cmyk_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (ColorselCmyk), + 0, /* n_preallocs */ + (GInstanceInitFunc) colorsel_cmyk_init, }; colorsel_cmyk_type = @@ -202,19 +205,19 @@ colorsel_cmyk_init (ColorselCmyk *module) for (i = 0; i < 4; i++) { adj = gimp_scale_entry_new (GTK_TABLE (table), 1, i, - gettext (cmyk_labels[i]), - -1, -1, - 0.0, - 0.0, 100.0, - 1.0, 10.0, - 0, - TRUE, 0.0, 0.0, - gettext (cmyk_tips[i]), - NULL); + gettext (cmyk_labels[i]), + -1, -1, + 0.0, + 0.0, 100.0, + 1.0, 10.0, + 0, + TRUE, 0.0, 0.0, + gettext (cmyk_tips[i]), + NULL); g_signal_connect (adj, "value-changed", - G_CALLBACK (colorsel_cmyk_adj_update), - module); + G_CALLBACK (colorsel_cmyk_adj_update), + module); module->adj[i] = GTK_ADJUSTMENT (adj); } @@ -243,8 +246,8 @@ colorsel_cmyk_dispose (GObject *object) static void colorsel_cmyk_set_color (GimpColorSelector *selector, - const GimpRGB *rgb, - const GimpHSV *hsv) + const GimpRGB *rgb, + const GimpHSV *hsv) { ColorselCmyk *module = COLORSEL_CMYK (selector); @@ -307,7 +310,7 @@ colorsel_cmyk_set_config (GimpColorSelector *selector, static void colorsel_cmyk_adj_update (GtkAdjustment *adj, - ColorselCmyk *module) + ColorselCmyk *module) { GimpColorSelector *selector = GIMP_COLOR_SELECTOR (module); gint i; diff --git a/modules/colorsel_triangle.c b/modules/colorsel_triangle.c index 803d969494..714d51e012 100644 --- a/modules/colorsel_triangle.c +++ b/modules/colorsel_triangle.c @@ -70,6 +70,9 @@ struct _ColorselTriangleClass }; +G_MODULE_EXPORT const GimpModuleInfo * gimp_module_query (GTypeModule *module); +G_MODULE_EXPORT gboolean gimp_module_register (GTypeModule *module); + static GType colorsel_triangle_get_type (GTypeModule *module); static void colorsel_triangle_class_init (ColorselTriangleClass *klass); static void colorsel_triangle_init (ColorselTriangle *triangle); diff --git a/modules/colorsel_water.c b/modules/colorsel_water.c index b950355441..004ac862a4 100644 --- a/modules/colorsel_water.c +++ b/modules/colorsel_water.c @@ -59,6 +59,9 @@ struct _ColorselWaterClass }; +G_MODULE_EXPORT const GimpModuleInfo * gimp_module_query (GTypeModule *module); +G_MODULE_EXPORT gboolean gimp_module_register (GTypeModule *module); + static GType colorsel_water_get_type (GTypeModule *module); static void colorsel_water_class_init (ColorselWaterClass *klass); static void colorsel_water_init (ColorselWater *water); diff --git a/modules/controller_linux_input.c b/modules/controller_linux_input.c index 9f8041f973..55a21e1048 100644 --- a/modules/controller_linux_input.c +++ b/modules/controller_linux_input.c @@ -123,6 +123,9 @@ struct _ControllerLinuxInputClass }; +G_MODULE_EXPORT const GimpModuleInfo * gimp_module_query (GTypeModule *module); +G_MODULE_EXPORT gboolean gimp_module_register (GTypeModule *module); + GType linux_input_get_type (GTypeModule *module); static void linux_input_class_init (ControllerLinuxInputClass *klass); static void linux_input_dispose (GObject *object); diff --git a/modules/controller_midi.c b/modules/controller_midi.c index 1d5b204c5e..84fe51904c 100644 --- a/modules/controller_midi.c +++ b/modules/controller_midi.c @@ -105,6 +105,9 @@ struct _ControllerMidiClass }; +G_MODULE_EXPORT const GimpModuleInfo * gimp_module_query (GTypeModule *module); +G_MODULE_EXPORT gboolean gimp_module_register (GTypeModule *module); + GType midi_get_type (GTypeModule *module); static void midi_class_init (ControllerMidiClass *klass);