cbdcad7738
darktable is a virtual lighttable and darkroom for photographers: it manages your digital negatives in a database and lets you view them through a zoomable lighttable. It also enables you to develop raw images and enhance them. It tries to fill the gap between the many excellent existing free raw converters and image management tools (such as ufraw or f-spot). All editing is fully non-destructive and only operates on cached image buffers for display. The full image is only converted during export. Raw files, high-dynamic range and standard image formats such as jpeg are all supported. The core operates completely on floating point values, so darktable can not only be used for photography but also for scientifically acquired images or output of renderers (high dynamic range).
75 lines
5.9 KiB
Plaintext
75 lines
5.9 KiB
Plaintext
$OpenBSD: patch-src_iop_clipping_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
|
|
|
|
missing sentinel in function call; pushed upstream
|
|
|
|
--- src/iop/clipping.c.orig Thu Sep 16 22:31:51 2010
|
|
+++ src/iop/clipping.c Thu Sep 16 22:38:04 2010
|
|
@@ -653,15 +653,15 @@ void gui_init(struct dt_iop_module_t *self)
|
|
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->vflip), 4, 6, 0, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
|
|
g_signal_connect (G_OBJECT (g->hflip), "toggled", G_CALLBACK(toggled_callback), self);
|
|
g_signal_connect (G_OBJECT (g->vflip), "toggled", G_CALLBACK(toggled_callback), self);
|
|
- gtk_object_set (GTK_OBJECT(g->hflip), "tooltip-text", _("flip image vertically"), NULL);
|
|
- gtk_object_set (GTK_OBJECT(g->vflip), "tooltip-text", _("flip image horizontally"), NULL);
|
|
+ gtk_object_set (GTK_OBJECT(g->hflip), "tooltip-text", _("flip image vertically"), (char *)NULL);
|
|
+ gtk_object_set (GTK_OBJECT(g->vflip), "tooltip-text", _("flip image horizontally"), (char *)NULL);
|
|
|
|
g->label5 = GTK_LABEL(gtk_label_new(_("angle")));
|
|
gtk_misc_set_alignment(GTK_MISC(g->label5), 0.0, 0.5);
|
|
g->scale5 = DTGTK_SLIDER(dtgtk_slider_new_with_range(DARKTABLE_SLIDER_BAR, -180.0, 180.0, 0.25, p->angle, 2));
|
|
g_signal_connect (G_OBJECT (g->scale5), "value-changed",
|
|
G_CALLBACK (angle_callback), self);
|
|
- gtk_object_set (GTK_OBJECT(g->scale5), "tooltip-text", _("right-click and drag a line on the image to drag a straight line"), NULL);
|
|
+ gtk_object_set (GTK_OBJECT(g->scale5), "tooltip-text", _("right-click and drag a line on the image to drag a straight line"), (char *)NULL);
|
|
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->label5), 0, 2, 1, 2, GTK_EXPAND|GTK_FILL, 0, 0, 0);
|
|
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->scale5), 2, 6, 1, 2, GTK_EXPAND|GTK_FILL, 0, 0, 0);
|
|
|
|
@@ -700,7 +700,7 @@ void gui_init(struct dt_iop_module_t *self)
|
|
gtk_combo_box_set_active(g->aspect_presets, act);
|
|
g_signal_connect (G_OBJECT (g->aspect_presets), "changed",
|
|
G_CALLBACK (aspect_presets_changed), self);
|
|
- gtk_object_set(GTK_OBJECT(g->aspect_presets), "tooltip-text", _("set the aspect ratio (w/h)\npress ctrl-x to swap sides"), NULL);
|
|
+ gtk_object_set(GTK_OBJECT(g->aspect_presets), "tooltip-text", _("set the aspect ratio (w/h)\npress ctrl-x to swap sides"), (char *)NULL);
|
|
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->aspect_presets), 2, 6, 4, 5, GTK_EXPAND|GTK_FILL, 0, 0, 0);
|
|
|
|
|
|
@@ -717,7 +717,7 @@ void gui_init(struct dt_iop_module_t *self)
|
|
gtk_combo_box_append_text(g->guide_lines, _("golden mean"));
|
|
gtk_combo_box_set_active(g->guide_lines, GUIDE_NONE);
|
|
gtk_object_set (GTK_OBJECT(g->guide_lines), "tooltip-text", _("with this option, you can display guide lines "
|
|
- "to help compose your photograph."), NULL);
|
|
+ "to help compose your photograph."), (char *)NULL);
|
|
g_signal_connect (G_OBJECT (g->guide_lines), "changed",
|
|
G_CALLBACK (guides_presets_changed), self);
|
|
label = gtk_label_new(_("type"));
|
|
@@ -733,24 +733,24 @@ void gui_init(struct dt_iop_module_t *self)
|
|
g->flipVerGoldenGuide = DTGTK_TOGGLEBUTTON(dtgtk_togglebutton_new(dtgtk_cairo_paint_flip,0));
|
|
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->flipHorGoldenGuide), 2, 4, 7, 8, GTK_EXPAND|GTK_FILL, 0, 0, 0);
|
|
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->flipVerGoldenGuide), 4, 6, 7, 8, GTK_EXPAND|GTK_FILL, 0, 0, 0);
|
|
- gtk_object_set (GTK_OBJECT(g->flipHorGoldenGuide), "tooltip-text", _("flip guides vertically"), NULL);
|
|
- gtk_object_set (GTK_OBJECT(g->flipVerGoldenGuide), "tooltip-text", _("flip guides horizontally"), NULL);
|
|
+ gtk_object_set (GTK_OBJECT(g->flipHorGoldenGuide), "tooltip-text", _("flip guides vertically"), (char *)NULL);
|
|
+ gtk_object_set (GTK_OBJECT(g->flipVerGoldenGuide), "tooltip-text", _("flip guides horizontally"), (char *)NULL);
|
|
/*-------------------------------------------*/
|
|
g->goldenSectionBox = GTK_CHECK_BUTTON(gtk_check_button_new_with_label(_("golden sections")));
|
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g->goldenSectionBox), TRUE);
|
|
- gtk_object_set (GTK_OBJECT(g->goldenSectionBox), "tooltip-text", _("enable this option to show golden sections."), NULL);
|
|
+ gtk_object_set (GTK_OBJECT(g->goldenSectionBox), "tooltip-text", _("enable this option to show golden sections."), (char *)NULL);
|
|
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->goldenSectionBox), 0, 3, 8, 9, GTK_EXPAND|GTK_FILL, 0, 0, 0);
|
|
|
|
g->goldenSpiralSectionBox = GTK_CHECK_BUTTON(gtk_check_button_new_with_label(_("spiral sections")));
|
|
- gtk_object_set (GTK_OBJECT(g->goldenSpiralSectionBox), "tooltip-text", _("enable this option to show golden spiral sections."), NULL);
|
|
+ gtk_object_set (GTK_OBJECT(g->goldenSpiralSectionBox), "tooltip-text", _("enable this option to show golden spiral sections."), (char *)NULL);
|
|
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->goldenSpiralSectionBox), 3, 6, 8, 9, GTK_EXPAND|GTK_FILL, 0, 0, 0);
|
|
|
|
g->goldenSpiralBox = GTK_CHECK_BUTTON(gtk_check_button_new_with_label(_("golden spiral")));
|
|
- gtk_object_set (GTK_OBJECT(g->goldenSpiralBox), "tooltip-text", _("enable this option to show a golden spiral guide."), NULL);
|
|
+ gtk_object_set (GTK_OBJECT(g->goldenSpiralBox), "tooltip-text", _("enable this option to show a golden spiral guide."), (char *)NULL);
|
|
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->goldenSpiralBox), 0, 3, 9, 10, GTK_EXPAND|GTK_FILL, 0, 0, 0);
|
|
|
|
g->goldenTriangleBox = GTK_CHECK_BUTTON(gtk_check_button_new_with_label(_("golden triangles")));
|
|
- gtk_object_set (GTK_OBJECT(g->goldenTriangleBox), "tooltip-text", _("enable this option to show golden triangles."), NULL);
|
|
+ gtk_object_set (GTK_OBJECT(g->goldenTriangleBox), "tooltip-text", _("enable this option to show golden triangles."), (char *)NULL);
|
|
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->goldenTriangleBox), 3, 6, 9, 10, GTK_EXPAND|GTK_FILL, 0, 0, 0);
|
|
|
|
g_signal_connect (G_OBJECT (g->flipHorGoldenGuide), "toggled", G_CALLBACK (guides_button_changed), self);
|