From 9da943f1725223efc629e81a6a2139a7d47a8ac1 Mon Sep 17 00:00:00 2001 From: Simon Budig Date: Fri, 29 Dec 2000 08:01:45 +0000 Subject: [PATCH] modules/colorsel_triangle.c Argh - converting 16bit colors (from 2000-12-29 Simon Budig * modules/colorsel_triangle.c Argh - converting 16bit colors (from DnD-Source) to 8 bit must not be done by dividing by 0xff (255)! divide by 256 instead... --- ChangeLog | 6 ++++++ modules/colorsel_triangle.c | 18 +++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d8840155c..acfb7b1c68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-12-29 Simon Budig + + * modules/colorsel_triangle.c Argh - converting 16bit colors + (from DnD-Source) to 8 bit must not be done by dividing by 0xff (255)! + divide by 256 instead... + 2000-12-29 Tor Lillqvist * app/makefile.mingw.in: Build as a windowing application (-mwindows). diff --git a/modules/colorsel_triangle.c b/modules/colorsel_triangle.c index 8e53e242e1..6f4fdf6e96 100644 --- a/modules/colorsel_triangle.c +++ b/modules/colorsel_triangle.c @@ -804,9 +804,9 @@ colorsel_triangle_drag_begin (GtkWidget *widget, window, (GtkDestroyNotify) gtk_widget_destroy); - bg.red = 0xff * coldata->values[RED]; - bg.green = 0xff * coldata->values[GREEN]; - bg.blue = 0xff *coldata->values[BLUE]; + bg.red = 256 * coldata->values[RED]; + bg.green = 256 * coldata->values[GREEN]; + bg.blue = 256 *coldata->values[BLUE]; gdk_color_alloc (gtk_widget_get_colormap (window), &bg); gdk_window_set_background (window->window, &bg); @@ -851,9 +851,9 @@ colorsel_triangle_drop_handle (GtkWidget *widget, vals = (guint16 *)selection_data->data; - coldata->values[RED] = vals[0] / 0xff; - coldata->values[GREEN] = vals[1] / 0xff; - coldata->values[BLUE] = vals[2] / 0xff; + coldata->values[RED] = vals[0] / 256; + coldata->values[GREEN] = vals[1] / 256; + coldata->values[BLUE] = vals[2] / 256; color_select_update_hsv_values (coldata); update_previews (coldata, TRUE); @@ -872,9 +872,9 @@ colorsel_triangle_drag_handle (GtkWidget *widget, coldata = (ColorSelectP) data; - vals[0] = coldata->values[RED] * 0xff; - vals[1] = coldata->values[GREEN] * 0xff; - vals[2] = coldata->values[BLUE] * 0xff; + vals[0] = coldata->values[RED] * 256; + vals[1] = coldata->values[GREEN] * 256; + vals[2] = coldata->values[BLUE] * 256; vals[3] = 0xffff; gtk_selection_data_set (selection_data,