callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modules/cdisplay_colorblind.c modules/cdisplay_gamma.c

Browse Source 
2006-11-24  Simon Budig  <simon@gimp.org>

	* 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.
This commit is contained in:
Simon Budig
2006-11-24 16:15:50 +00:00
committed by Simon Budig
parent 71edb562a0
commit 2db432ad1f
12 changed files with 129 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
2006-11-24 Simon Budig <simon@gimp.org>
* 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 <simon@gimp.org> 2006-11-24 Simon Budig <simon@gimp.org>
* plug-ins/sel2path/sel2path_adv_dialog.c * plug-ins/sel2path/sel2path_adv_dialog.c

3
modules/cdisplay_colorblind.c
View File

@ -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 GType cdisplay_colorblind_get_type (GTypeModule *module);
static void cdisplay_colorblind_class_init (CdisplayColorblindClass *klass); static void cdisplay_colorblind_class_init (CdisplayColorblindClass *klass);
static void cdisplay_colorblind_init (CdisplayColorblind *colorblind); static void cdisplay_colorblind_init (CdisplayColorblind *colorblind);

27
modules/cdisplay_gamma.c
View File

@ -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 GType cdisplay_gamma_get_type (GTypeModule *module);
static void cdisplay_gamma_class_init (CdisplayGammaClass *klass); static void cdisplay_gamma_class_init (CdisplayGammaClass *klass);
@ -121,14 +124,14 @@ cdisplay_gamma_get_type (GTypeModule *module)
const GTypeInfo display_info = const GTypeInfo display_info =
{ {
sizeof (CdisplayGammaClass), sizeof (CdisplayGammaClass),
(GBaseInitFunc) NULL, (GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL, (GBaseFinalizeFunc) NULL,
(GClassInitFunc) cdisplay_gamma_class_init, (GClassInitFunc) cdisplay_gamma_class_init,
NULL, /* class_finalize */ NULL, /* class_finalize */
NULL, /* class_data */ NULL, /* class_data */
sizeof (CdisplayGamma), sizeof (CdisplayGamma),
0, /* n_preallocs */ 0, /* n_preallocs */
NULL /* instance_init */ NULL /* instance_init */
}; };
cdisplay_gamma_type = cdisplay_gamma_type =
@ -232,10 +235,10 @@ cdisplay_gamma_convert (GimpColorDisplay *display,
{ {
i = width; i = width;
while (i--) while (i--)
{ {
*buf = gamma->lookup[*buf]; *buf = gamma->lookup[*buf];
buf++; buf++;
} }
buf += bpl; buf += bpl;
} }
} }

27
modules/cdisplay_highcontrast.c
View File

@ -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 GType cdisplay_contrast_get_type (GTypeModule *module);
static void cdisplay_contrast_class_init (CdisplayContrastClass *klass); static void cdisplay_contrast_class_init (CdisplayContrastClass *klass);
@ -121,14 +124,14 @@ cdisplay_contrast_get_type (GTypeModule *module)
const GTypeInfo display_info = const GTypeInfo display_info =
{ {
sizeof (CdisplayContrastClass), sizeof (CdisplayContrastClass),
(GBaseInitFunc) NULL, (GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL, (GBaseFinalizeFunc) NULL,
(GClassInitFunc) cdisplay_contrast_class_init, (GClassInitFunc) cdisplay_contrast_class_init,
NULL, /* class_finalize */ NULL, /* class_finalize */
NULL, /* class_data */ NULL, /* class_data */
sizeof (CdisplayContrast), sizeof (CdisplayContrast),
0, /* n_preallocs */ 0, /* n_preallocs */
NULL /* instance_init */ NULL /* instance_init */
}; };
cdisplay_contrast_type = cdisplay_contrast_type =
@ -232,10 +235,10 @@ cdisplay_contrast_convert (GimpColorDisplay *display,
{ {
i = width; i = width;
while (i--) while (i--)
{ {
*buf = contrast->lookup[*buf]; *buf = contrast->lookup[*buf];
buf++; buf++;
} }
buf += bpl; buf += bpl;
} }
} }

