gimp r28119 - in branches/gimp-2-6: . plug-ins/file-jpeg

[neo svn gnome org]

Author: neo
Date: Fri Mar  6 23:25:10 2009
New Revision: 28119
URL: http://svn.gnome.org/viewvc/gimp?rev=28119&view=rev

Log:
2009-03-07  Sven Neumann  <sven gimp org>

	Merged from trunk:

	* plug-ins/file-jpeg/jpeg-load.c (load_image)
	* plug-ins/file-jpeg/jpeg-save.c (save_image): need to finish 
the
	progress update.



Modified:
   branches/gimp-2-6/ChangeLog
   branches/gimp-2-6/plug-ins/file-jpeg/jpeg-load.c
   branches/gimp-2-6/plug-ins/file-jpeg/jpeg-save.c

Modified: branches/gimp-2-6/plug-ins/file-jpeg/jpeg-load.c
==============================================================================
--- branches/gimp-2-6/plug-ins/file-jpeg/jpeg-load.c	(original)
+++ branches/gimp-2-6/plug-ins/file-jpeg/jpeg-load.c	Fri Mar  6 23:25:10 2009
@@ -463,7 +463,10 @@
   /* Detach from the drawable and add it to the image.
    */
   if (! preview)
-    gimp_drawable_detach (drawable);
+    {
+      gimp_progress_update (1.0);
+      gimp_drawable_detach (drawable);
+    }
 
   gimp_image_add_layer (image_ID, layer_ID, 0);
 

Modified: branches/gimp-2-6/plug-ins/file-jpeg/jpeg-save.c
==============================================================================
--- branches/gimp-2-6/plug-ins/file-jpeg/jpeg-save.c	(original)
+++ branches/gimp-2-6/plug-ins/file-jpeg/jpeg-save.c	Fri Mar  6 23:25:10 2009
@@ -278,7 +278,7 @@
   gimp_pixel_rgn_init (&pixel_rgn, drawable,
                        0, 0, drawable->width, drawable->height, FALSE, FALSE);
 
-  if (!preview)
+  if (! preview)
     gimp_progress_init_printf (_("Saving '%s'"),
                                gimp_filename_to_utf8 (filename));
 
@@ -729,12 +729,13 @@
 
   /* This is an important step since it will release a good deal of memory. */
   jpeg_destroy_compress (&cinfo);
+
   /* free the temporary buffer */
   g_free (temp);
   g_free (data);
 
   /* And we're done! */
-  /*gimp_do_progress (1, 1);*/
+  gimp_progress_update (1.0);
 
   gimp_drawable_detach (drawable);