callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

when the save procedure is being called with GIMP_RUN_WITH_LAST_VALS and

Browse Source 
2007-07-09  Sven Neumann  <sven@gimp.org>

	* plug-ins/jpeg/jpeg.c (run): when the save procedure is being
	called with GIMP_RUN_WITH_LAST_VALS and the image doesn't have 
the
	"jpeg-save-options" parasite set, show the dialog to give the 
user
	control over the JPEG encoding parameters.


svn path=/trunk/; revision=22905
This commit is contained in:
Sven Neumann
2007-07-09 06:42:45 +00:00
committed by Sven Neumann
parent b62c673dcf
commit 84216d2bc8
2 changed files with 60 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-07-09 Sven Neumann <sven@gimp.org>
* plug-ins/jpeg/jpeg.c (run): when the save procedure is being
called with GIMP_RUN_WITH_LAST_VALS and the image doesn't have the
"jpeg-save-options" parasite set, show the dialog to give the user
control over the JPEG encoding parameters.
2007-07-08 Martin Nordholts <martinn@svn.gnome.org> 2007-07-08 Martin Nordholts <martinn@svn.gnome.org>
Completely rewrote logic in gimp_rectangle_tool_motion, in effect Completely rewrote logic in gimp_rectangle_tool_motion, in effect

120
plug-ins/jpeg/jpeg.c
View File

@ -353,62 +353,6 @@ run (const gchar *name,
switch (run_mode) switch (run_mode)
{ {
case GIMP_RUN_INTERACTIVE:
/* Possibly retrieve data */
gimp_get_data (SAVE_PROC, &jsvals);
/* load up the previously used values */
parasite = gimp_image_parasite_find (orig_image_ID,
"jpeg-save-options");
if (parasite)
{
const JpegSaveVals *save_vals = gimp_parasite_data (parasite);
jsvals.quality = save_vals->quality;
jsvals.smoothing = save_vals->smoothing;
jsvals.optimize = save_vals->optimize;
jsvals.progressive = save_vals->progressive;
jsvals.baseline = save_vals->baseline;
jsvals.subsmp = save_vals->subsmp;
jsvals.restart = save_vals->restart;
jsvals.dct = save_vals->dct;
jsvals.preview = save_vals->preview;
jsvals.save_exif = save_vals->save_exif;
jsvals.save_thumbnail = save_vals->save_thumbnail;
jsvals.save_xmp = save_vals->save_xmp;
gimp_parasite_free (parasite);
}
if (jsvals.preview)
{
/* we freeze undo saving so that we can avoid sucking up
* tile cache with our unneeded preview steps. */
gimp_image_undo_freeze (image_ID);
undo_touched = TRUE;
}
/* prepare for the preview */
image_ID_global = image_ID;
orig_image_ID_global = orig_image_ID;
drawable_ID_global = drawable_ID;
/* First acquire information with a dialog */
err = save_dialog ();
if (undo_touched)
{
/* thaw undo saving and flush the displays to have them
* reflect the current shortcuts */
gimp_image_undo_thaw (image_ID);
gimp_displays_flush ();
}
if (!err)
status = GIMP_PDB_CANCEL;
break;
case GIMP_RUN_NONINTERACTIVE: case GIMP_RUN_NONINTERACTIVE:
/* Make sure all the arguments are there! */ /* Make sure all the arguments are there! */
/* pw - added two more progressive and comment */ /* pw - added two more progressive and comment */
@ -449,32 +393,74 @@ run (const gchar *name,
} }
break; break;
case GIMP_RUN_INTERACTIVE:
case GIMP_RUN_WITH_LAST_VALS: case GIMP_RUN_WITH_LAST_VALS:
/* Possibly retrieve data */ /* Possibly retrieve data */
gimp_get_data (SAVE_PROC, &jsvals); gimp_get_data (SAVE_PROC, &jsvals);
/* load up the previously used values */
parasite = gimp_image_parasite_find (orig_image_ID, parasite = gimp_image_parasite_find (orig_image_ID,
"jpeg-save-options"); "jpeg-save-options");
if (parasite) if (parasite)
{ {
const JpegSaveVals *save_vals = gimp_parasite_data (parasite); const JpegSaveVals *save_vals = gimp_parasite_data (parasite);
jsvals.quality = save_vals->quality; jsvals.quality = save_vals->quality;
jsvals.smoothing = save_vals->smoothing; jsvals.smoothing = save_vals->smoothing;
jsvals.optimize = save_vals->optimize; jsvals.optimize = save_vals->optimize;
jsvals.progressive = save_vals->progressive; jsvals.progressive = save_vals->progressive;
jsvals.baseline = save_vals->baseline; jsvals.baseline = save_vals->baseline;
jsvals.subsmp = save_vals->subsmp; jsvals.subsmp = save_vals->subsmp;
jsvals.restart = save_vals->restart; jsvals.restart = save_vals->restart;
jsvals.dct = save_vals->dct; jsvals.dct = save_vals->dct;
jsvals.preview = FALSE; jsvals.preview = save_vals->preview;
jsvals.save_exif = save_vals->save_exif;
jsvals.save_thumbnail = save_vals->save_thumbnail;
jsvals.save_xmp = save_vals->save_xmp;
gimp_parasite_free (parasite); gimp_parasite_free (parasite);
} }
else
{
/* We are called with GIMP_RUN_WITH_LAST_VALS but this image
* doesn't have a "jpeg-save-options" parasite. It's better
* to prompt the user with a dialog now so that she has control
* over the JPEG encoding parameters.
*/
run_mode = GIMP_RUN_INTERACTIVE;
}
break; break;
}
default: if (run_mode == GIMP_RUN_INTERACTIVE)
break; {
if (jsvals.preview)
{
/* we freeze undo saving so that we can avoid sucking up
* tile cache with our unneeded preview steps. */
gimp_image_undo_freeze (image_ID);
undo_touched = TRUE;
}
/* prepare for the preview */
image_ID_global = image_ID;
orig_image_ID_global = orig_image_ID;
drawable_ID_global = drawable_ID;
/* First acquire information with a dialog */
err = save_dialog ();
if (undo_touched)
{
/* thaw undo saving and flush the displays to have them
* reflect the current shortcuts */
gimp_image_undo_thaw (image_ID);
gimp_displays_flush ();
}
if (!err)
status = GIMP_PDB_CANCEL;
} }
if (status == GIMP_PDB_SUCCESS) if (status == GIMP_PDB_SUCCESS)