From 13e518b138ba26a97d1f303efd39a8d5411a9db4 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Mon, 11 Jun 2007 20:01:54 +0000 Subject: [PATCH] initialize width and height to zero. Fixes bug #446005. 2007-06-11 Sven Neumann * app/widgets/gimpviewrenderer.c (gimp_view_renderer_init): initialize width and height to zero. Fixes bug #446005. svn path=/trunk/; revision=22757 --- ChangeLog | 5 +++++ app/widgets/gimpviewrenderer.c | 37 ++++++++++++++++++---------------- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index b39fdbb53f..fb97a8de44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-06-11 Sven Neumann + + * app/widgets/gimpviewrenderer.c (gimp_view_renderer_init): + initialize width and height to zero. Fixes bug #446005. + 2007-06-11 Sven Neumann * app/core/gimpimage-preview.c: don't disable image previews when diff --git a/app/widgets/gimpviewrenderer.c b/app/widgets/gimpviewrenderer.c index 51df4ed012..d8792b3b13 100644 --- a/app/widgets/gimpviewrenderer.c +++ b/app/widgets/gimpviewrenderer.c @@ -128,8 +128,8 @@ gimp_view_renderer_init (GimpViewRenderer *renderer) renderer->viewable_type = G_TYPE_NONE; renderer->viewable = NULL; - renderer->width = 8; - renderer->height = 8; + renderer->width = 0; + renderer->height = 0; renderer->border_width = 0; renderer->dot_for_dot = TRUE; renderer->is_popup = FALSE; @@ -951,21 +951,24 @@ gimp_view_render_to_buffer (TempBuf *temp_buf, gint dest_rowstride, gint dest_bytes) { - guchar *src, *s; - guchar *cb; - guchar *pad_buf; - gint a; - gint i, j, b; - gint x1, y1, x2, y2; - gint rowstride; - gboolean color; - gboolean has_alpha; - gboolean render_composite; - gint red_component; - gint green_component; - gint blue_component; - gint alpha_component; - gint offset; + const guchar *src, *s; + guchar *cb; + guchar *pad_buf; + gint a; + gint i, j, b; + gint x1, y1, x2, y2; + gint rowstride; + gboolean color; + gboolean has_alpha; + gboolean render_composite; + gint red_component; + gint green_component; + gint blue_component; + gint alpha_component; + gint offset; + + g_return_if_fail (temp_buf != NULL); + g_return_if_fail (dest_buffer != NULL); /* Here are the different cases this functions handles correctly: * 1) Offset temp_buf which does not necessarily cover full image area