diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2006-04-08 09:51:35 +0000 |
|---|---|---|
| committer | joncruz <joncruz@users.sourceforge.net> | 2006-04-08 09:51:35 +0000 |
| commit | cfb20eb0ced7cefc7bb5b2138e269c5b3f06e95b (patch) | |
| tree | 7138ef629c53dd0f665cacbed5c81d5c360ec162 /src/widgets/icon.cpp | |
| parent | Shrunk a few icon sizes. (diff) | |
| download | inkscape-cfb20eb0ced7cefc7bb5b2138e269c5b3f06e95b.tar.gz inkscape-cfb20eb0ced7cefc7bb5b2138e269c5b3f06e95b.zip | |
Fixed array index calculation
(bzr r458)
Diffstat (limited to 'src/widgets/icon.cpp')
| -rw-r--r-- | src/widgets/icon.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp index 61c642989..5ad93a1b7 100644 --- a/src/widgets/icon.cpp +++ b/src/widgets/icon.cpp @@ -415,7 +415,8 @@ static int sp_icon_get_phys_size(int size) GTK_ICON_SIZE_MENU }; for (unsigned i = 0; i < G_N_ELEMENTS(gtkSizes) && init; ++i) { - unsigned const val_ix(gtkSizes[i]); + guint const val_ix = (gtkSizes[i] <= GTK_ICON_SIZE_DIALOG) ? (guint)gtkSizes[i] : (guint)Inkscape::ICON_SIZE_DECORATION; + g_assert( val_ix < G_N_ELEMENTS(vals) ); gint width = 0; @@ -459,7 +460,8 @@ static int sp_icon_get_phys_size(int size) GtkWidget *icon = (GtkWidget *)g_object_new(SP_TYPE_ICON, NULL); for (unsigned i = 0; i < G_N_ELEMENTS(gtkSizes); ++i) { - unsigned const val_ix(gtkSizes[i]); + guint const val_ix = (gtkSizes[i] <= GTK_ICON_SIZE_DIALOG) ? (guint)gtkSizes[i] : (guint)Inkscape::ICON_SIZE_DECORATION; + g_assert( val_ix < G_N_ELEMENTS(vals) ); gint width = 0; |