AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Use g_file_open_tmp() (just added to GLib) instead of mkstemp() (or

Browse Source 
2000-11-11  Tor Lillqvist  <tml@iki.fi>

	* io-tiff.c (gdk_pixbuf__tiff_image_begin_load): Use
	g_file_open_tmp() (just added to GLib) instead of mkstemp() (or
	mktemp() and open()).

	* io-xpm.c (gdk_pixbuf__xpm_image_begin_load): Ditto.
This commit is contained in:
Tor Lillqvist 2000-11-11 00:34:47 +00:00 committed by Tor Lillqvist
parent 48a1ddbeb1
commit 4a08e76b2b
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,11 @@
2000-11-11 Tor Lillqvist <tml@iki.fi>
* io-tiff.c (gdk_pixbuf__tiff_image_begin_load): Use
g_file_open_tmp() (just added to GLib) instead of mkstemp() (or
mktemp() and open()).
* io-xpm.c (gdk_pixbuf__xpm_image_begin_load): Ditto.
2000-11-01 Havoc Pennington <hp@pobox.com>
* gdk-pixbuf.c (gdk_pixbuf_new_subpixbuf): New function to create

15
gdk-pixbuf/io-tiff.c
View File

@ -153,26 +153,15 @@ gdk_pixbuf__tiff_image_begin_load (ModulePreparedNotifyFunc prepare_func,
{
TiffData *context;
gint fd;
gchar *tmp = g_get_tmp_dir ();
context = g_new (TiffData, 1);
context->prepare_func = prepare_func;
context->update_func = update_func;
context->user_data = user_data;
context->all_okay = TRUE;
context->tempname =
g_strconcat (tmp,
tmp[strlen (tmp)] == G_DIR_SEPARATOR ? G_DIR_SEPARATOR_S : "",
"gdkpixbuf-tif-tmp.XXXXXX",
NULL);
#ifdef HAVE_MKSTEMP
fd = mkstemp (context->tempname);
#else
mktemp (context->tempname);
fd = open (context->tempname, O_RDWR);
#endif
fd = g_file_open_tmp ("gdkpixbuf-tif-tmp.XXXXXX", &context->tempname,
NULL);
if (fd < 0) {
g_free (context->tempname);
g_free (context);
return NULL;
}

5
gdk-pixbuf/io-xpm.c
View File

@ -1413,10 +1413,9 @@ gdk_pixbuf__xpm_image_begin_load (ModulePreparedNotifyFunc prepare_func,
context->update_func = update_func;
context->user_data = user_data;
context->all_okay = TRUE;
context->tempname = g_strdup ("/tmp/gdkpixbuf-xpm-tmp.XXXXXX");
fd = mkstemp (context->tempname);
fd = g_file_open_tmp ("gdkpixbuf-xpm-tmp.XXXXXX", &context->tempname,
NULL);
if (fd < 0) {
g_free (context->tempname);
g_free (context);
return NULL;
}