callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: don't crash if the palette is NULL

Browse Source
This commit is contained in:
Michael Natterer
2010-10-28 02:15:16 +02:00
parent 9dee789cfd
commit 32d5d1681b
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/widgets/gimppaletteview.c
View File

@ -293,11 +293,13 @@ gimp_palette_view_focus (GtkWidget *widget,
palette = GIMP_PALETTE (GIMP_VIEW (view)->renderer->viewable);
if (gtk_widget_get_can_focus (widget) && ! gtk_widget_has_focus (widget))
if (gtk_widget_get_can_focus (widget) &&
! gtk_widget_has_focus (widget))
{
gtk_widget_grab_focus (widget);
if (! view->selected && gimp_palette_get_n_colors (palette) > 0)
if (! view->selected &&
palette && gimp_palette_get_n_colors (palette) > 0)
{
GimpPaletteEntry *entry = gimp_palette_get_entry (palette, 0);
@ -431,22 +433,23 @@ gimp_palette_view_find_entry (GimpPaletteView *view,
gint x,
gint y)
{
GimpPalette *palette;
GimpViewRendererPalette *renderer;
GimpPaletteEntry *entry = NULL;
gint col, row;
palette = GIMP_PALETTE (GIMP_VIEW (view)->renderer->viewable);
renderer = GIMP_VIEW_RENDERER_PALETTE (GIMP_VIEW (view)->renderer);
if (! palette)
return NULL;
col = x / renderer->cell_width;
row = y / renderer->cell_height;
if (col >= 0 && col < renderer->columns &&
row >= 0 && row < renderer->rows)
{
GimpPalette *palette;
palette = GIMP_PALETTE (GIMP_VIEW (view)->renderer->viewable);
entry = gimp_palette_get_entry (palette,
row * renderer->columns + col);
}