AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-24 12:41:16 +00:00
Code Issues Projects Releases Wiki Activity

create the target pixbuf AFTER filling in width/height, so that passing in

Browse Source 
2002-04-13  Havoc Pennington  <hp@pobox.com>

	* gdk/gdkpixbuf-drawable.c (gdk_pixbuf_get_from_drawable): create
	the target pixbuf AFTER filling in width/height, so that
	passing in -1 for width/height will work.
This commit is contained in:
Havoc Pennington 2002-04-13 21:14:57 +00:00 committed by Havoc Pennington
parent 2666ab462e
commit 4bd76958c2
7 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2002-04-13 Havoc Pennington <hp@pobox.com>
* gdk/gdkpixbuf-drawable.c (gdk_pixbuf_get_from_drawable): create
the target pixbuf AFTER filling in width/height, so that
passing in -1 for width/height will work.
Sat Apr 13 22:49:45 2002 Kristian Rietveld <kris@gtk.org>
Fixes #75510

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
2002-04-13 Havoc Pennington <hp@pobox.com>
* gdk/gdkpixbuf-drawable.c (gdk_pixbuf_get_from_drawable): create
the target pixbuf AFTER filling in width/height, so that
passing in -1 for width/height will work.
Sat Apr 13 22:49:45 2002 Kristian Rietveld <kris@gtk.org>
Fixes #75510

6
ChangeLog.pre-2-2
View File

@ -1,3 +1,9 @@
2002-04-13 Havoc Pennington <hp@pobox.com>
* gdk/gdkpixbuf-drawable.c (gdk_pixbuf_get_from_drawable): create
the target pixbuf AFTER filling in width/height, so that
passing in -1 for width/height will work.
Sat Apr 13 22:49:45 2002 Kristian Rietveld <kris@gtk.org>
Fixes #75510

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
2002-04-13 Havoc Pennington <hp@pobox.com>
* gdk/gdkpixbuf-drawable.c (gdk_pixbuf_get_from_drawable): create
the target pixbuf AFTER filling in width/height, so that
passing in -1 for width/height will work.
Sat Apr 13 22:49:45 2002 Kristian Rietveld <kris@gtk.org>
Fixes #75510

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
2002-04-13 Havoc Pennington <hp@pobox.com>
* gdk/gdkpixbuf-drawable.c (gdk_pixbuf_get_from_drawable): create
the target pixbuf AFTER filling in width/height, so that
passing in -1 for width/height will work.
Sat Apr 13 22:49:45 2002 Kristian Rietveld <kris@gtk.org>
Fixes #75510

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
2002-04-13 Havoc Pennington <hp@pobox.com>
* gdk/gdkpixbuf-drawable.c (gdk_pixbuf_get_from_drawable): create
the target pixbuf AFTER filling in width/height, so that
passing in -1 for width/height will work.
Sat Apr 13 22:49:45 2002 Kristian Rietveld <kris@gtk.org>
Fixes #75510

16
gdk/gdkpixbuf-drawable.c
View File

@ -1501,14 +1501,6 @@ gdk_pixbuf_get_from_drawable (GdkPixbuf *dest,
g_return_val_if_fail (dest->bits_per_sample == 8, NULL);
}
/* Create the pixbuf if needed */
if (!dest)
{
dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
if (dest == NULL)
return NULL;
}
if (cmap == NULL)
cmap = gdk_drawable_get_colormap (src);
@ -1536,6 +1528,14 @@ gdk_pixbuf_get_from_drawable (GdkPixbuf *dest,
g_return_val_if_fail (src_x + width <= src_width && src_y + height <= src_height, NULL);
}
/* Create the pixbuf if needed */
if (!dest)
{
dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
if (dest == NULL)
return NULL;
}
if (dest)
{
g_return_val_if_fail (dest_x >= 0 && dest_y >= 0, NULL);