diff options
| author | Tim Janik <timj@gimp.org> | 1998-03-07 20:32:59 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 1998-03-07 20:32:59 +0000 |
| commit | 124d1e5caae190e620307a69f92bd5b93664bf75 (patch) | |
| tree | f30e71f7ce04660e4056d5bcf0bf476c196b4aa8 /gtk/gtkpreview.c | |
| parent | 640c75216d1545e7633ba5653a141c58ebbc53a6 (diff) | |
| download | gdk-pixbuf-124d1e5caae190e620307a69f92bd5b93664bf75.tar.gz | |
made the object/class cast checks much more descriptive, based on
Sat Mar 7 20:20:53 1998 Tim Janik <timj@gimp.org>
* gtk/gtkobject.c:
(gtk_object_check_cast):
(gtk_object_check_class_cast):
made the object/class cast checks much more descriptive, based on
gtk-draco-980305-2.patch.gz and gtk-draco-980306-1.patch.gz but
optimized for common code path.
* gtk/gtkpreview.c: added a few extra checks for the visual
(gtk-draco-980305-0.patch.gz).
* gdk/gdk.c (gdk_signal): abort() on a signal if G_ENABLE_DEBUG
is defined, so we dump core (gtk-draco-980305-0.patch.gz).
Diffstat (limited to 'gtk/gtkpreview.c')
| -rw-r--r-- | gtk/gtkpreview.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk/gtkpreview.c b/gtk/gtkpreview.c index 1af2e73d9..34e1b31af 100644 --- a/gtk/gtkpreview.c +++ b/gtk/gtkpreview.c @@ -222,7 +222,7 @@ gtk_preview_uninit () GtkPreviewProp *prop; GdkAtom property; - if (preview_class && !install_cmap && + if (preview_class && !install_cmap && preview_class->info.visual && (preview_class->info.visual->type != GDK_VISUAL_TRUE_COLOR) && (preview_class->info.visual->type != GDK_VISUAL_DIRECT_COLOR)) { @@ -489,7 +489,8 @@ gtk_preview_draw_row (GtkPreview *preview, g_return_if_fail (preview != NULL); g_return_if_fail (GTK_IS_PREVIEW (preview)); g_return_if_fail (data != NULL); - + g_return_if_fail (preview_class->info.visual != NULL); + if ((w <= 0) || (y < 0)) return; @@ -934,7 +935,7 @@ gtk_preview_dither_init (GtkPreviewClass *klass) { 63, 31, 55, 23, 61, 29, 53, 21 } }; - if (klass->info.visual->type != GDK_VISUAL_PSEUDO_COLOR) + if (!klass->info.visual || klass->info.visual->type != GDK_VISUAL_PSEUDO_COLOR) return; shades_r = klass->info.nred_shades; |