diff options
| author | Michael Natterer <mitch@imendio.com> | 2008-10-21 21:42:39 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2008-10-21 21:42:39 +0000 |
| commit | 6df89b0ad8cf6a3c881ca9a7db36d7195c567c64 (patch) | |
| tree | 93b969cd92ba1ee0af47ecaf08e8ab7f31320ea9 /gdk/gdkdraw.c | |
| parent | c103cbec8acaab3e9259aae87c802573b584527c (diff) | |
| download | gtk+-6df89b0ad8cf6a3c881ca9a7db36d7195c567c64.tar.gz | |
gdk/gdkdraw.c gdk/gdkimage.c gdk/gdkscreen.c replace assertions for obj !=
2008-10-21 Michael Natterer <mitch@imendio.com>
* gdk/gdkdraw.c
* gdk/gdkimage.c
* gdk/gdkscreen.c
* gdk/gdkwindow.c: replace assertions for obj != NULL by
GDK_IS_OBJ(), remove redundant != NULL checks when there is
already a type check, add some g_return_if_fail() that were
missing entirely, fix some broken indentation and spacing.
svn path=/trunk/; revision=21695
Diffstat (limited to 'gdk/gdkdraw.c')
| -rw-r--r-- | gdk/gdkdraw.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gdk/gdkdraw.c b/gdk/gdkdraw.c index 0876695a60..81e6e08390 100644 --- a/gdk/gdkdraw.c +++ b/gdk/gdkdraw.c @@ -347,8 +347,6 @@ gdk_draw_line (GdkDrawable *drawable, { GdkSegment segment; - g_return_if_fail (drawable != NULL); - g_return_if_fail (gc != NULL); g_return_if_fail (GDK_IS_DRAWABLE (drawable)); g_return_if_fail (GDK_IS_GC (gc)); @@ -630,7 +628,7 @@ gdk_draw_drawable (GdkDrawable *drawable, gint composite_y_offset = 0; g_return_if_fail (GDK_IS_DRAWABLE (drawable)); - g_return_if_fail (src != NULL); + g_return_if_fail (GDK_IS_DRAWABLE (src)); g_return_if_fail (GDK_IS_GC (gc)); if (width < 0 || height < 0) @@ -693,7 +691,7 @@ gdk_draw_image (GdkDrawable *drawable, gint height) { g_return_if_fail (GDK_IS_DRAWABLE (drawable)); - g_return_if_fail (image != NULL); + g_return_if_fail (GDK_IS_IMAGE (image)); g_return_if_fail (GDK_IS_GC (gc)); if (width == -1) @@ -1505,7 +1503,7 @@ gdk_drawable_real_draw_pixbuf (GdkDrawable *drawable, GdkRegion *clip; GdkRegion *drect; GdkRectangle tmp_rect; - + g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); g_return_if_fail (pixbuf->colorspace == GDK_COLORSPACE_RGB); g_return_if_fail (pixbuf->n_channels == 3 || pixbuf->n_channels == 4); |