diff options
author | jaycox <jaycox@src.gnome.org> | 1998-09-21 08:14:10 +0000 |
---|---|---|
committer | jaycox <jaycox@src.gnome.org> | 1998-09-21 08:14:10 +0000 |
commit | f6db9670d1638aea1f6f696e1c803909513b86cb (patch) | |
tree | 282822120dc3887d9e110a0fe74264d7e6512ae2 | |
parent | 8d3a8957734167710e9ea750a63471f221ec15e9 (diff) | |
download | gdk-pixbuf-f6db9670d1638aea1f6f696e1c803909513b86cb.tar.gz |
use $(PERL) instead of perl render properly in non-square aspect ratios.
* gtk/Makefile.am: use $(PERL) instead of perl
* gtk/gtkcolorsel.c: render properly in non-square aspect ratios.
also much faster to render.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-0 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-2 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-4 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
-rw-r--r-- | gtk/Makefile.am | 7 | ||||
-rw-r--r-- | gtk/gtkcolorsel.c | 16 |
9 files changed, 56 insertions, 9 deletions
@@ -1,3 +1,9 @@ +Mon Sep 21 01:12:44 1998 Jay Cox (jaycox@earthlink.net) + + * gtk/Makefile.am: use $(PERL) instead of perl + * gtk/gtkcolorsel.c: render properly in non-square aspect ratios. + also much faster to render. + Mon Sep 21 07:44:30 1998 Tim Janik <timj@gtk.org> * gtk/gtkobject.c (gtk_object_class_add_signals): reallocate diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index e43dce19e..6fcc576ff 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Mon Sep 21 01:12:44 1998 Jay Cox (jaycox@earthlink.net) + + * gtk/Makefile.am: use $(PERL) instead of perl + * gtk/gtkcolorsel.c: render properly in non-square aspect ratios. + also much faster to render. + Mon Sep 21 07:44:30 1998 Tim Janik <timj@gtk.org> * gtk/gtkobject.c (gtk_object_class_add_signals): reallocate diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e43dce19e..6fcc576ff 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Sep 21 01:12:44 1998 Jay Cox (jaycox@earthlink.net) + + * gtk/Makefile.am: use $(PERL) instead of perl + * gtk/gtkcolorsel.c: render properly in non-square aspect ratios. + also much faster to render. + Mon Sep 21 07:44:30 1998 Tim Janik <timj@gtk.org> * gtk/gtkobject.c (gtk_object_class_add_signals): reallocate diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index e43dce19e..6fcc576ff 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Mon Sep 21 01:12:44 1998 Jay Cox (jaycox@earthlink.net) + + * gtk/Makefile.am: use $(PERL) instead of perl + * gtk/gtkcolorsel.c: render properly in non-square aspect ratios. + also much faster to render. + Mon Sep 21 07:44:30 1998 Tim Janik <timj@gtk.org> * gtk/gtkobject.c (gtk_object_class_add_signals): reallocate diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e43dce19e..6fcc576ff 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Mon Sep 21 01:12:44 1998 Jay Cox (jaycox@earthlink.net) + + * gtk/Makefile.am: use $(PERL) instead of perl + * gtk/gtkcolorsel.c: render properly in non-square aspect ratios. + also much faster to render. + Mon Sep 21 07:44:30 1998 Tim Janik <timj@gtk.org> * gtk/gtkobject.c (gtk_object_class_add_signals): reallocate diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e43dce19e..6fcc576ff 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Mon Sep 21 01:12:44 1998 Jay Cox (jaycox@earthlink.net) + + * gtk/Makefile.am: use $(PERL) instead of perl + * gtk/gtkcolorsel.c: render properly in non-square aspect ratios. + also much faster to render. + Mon Sep 21 07:44:30 1998 Tim Janik <timj@gtk.org> * gtk/gtkobject.c (gtk_object_class_add_signals): reallocate diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e43dce19e..6fcc576ff 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Sep 21 01:12:44 1998 Jay Cox (jaycox@earthlink.net) + + * gtk/Makefile.am: use $(PERL) instead of perl + * gtk/gtkcolorsel.c: render properly in non-square aspect ratios. + also much faster to render. + Mon Sep 21 07:44:30 1998 Tim Janik <timj@gtk.org> * gtk/gtkobject.c (gtk_object_class_add_signals): reallocate diff --git a/gtk/Makefile.am b/gtk/Makefile.am index a32348fe6..08eaeaac0 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -233,7 +233,7 @@ gdk_headers = \ # generate gtk.defs file from gtk-boxed.defs and *.h gtk.defs: @REBUILD@ makeenums.pl gtk-boxed.defs $(source_headers) $(gdk_headers) cd $(srcdir) \ - && perl makeenums.pl defs $(source_headers) $(gdk_headers) > s-gd \ + && $(PERL) makeenums.pl defs $(source_headers) $(gdk_headers) > s-gd \ && cat gtk-boxed.defs >> s-gd \ && mv s-gd gtk.defs @@ -258,11 +258,12 @@ gtktypebuiltins_ids.c: @REBUILD@ gtk.defs maketypes.awk # generate enum value arrays gtktypebuiltins_evals.c: @REBUILD@ makeenums.pl gtk.defs cd $(srcdir) \ - && perl makeenums.pl arrays $(source_headers) $(gdk_headers) > s-gtbe \ + && $(PERL) makeenums.pl arrays $(source_headers) $(gdk_headers) > \ + s-gtbe \ && mv s-gtbe gtktypebuiltins_evals.c gtkmarshal.c gtkmarshal.h: @REBUILD@ gtkmarshal.list genmarshal.pl - srcdir=$(srcdir) INDENT=$(INDENT) perl $(srcdir)/genmarshal.pl + srcdir=$(srcdir) INDENT=$(INDENT) $(PERL) $(srcdir)/genmarshal.pl # ??? # special remake rules diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index bb18f35ad..fff42c7cb 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -1295,11 +1295,14 @@ gtk_color_selection_eval_wheel (gint x, gint y, { gdouble d, r, rx, ry, l; - rx = (gdouble) x - cx; - ry = (gdouble) y - cy; + rx = ((gdouble) x - cx); + ry = ((gdouble) y - cy); d = (SQR (cy) * SQR (rx) + SQR (cx) * SQR (ry) - SQR (cx) * SQR (cy)); + rx = rx/cx; + ry = ry/cy; + r = sqrt (SQR (rx) + SQR (ry)); if (r != 0.0) @@ -1307,16 +1310,17 @@ gtk_color_selection_eval_wheel (gint x, gint y, else *h = 0.0; - l = sqrt (SQR ((cx * cos (*h + 0.5 * M_PI))) + SQR ((cy * sin (*h + 0.5 * M_PI)))); - *s = r / l; + *s = r; *h = 360.0 * (*h) / (2.0 * M_PI) + 180; if (*s == 0.0) *s = 0.00001; else if (*s > 1.0) + { *s = 1.0; - - return ((d > 0.0)); + return 1; + } + return 0; } static void |