13
modules/cdisplay_lcms.c
View File

@ -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 GType cdisplay_lcms_get_type (GTypeModule *module);
static void cdisplay_lcms_class_init (CdisplayLcmsClass *klass); static void cdisplay_lcms_class_init (CdisplayLcmsClass *klass);
static void cdisplay_lcms_init (CdisplayLcms *lcms); static void cdisplay_lcms_init (CdisplayLcms *lcms);
@ -149,16 +152,16 @@ cdisplay_lcms_get_type (GTypeModule *module)
(GBaseInitFunc) NULL, (GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL, (GBaseFinalizeFunc) NULL,
(GClassInitFunc) cdisplay_lcms_class_init, (GClassInitFunc) cdisplay_lcms_class_init,
NULL, /* class_finalize */ NULL, /* class_finalize */
NULL, /* class_data */ NULL, /* class_data */
sizeof (CdisplayLcms), sizeof (CdisplayLcms),
0, /* n_preallocs */ 0, /* n_preallocs */
(GInstanceInitFunc) cdisplay_lcms_init, (GInstanceInitFunc) cdisplay_lcms_init,
}; };
cdisplay_lcms_type = cdisplay_lcms_type =
g_type_module_register_type (module, GIMP_TYPE_COLOR_DISPLAY, g_type_module_register_type (module, GIMP_TYPE_COLOR_DISPLAY,
"CdisplayLcms", &display_info, 0); "CdisplayLcms", &display_info, 0);
} }
return cdisplay_lcms_type; return cdisplay_lcms_type;

17
modules/cdisplay_proof.c
View File

