AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-14 04:31:09 +00:00
Code Issues Projects Releases Wiki Activity

Don't access *bitmapped_sizes if nbitmapped_sizes == 0. (Pointed out by

Browse Source 
Thu Feb 25 00:48:51 1999  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkfontsel.c: Don't access *bitmapped_sizes
	if nbitmapped_sizes == 0. (Pointed out by
	zucchi@zedzone.fsi.com.au (Michael Zucchi))
This commit is contained in:
Owen Taylor 1999-02-25 05:52:00 +00:00 committed by Owen Taylor
parent b1135416f2
commit b515672a1e
8 changed files with 59 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Thu Feb 25 00:48:51 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfontsel.c: Don't access *bitmapped_sizes
if nbitmapped_sizes == 0. (Pointed out by
zucchi@zedzone.fsi.com.au (Michael Zucchi))
Wed Feb 24 23:12:09 1999 Owen Taylor <otaylor@redhat.com> Wed Feb 24 23:12:09 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.h gtk/gtkclist.c: Make prototypes * gtk/gtkwidget.h gtk/gtkclist.c: Make prototypes

6
ChangeLog.pre-2-0
View File

@ -1,3 +1,9 @@
Thu Feb 25 00:48:51 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfontsel.c: Don't access *bitmapped_sizes
if nbitmapped_sizes == 0. (Pointed out by
zucchi@zedzone.fsi.com.au (Michael Zucchi))
Wed Feb 24 23:12:09 1999 Owen Taylor <otaylor@redhat.com> Wed Feb 24 23:12:09 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.h gtk/gtkclist.c: Make prototypes * gtk/gtkwidget.h gtk/gtkclist.c: Make prototypes

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
Thu Feb 25 00:48:51 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfontsel.c: Don't access *bitmapped_sizes
if nbitmapped_sizes == 0. (Pointed out by
zucchi@zedzone.fsi.com.au (Michael Zucchi))
Wed Feb 24 23:12:09 1999 Owen Taylor <otaylor@redhat.com> Wed Feb 24 23:12:09 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.h gtk/gtkclist.c: Make prototypes * gtk/gtkwidget.h gtk/gtkclist.c: Make prototypes

6
ChangeLog.pre-2-2
View File

@ -1,3 +1,9 @@
Thu Feb 25 00:48:51 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfontsel.c: Don't access *bitmapped_sizes
if nbitmapped_sizes == 0. (Pointed out by
zucchi@zedzone.fsi.com.au (Michael Zucchi))
Wed Feb 24 23:12:09 1999 Owen Taylor <otaylor@redhat.com> Wed Feb 24 23:12:09 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.h gtk/gtkclist.c: Make prototypes * gtk/gtkwidget.h gtk/gtkclist.c: Make prototypes

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
Thu Feb 25 00:48:51 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfontsel.c: Don't access *bitmapped_sizes
if nbitmapped_sizes == 0. (Pointed out by
zucchi@zedzone.fsi.com.au (Michael Zucchi))
Wed Feb 24 23:12:09 1999 Owen Taylor <otaylor@redhat.com> Wed Feb 24 23:12:09 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.h gtk/gtkclist.c: Make prototypes * gtk/gtkwidget.h gtk/gtkclist.c: Make prototypes

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
Thu Feb 25 00:48:51 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfontsel.c: Don't access *bitmapped_sizes
if nbitmapped_sizes == 0. (Pointed out by
zucchi@zedzone.fsi.com.au (Michael Zucchi))
Wed Feb 24 23:12:09 1999 Owen Taylor <otaylor@redhat.com> Wed Feb 24 23:12:09 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.h gtk/gtkclist.c: Make prototypes * gtk/gtkwidget.h gtk/gtkclist.c: Make prototypes

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
Thu Feb 25 00:48:51 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfontsel.c: Don't access *bitmapped_sizes
if nbitmapped_sizes == 0. (Pointed out by
zucchi@zedzone.fsi.com.au (Michael Zucchi))
Wed Feb 24 23:12:09 1999 Owen Taylor <otaylor@redhat.com> Wed Feb 24 23:12:09 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.h gtk/gtkclist.c: Make prototypes * gtk/gtkwidget.h gtk/gtkclist.c: Make prototypes

31
gtk/gtkfontsel.c
View File

@ -1391,10 +1391,11 @@ gtk_font_selection_show_available_sizes (GtkFontSelection *fontsel)
FontInfo *font; FontInfo *font;
FontStyle *styles, *style; FontStyle *styles, *style;
const guint16 *standard_sizes; const guint16 *standard_sizes;
guint16 *bitmapped_sizes, bitmap_size; guint16 *bitmapped_sizes;
gint nstandard_sizes, nbitmapped_sizes; gint nstandard_sizes, nbitmapped_sizes;
gchar buffer[16], *size; gchar buffer[16], *size;
gfloat bitmap_size_float; gfloat bitmap_size_float = 0.;
guint16 bitmap_size = 0;
gboolean can_match; gboolean can_match;
gint type_filter; gint type_filter;
@ -1437,18 +1438,20 @@ gtk_font_selection_show_available_sizes (GtkFontSelection *fontsel)
while (nstandard_sizes || nbitmapped_sizes) while (nstandard_sizes || nbitmapped_sizes)
{ {
can_match = TRUE; can_match = TRUE;
if (fontsel->metric == GTK_FONT_METRIC_POINTS)
{ if (nbitmapped_sizes)
if (*bitmapped_sizes % 10 != 0) if (fontsel->metric == GTK_FONT_METRIC_POINTS)
can_match = FALSE; {
bitmap_size = *bitmapped_sizes / 10; if (*bitmapped_sizes % 10 != 0)
bitmap_size_float = *bitmapped_sizes / 10; can_match = FALSE;
} bitmap_size = *bitmapped_sizes / 10;
else bitmap_size_float = *bitmapped_sizes / 10;
{ }
bitmap_size = *bitmapped_sizes; else
bitmap_size_float = *bitmapped_sizes; {
} bitmap_size = *bitmapped_sizes;
bitmap_size_float = *bitmapped_sizes;
}
if (can_match && nstandard_sizes && nbitmapped_sizes if (can_match && nstandard_sizes && nbitmapped_sizes
&& *standard_sizes == bitmap_size) && *standard_sizes == bitmap_size)