head 1.5; access; symbols pkgsrc-2018Q4:1.4.0.60 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.58 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.56 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.54 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.52 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.50 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.46 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.44 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.42 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.40 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.38 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.36 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.34 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.32 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.30 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.28 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.26 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.24 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.22 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.20 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.18 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.16 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.14 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.12 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.10 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.8 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.6 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.4 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.2 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.3.0.24 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.22 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.20 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.18 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.16 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.14 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.12 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.10 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.8 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.6 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.4 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.2 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.2.0.24 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.22 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.20 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.18 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.16 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.14 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.12 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.10 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.8 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.6 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.4 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.2 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.1.0.8 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.6 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.4 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.2 pkgsrc-2005Q1-base:1.1; locks; strict; comment @# @; 1.5 date 2018.12.31.13.11.12; author ryoon; state dead; branches; next 1.4; commitid kXUswtBUru0q8X5B; 1.4 date 2011.11.23.23.30.30; author joerg; state Exp; branches; next 1.3; 1.3 date 2008.11.10.19.04.45; author adam; state Exp; branches; next 1.2; 1.2 date 2006.01.31.21.06.56; author adam; state dead; branches; next 1.1; 1.1 date 2005.03.16.18.32.50; author rillig; state Exp; branches; next ; desc @@ 1.5 log @Update to 1.0.4 * Use FreeBSD patches to fix build and startup crash Changelog: I could not find it. @ text @$NetBSD: patch-af,v 1.4 2011/11/23 23:30:30 joerg Exp $ --- plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp.orig 2007-04-21 09:24:09.000000000 +0000 +++ plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp @@@@ -226,7 +226,7 @@@@ namespace icc_examin_ns { int awake(void) { - Fl::awake(0); + Fl::awake((void*)0); return 0; } int leerWait(void) { return 0; } @ 1.4 log @Fix build with newer GCC @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.3 2008/11/10 19:04:45 adam Exp $ @ 1.3 log @Changes 0.22.1: * native OpenEXR Half sample type substitutes the older RnH 16-bit float * load/save multilayerd OpenEXR files like from Blender * load/save 16-bit Half Tiff's * precise drawing with tablet - thanks to Tino Schwarze for hardware * speedup in gamma-expose and Brightness/Contrast Adjustments * dynamic colour visualisation in ICC Examin plug-in * UTF-8 support through Gtk2 * UFRaw plug-in ready * CMS defaults to Oyranos * Tango icons for toolbox only * Retinex plug-in * Bugfixes @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp.orig 2008-11-10 19:18:58.000000000 +0100 @ 1.2 log @Changed 0.20.2: Overall stability has improved. User interface is more clear regarding colourmanaging. Softproofing is introduced. The gutenprint plug-in uses the proofing profile as default separation target. OpenEXR <-> ICC colour space information conversation The expose item is moved from -->Color-->Expose Image to -->View-->Expose. It is now a per window setting and only available for 32-bit floats. Many bugs where fixed. @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.1 2005/03/16 18:32:50 rillig Exp $ d3 11 a13 248 gcc-2.95.3 cannot handle declarations intermixed with code. --- app/color_correction_gui.c.orig Tue Nov 23 12:58:15 2004 +++ app/color_correction_gui.c Wed Mar 16 18:24:44 2005 @@@@ -246,12 +246,14 @@@@ static void _color_correction_gui_save_p void color_correction_gui (GDisplay *display) -{ if (! drawable_color (gimage_active_drawable (display->gimage))) +{ + _ColorCorrectionGui *data; + if (! drawable_color (gimage_active_drawable (display->gimage))) { g_message ("Color correction operates only on RGB color drawables."); return; } - _ColorCorrectionGui *data = g_new(_ColorCorrectionGui, 1); + data = g_new(_ColorCorrectionGui, 1); data->display = display; data->active=TRUE; data->image_map = image_map_create (data->display, @@@@ -280,6 +282,7 @@@@ _color_correction_gui_create (_ColorCorr GtkWidget *label =NULL; GtkWidget *notebook = NULL; GtkWidget *frame = NULL; + int i; /*** MAIN SHELL AND NOTEBOOK */ @@@@ -308,9 +311,14 @@@@ _color_correction_gui_create (_ColorCorr gtk_notebook_append_page(GTK_NOTEBOOK(notebook), hbox, button); /*** WHEELS + SLIDERS + INPUTS ***/ - int i; for (i=SHADOWS; i<=HIGHLIGHTS; i++) - { data->settings->values[i][HUE]=0.0; + { + _ColorCorrectionGuiWheel *wheel_data; + _ColorCorrectionGuiLSlider *lslider_data; + GtkObject *hue_adjustment, *saturation_adjustment, *lightness_adjustment; + _ColorCorrectionGuiSpin *spin_data; + + data->settings->values[i][HUE]=0.0; data->settings->values[i][SATURATION]=0.0; data->settings->values[i][LIGHTNESS]=0.0; @@@@ -334,7 +342,7 @@@@ _color_correction_gui_create (_ColorCorr /* WHEEL */ data->color_wheels[i] = gtk_drawing_area_new (); gtk_drawing_area_size(GTK_DRAWING_AREA(data->color_wheels[i]), WHEEL_RADIUS*2+2,WHEEL_RADIUS*2+2); - _ColorCorrectionGuiWheel *wheel_data=g_new(_ColorCorrectionGuiWheel, 1); + wheel_data=g_new(_ColorCorrectionGuiWheel, 1); wheel_data->range = i; wheel_data->pixmap = NULL; wheel_data->display_buffer = NULL; @@@@ -366,7 +374,7 @@@@ _color_correction_gui_create (_ColorCorr // gtk_widget_set_style(frame, style); data->lsliders[i] = gtk_drawing_area_new(); - _ColorCorrectionGuiLSlider *lslider_data = g_new(_ColorCorrectionGuiLSlider, 1); + lslider_data = g_new(_ColorCorrectionGuiLSlider, 1); lslider_data->range= i; lslider_data->gc = NULL; lslider_data->pixmap = NULL; @@@@ -384,15 +392,15 @@@@ _color_correction_gui_create (_ColorCorr /* INNPUTS */ - GtkObject *hue_adjustment = gtk_adjustment_new(0.0, 0.0, 360.0, 1.0, 0.0, 0.0); - GtkObject *saturation_adjustment = gtk_adjustment_new(0.0, 0.0, 100.0, 1.0, 0.0, 0.0); - GtkObject *lightness_adjustment = gtk_adjustment_new(0.0, 0.0, 100.0, 1.0, 0.0, 0.0); + hue_adjustment = gtk_adjustment_new(0.0, 0.0, 360.0, 1.0, 0.0, 0.0); + saturation_adjustment = gtk_adjustment_new(0.0, 0.0, 100.0, 1.0, 0.0, 0.0); + lightness_adjustment = gtk_adjustment_new(0.0, 0.0, 100.0, 1.0, 0.0, 0.0); hbox = gtk_hbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 3); - _ColorCorrectionGuiSpin *spin_data = g_new(_ColorCorrectionGuiSpin, 1); + spin_data = g_new(_ColorCorrectionGuiSpin, 1); spin_data->range = i; spin_data->attribute = HUE; label = gtk_label_new("H"); @@@@ -501,10 +509,10 @@@@ static void _color_correction_gui_update_wheel_handle (_ColorCorrectionGui *dialog, ColorCorrectionLightnessRange range) { _ColorCorrectionGuiWheel *data; + gint new_pos[2]; data = (_ColorCorrectionGuiWheel *)gtk_object_get_data(GTK_OBJECT(dialog->color_wheels[range]), "data"); - gint new_pos[2]; _color_correction_gui_wheel_hs_to_pos(dialog->settings->values[range][HUE], dialog->settings->values[range][SATURATION], data->radius, data->radius, @@@@ -521,10 +529,11 @@@@ static void _color_correction_gui_update_lslider_handle (_ColorCorrectionGui *dialog, ColorCorrectionLightnessRange range) { _ColorCorrectionGuiLSlider *data; + gint new_position; data = (_ColorCorrectionGuiLSlider *)gtk_object_get_data(GTK_OBJECT(dialog->lsliders[range]), "data"); - gint new_position = (0.5-dialog->settings->values[range][LIGHTNESS]) * data->height; + new_position = (0.5-dialog->settings->values[range][LIGHTNESS]) * data->height; if (new_position != data->position) { _color_correction_gui_erase_lslider_handle(dialog->lsliders[range], data); data->position = new_position; @@@@ -625,13 +634,13 @@@@ _color_correction_gui_wheel_events_cb (G { data->active = data->active ? FALSE : TRUE; if (data->active) { + _ColorCorrectionGuiLSlider *slider_data; /* reset values from positions */ _color_correction_gui_wheel_pos_to_hs(data->position[X]-data->x, data->position[Y]-data->y, data->radius, data->radius, &dialog->settings->values[data->range][HUE], &dialog->settings->values[data->range][SATURATION]); - _ColorCorrectionGuiLSlider *slider_data; slider_data = (_ColorCorrectionGuiLSlider *)gtk_object_get_data(GTK_OBJECT(dialog->lsliders[data->range]), "data"); dialog->settings->values[data->range][LIGHTNESS] = (1-slider_data->position/(gfloat)slider_data->height) - 0.5; @@@@ -697,6 +706,7 @@@@ _color_correction_gui_lslider_events_cb GdkEvent *event, _ColorCorrectionGui *dialog) { _ColorCorrectionGuiLSlider *data = (_ColorCorrectionGuiLSlider *)gtk_object_get_data(GTK_OBJECT(widget), "data"); + gfloat new_lightness; switch (event->type) { @@@@ -716,7 +726,7 @@@@ _color_correction_gui_lslider_events_cb _color_correction_gui_erase_lslider_handle(widget, data); data->position=event->button.y; - gfloat new_lightness = (1-data->position/(gfloat)data->height) -0.5; + new_lightness = (1-data->position/(gfloat)data->height) -0.5; if (dialog->settings->values[data->range][LIGHTNESS] != new_lightness) { if(dialog->settings->values[data->range][LIGHTNESS] == 0) { dialog->settings->lightness_modified ++; @@@@ -740,7 +750,7 @@@@ _color_correction_gui_lslider_events_cb if (data->dragging) { _color_correction_gui_erase_lslider_handle(widget, data); data->position=event->button.y; - gfloat new_lightness = (1-data->position/(gfloat)data->height) -0.5; + new_lightness = (1-data->position/(gfloat)data->height) -0.5; if (dialog->settings->values[data->range][LIGHTNESS] != new_lightness) { if(dialog->settings->values[data->range][LIGHTNESS] == 0) { dialog->settings->lightness_modified ++; @@@@ -843,6 +853,7 @@@@ _color_correction_gui_draw_wheel (GtkWid gfloat h,s,l; guchar color[3]; _ColorCorrectionGuiWheel *data = (_ColorCorrectionGuiWheel *)gtk_object_get_data(GTK_OBJECT(drawing_area), "data"); + int xmax, ymax; /* translate the marker to the new size */ gint new_width, new_height; @@@@ -875,7 +886,6 @@@@ _color_correction_gui_draw_wheel (GtkWid TRUE, 0,0, data->width, data->height); /* iterate over wheel calculating hue and saturation */ - int xmax, ymax; data->x = data->width/2-data->radius; data->y = data->height/2-data->radius; xmax = data->x + 2 * data->radius; @@@@ -903,14 +913,20 @@@@ _color_correction_gui_draw_wheel (GtkWid static void _color_correction_gui_draw_wheel_handle (GtkWidget *drawing_area, _ColorCorrectionGuiWheel *data) -{ gdk_gc_set_foreground(data->gc, >K_WIDGET(drawing_area)->style->black); +{ + GdkRectangle update_area; + + gdk_gc_set_foreground(data->gc, >K_WIDGET(drawing_area)->style->black); gdk_draw_arc(data->display_buffer, data->gc, FALSE, data->position[X]-5, data->position[Y]-5, 10,10,0,23040); /* last two params are angle in 1/64th of degree */ gdk_draw_point(data->display_buffer, data->gc, data->position[X], data->position[Y]); - GdkRectangle update_area = {data->position[X]-5, data->position[Y]-5, 11, 11}; + update_area.x = data->position[X]-5; + update_area.y = data->position[Y]-5; + update_area.width = 11; + update_area.height = 11; gtk_widget_draw(drawing_area, &update_area); } @@@@ -931,6 +947,7 @@@@ _color_correction_gui_erase_wheel_handle static void _color_correction_gui_draw_wheel_toggle(GtkWidget *drawing_area) { _ColorCorrectionGuiWheel *data = (_ColorCorrectionGuiWheel *)gtk_object_get_data(GTK_OBJECT(drawing_area), "data"); + GdkRectangle update_area = {3,3,27,19}; if (data->active) { gdk_rgb_gc_set_foreground(data->gc, 0x777777); gdk_draw_rectangle(data->display_buffer, data->gc, TRUE, 3,3, 26, 19); @@@@ -966,7 +983,6 @@@@ _color_correction_gui_draw_wheel_toggle( color_correction_wheel_labels[data->range], 3); } - GdkRectangle update_area = {3,3,27,19}; gtk_widget_draw(drawing_area, &update_area); } @@@@ -1063,7 +1079,8 @@@@ static void _color_correction_gui_draw_lslider (GtkWidget *drawing_area) { _ColorCorrectionGuiLSlider *data = (_ColorCorrectionGuiLSlider *)gtk_object_get_data(GTK_OBJECT(drawing_area), "data"); gint y; - + int step_size, gray; + data->height = drawing_area->allocation.height; if (data->gc == NULL) @@@@ -1084,8 +1101,7 @@@@ _color_correction_gui_draw_lslider (GtkW /* draw the slider */ gdk_gc_set_function(data->gc, GDK_COPY); - int step_size = 255/data->height; - int gray; + step_size = 255/data->height; for (y = 0; y < data->height; y++) { gray=255-(y*step_size); gdk_rgb_gc_set_foreground(data->gc, (gray<<16) | (gray<<8) | gray); @@@@ -1102,7 +1118,9 @@@@ _color_correction_gui_draw_lslider (GtkW static void _color_correction_gui_draw_lslider_handle (GtkWidget *drawing_area, _ColorCorrectionGuiLSlider *data) -{ gdk_gc_set_foreground(data->gc, &drawing_area->style->white); +{ + GdkRectangle update_area; + gdk_gc_set_foreground(data->gc, &drawing_area->style->white); gdk_draw_line(data->display_buffer, data->gc, 0, data->position-2, LSLIDER_WIDTH, data->position-2); gdk_gc_set_foreground(data->gc, &drawing_area->style->mid[GTK_STATE_NORMAL]); @@@@ -1112,7 +1130,10 @@@@ _color_correction_gui_draw_lslider_handl gdk_draw_line(data->display_buffer, data->gc, 0, data->position+2, LSLIDER_WIDTH, data->position+2); - GdkRectangle update_area = {0, data->position-2, LSLIDER_WIDTH, 5}; + update_area.x = 0; + update_area.y = data->position-2; + update_area.width = LSLIDER_WIDTH; + update_area.height = 5; gtk_widget_draw(drawing_area, &update_area); } @ 1.1 log @Added lots of patches to build cinepaint on NetBSD-1.6.2 using gcc-2.95.3. These patches have been submitted to the upstream authors. Approved by wiz. @ text @d1 1 a1 1 $NetBSD$ @