@ -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 GType cdisplay_proof_get_type (GTypeModule *module);
static void cdisplay_proof_class_init (CdisplayProofClass *klass); static void cdisplay_proof_class_init (CdisplayProofClass *klass);
static void cdisplay_proof_init (CdisplayProof *proof); static void cdisplay_proof_init (CdisplayProof *proof);
@ -135,16 +138,16 @@ cdisplay_proof_get_type (GTypeModule *module)
(GBaseInitFunc) NULL, (GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL, (GBaseFinalizeFunc) NULL,
(GClassInitFunc) cdisplay_proof_class_init, (GClassInitFunc) cdisplay_proof_class_init,
NULL, /* class_finalize */ NULL, /* class_finalize */
NULL, /* class_data */ NULL, /* class_data */
sizeof (CdisplayProof), sizeof (CdisplayProof),
0, /* n_preallocs */ 0, /* n_preallocs */
(GInstanceInitFunc) cdisplay_proof_init, (GInstanceInitFunc) cdisplay_proof_init,
}; };
cdisplay_proof_type = cdisplay_proof_type =
g_type_module_register_type (module, GIMP_TYPE_COLOR_DISPLAY, g_type_module_register_type (module, GIMP_TYPE_COLOR_DISPLAY,
"CdisplayProof", &display_info, 0); "CdisplayProof", &display_info, 0);
} }
return cdisplay_proof_type; return cdisplay_proof_type;
@ -268,8 +271,8 @@ cdisplay_proof_set_property (GObject *object,
static void static void
cdisplay_proof_convert (GimpColorDisplay *display, cdisplay_proof_convert (GimpColorDisplay *display,
guchar *buf, guchar *buf,
gint width, gint width,
gint height, gint height,
gint bpp, gint bpp,
gint bpl) gint bpl)

51
modules/colorsel_cmyk.c
View File

@ -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 GType colorsel_cmyk_get_type (GTypeModule *module);
static void colorsel_cmyk_class_init (ColorselCmykClass *klass); static void colorsel_cmyk_class_init (ColorselCmykClass *klass);
static void colorsel_cmyk_init (ColorselCmyk *cmyk); static void colorsel_cmyk_init (ColorselCmyk *cmyk);
@ -102,14 +105,14 @@ colorsel_cmyk_get_type (GTypeModule *module)
const GTypeInfo select_info = const GTypeInfo select_info =
{ {
sizeof (ColorselCmykClass), sizeof (ColorselCmykClass),
(GBaseInitFunc) NULL, (GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL, (GBaseFinalizeFunc) NULL,
(GClassInitFunc) colorsel_cmyk_class_init, (GClassInitFunc) colorsel_cmyk_class_init,
NULL, /* class_finalize */ NULL, /* class_finalize */
NULL, /* class_data */ NULL, /* class_data */
sizeof (ColorselCmyk), sizeof (ColorselCmyk),
0, /* n_preallocs */ 0, /* n_preallocs */
(GInstanceInitFunc) colorsel_cmyk_init, (GInstanceInitFunc) colorsel_cmyk_init,
}; };
colorsel_cmyk_type = colorsel_cmyk_type =
@ -175,19 +178,19 @@ colorsel_cmyk_init (ColorselCmyk *module)
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
adj = gimp_scale_entry_new (GTK_TABLE (table), 1, i, adj = gimp_scale_entry_new (GTK_TABLE (table), 1, i,
gettext (cmyk_labels[i]), gettext (cmyk_labels[i]),
-1, -1, -1, -1,
0.0, 0.0,
0.0, 100.0, 0.0, 100.0,
1.0, 10.0, 1.0, 10.0,
0, 0,
TRUE, 0.0, 0.0, TRUE, 0.0, 0.0,
gettext (cmyk_tips[i]), gettext (cmyk_tips[i]),
NULL); NULL);
g_signal_connect (adj, "value-changed", g_signal_connect (adj, "value-changed",
G_CALLBACK (colorsel_cmyk_adj_update), G_CALLBACK (colorsel_cmyk_adj_update),
module); module);
module->adj[i] = GTK_ADJUSTMENT (adj); module->adj[i] = GTK_ADJUSTMENT (adj);
} }
@ -204,8 +207,8 @@ colorsel_cmyk_init (ColorselCmyk *module)
1.0, 0); 1.0, 0);
gtk_table_attach (GTK_TABLE (table), spinbutton, gtk_table_attach (GTK_TABLE (table), spinbutton,
3, 4, i, i + 1, 3, 4, i, i + 1,
GTK_SHRINK, GTK_SHRINK, 0, 0); GTK_SHRINK, GTK_SHRINK, 0, 0);
gtk_widget_show (spinbutton); gtk_widget_show (spinbutton);
gimp_help_set_help_data (spinbutton, gimp_help_set_help_data (spinbutton,
@ -224,8 +227,8 @@ colorsel_cmyk_init (ColorselCmyk *module)
static void static void
colorsel_cmyk_set_color (GimpColorSelector *selector, colorsel_cmyk_set_color (GimpColorSelector *selector,
const GimpRGB *rgb, const GimpRGB *rgb,
const GimpHSV *hsv) const GimpHSV *hsv)
{ {
ColorselCmyk *module = COLORSEL_CMYK (selector); ColorselCmyk *module = COLORSEL_CMYK (selector);
@ -239,7 +242,7 @@ colorsel_cmyk_set_color (GimpColorSelector *selector,
static void static void
colorsel_cmyk_adj_update (GtkAdjustment *adj, colorsel_cmyk_adj_update (GtkAdjustment *adj,
ColorselCmyk *module) ColorselCmyk *module)
{ {
GimpColorSelector *selector = GIMP_COLOR_SELECTOR (module); GimpColorSelector *selector = GIMP_COLOR_SELECTOR (module);
gint i; gint i;

47
modules/colorsel_cmyk_lcms.c
View File

@ -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 GType colorsel_cmyk_get_type (GTypeModule *module);
static void colorsel_cmyk_class_init (ColorselCmykClass *klass); static void colorsel_cmyk_class_init (ColorselCmykClass *klass);
static void colorsel_cmyk_init (ColorselCmyk *cmyk); static void colorsel_cmyk_init (ColorselCmyk *cmyk);
@ -121,14 +124,14 @@ colorsel_cmyk_get_type (GTypeModule *module)
const GTypeInfo select_info = const GTypeInfo select_info =
{ {
sizeof (ColorselCmykClass), sizeof (ColorselCmykClass),
(GBaseInitFunc) NULL, (GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL, (GBaseFinalizeFunc) NULL,
(GClassInitFunc) colorsel_cmyk_class_init, (GClassInitFunc) colorsel_cmyk_class_init,
NULL, /* class_finalize */ NULL, /* class_finalize */
NULL, /* class_data */ NULL, /* class_data */
sizeof (ColorselCmyk), sizeof (ColorselCmyk),
0, /* n_preallocs */ 0, /* n_preallocs */
(GInstanceInitFunc) colorsel_cmyk_init, (GInstanceInitFunc) colorsel_cmyk_init,
}; };
colorsel_cmyk_type = colorsel_cmyk_type =
@ -202,19 +205,19 @@ colorsel_cmyk_init (ColorselCmyk *module)
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
adj = gimp_scale_entry_new (GTK_TABLE (table), 1, i, adj = gimp_scale_entry_new (GTK_TABLE (table), 1, i,
gettext (cmyk_labels[i]), gettext (cmyk_labels[i]),
-1, -1, -1, -1,
0.0, 0.0,
0.0, 100.0, 0.0, 100.0,
1.0, 10.0, 1.0, 10.0,
0, 0,
TRUE, 0.0, 0.0, TRUE, 0.0, 0.0,
gettext (cmyk_tips[i]), gettext (cmyk_tips[i]),
NULL); NULL);
g_signal_connect (adj, "value-changed", g_signal_connect (adj, "value-changed",
G_CALLBACK (colorsel_cmyk_adj_update), G_CALLBACK (colorsel_cmyk_adj_update),
module); module);
module->adj[i] = GTK_ADJUSTMENT (adj); module->adj[i] = GTK_ADJUSTMENT (adj);
} }
@ -243,8 +246,8 @@ colorsel_cmyk_dispose (GObject *object)
static void static void
colorsel_cmyk_set_color (GimpColorSelector *selector, colorsel_cmyk_set_color (GimpColorSelector *selector,
const GimpRGB *rgb, const GimpRGB *rgb,
const GimpHSV *hsv) const GimpHSV *hsv)
{ {
ColorselCmyk *module = COLORSEL_CMYK (selector); ColorselCmyk *module = COLORSEL_CMYK (selector);
@ -307,7 +310,7 @@ colorsel_cmyk_set_config (GimpColorSelector *selector,
static void static void
colorsel_cmyk_adj_update (GtkAdjustment *adj, colorsel_cmyk_adj_update (GtkAdjustment *adj,
ColorselCmyk *module) ColorselCmyk *module)
{ {
GimpColorSelector *selector = GIMP_COLOR_SELECTOR (module); GimpColorSelector *selector = GIMP_COLOR_SELECTOR (module);
gint i; gint i;

3
modules/colorsel_triangle.c
View File

@ -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 GType colorsel_triangle_get_type (GTypeModule *module);
static void colorsel_triangle_class_init (ColorselTriangleClass *klass); static void colorsel_triangle_class_init (ColorselTriangleClass *klass);
static void colorsel_triangle_init (ColorselTriangle *triangle); static void colorsel_triangle_init (ColorselTriangle *triangle);

3
modules/colorsel_water.c
View File

@ -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 GType colorsel_water_get_type (GTypeModule *module);
static void colorsel_water_class_init (ColorselWaterClass *klass); static void colorsel_water_class_init (ColorselWaterClass *klass);
static void colorsel_water_init (ColorselWater *water); static void colorsel_water_init (ColorselWater *water);

3
modules/controller_linux_input.c
View File

@ -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); GType linux_input_get_type (GTypeModule *module);
static void linux_input_class_init (ControllerLinuxInputClass *klass); static void linux_input_class_init (ControllerLinuxInputClass *klass);
static void linux_input_dispose (GObject *object); static void linux_input_dispose (GObject *object);

3
modules/controller_midi.c
View File

@ -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); GType midi_get_type (GTypeModule *module);
static void midi_class_init (ControllerMidiClass *klass); static void midi_class_init (ControllerMidiClass *klass);