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

can't use smoothing with nonstandard sampling ratios. Set the slider

Browse Source 
2005-10-06  Sven Neumann  <sven@gimp.org>

        * plug-ins/jpeg/jpeg-save.c: can't use smoothing with nonstandard
        sampling ratios. Set the slider sensitivity accordingly (bug #318081).
This commit is contained in:
Sven Neumann
2005-10-06 12:59:49 +00:00
committed by Sven Neumann
parent ddabf1cbbe
commit 88cbceff01
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-10-06 Sven Neumann <sven@gimp.org>
* plug-ins/jpeg/jpeg-save.c: can't use smoothing with nonstandard
sampling ratios. Set the slider sensitivity accordingly (bug #318081).
2005-10-06 Sven Neumann <sven@gimp.org> 2005-10-06 Sven Neumann <sven@gimp.org>
* plug-ins/gimpressionist/gimpressionist.c: removed About dialog. * plug-ins/gimpressionist/gimpressionist.c: removed About dialog.

29
plug-ins/jpeg/jpeg-save.c
View File

@ -69,6 +69,8 @@ static void make_preview (void);
static void save_restart_update (GtkAdjustment *adjustment, static void save_restart_update (GtkAdjustment *adjustment,
GtkWidget *toggle); GtkWidget *toggle);
static void subsampling_changed (GtkWidget *combo,
GtkObject *entry);
#ifdef HAVE_EXIF #ifdef HAVE_EXIF
@ -312,9 +314,12 @@ save_image (const gchar *filename,
jpeg_set_defaults (&cinfo); jpeg_set_defaults (&cinfo);
jpeg_set_quality (&cinfo, (gint) (jsvals.quality + 0.5), jsvals.baseline); jpeg_set_quality (&cinfo, (gint) (jsvals.quality + 0.5), jsvals.baseline);
cinfo.smoothing_factor = (gint) (jsvals.smoothing * 100);
cinfo.optimize_coding = jsvals.optimize; cinfo.optimize_coding = jsvals.optimize;
/* smoothing is not supported with nonstandard sampling ratios */
if (jsvals.subsmp != 1)
cinfo.smoothing_factor = (gint) (jsvals.smoothing * 100);
if (jsvals.progressive) if (jsvals.progressive)
{ {
jpeg_simple_progression (&cinfo); jpeg_simple_progression (&cinfo);
@ -946,17 +951,13 @@ save_dialog (void)
"2x1,1x1,1x1 (4:2:2)", 1, "2x1,1x1,1x1 (4:2:2)", 1,
"1x1,1x1,1x1", 2, "1x1,1x1,1x1", 2,
NULL); NULL);
gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (combo), jsvals.subsmp);
gtk_table_attach (GTK_TABLE (table), combo, 3, 6, 2, 3, gtk_table_attach (GTK_TABLE (table), combo, 3, 6, 2, 3,
GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
gtk_widget_show (combo); gtk_widget_show (combo);
g_signal_connect (combo, "changed", gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (combo), jsvals.subsmp,
G_CALLBACK (gimp_int_combo_box_get_active), G_CALLBACK (subsampling_changed),
&jsvals.subsmp); entry);
g_signal_connect (combo, "changed",
G_CALLBACK (make_preview),
NULL);
dtype = gimp_drawable_type (drawable_ID_global); dtype = gimp_drawable_type (drawable_ID_global);
if (dtype != GIMP_RGB_IMAGE && dtype != GIMP_RGBA_IMAGE) if (dtype != GIMP_RGB_IMAGE && dtype != GIMP_RGBA_IMAGE)
@ -1050,6 +1051,18 @@ save_restart_update (GtkAdjustment *adjustment,
make_preview (); make_preview ();
} }
static void
subsampling_changed (GtkWidget *combo,
GtkObject *entry)
{
gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (combo), &jsvals.subsmp);
/* smoothing is not supported with nonstandard sampling ratios */
gimp_scale_entry_set_sensitive (entry, jsvals.subsmp != 1);
make_preview ();
}
#ifdef HAVE_EXIF #ifdef HAVE_EXIF
static guchar *tbuffer = NULL; static guchar *tbuffer = NULL;