gimp r27055 - in trunk: . plug-ins/file-jpeg

[neo svn gnome org]

Author: neo
Date: Thu Sep 25 14:24:27 2008
New Revision: 27055
URL: http://svn.gnome.org/viewvc/gimp?rev=27055&view=rev

Log:
2008-09-25  Sven Neumann  <sven gimp org>

	Bug 553412 â JPEG sampling factors not set to 1x1 on grayscale
	images:

	* plug-ins/file-jpeg/jpeg-save.c: always set subsampling to 1x1
	for grayscale images and indicate this properly in the UI.



Modified:
   trunk/ChangeLog
   trunk/plug-ins/file-jpeg/jpeg-save.c

Modified: trunk/plug-ins/file-jpeg/jpeg-save.c
==============================================================================
--- trunk/plug-ins/file-jpeg/jpeg-save.c	(original)
+++ trunk/plug-ins/file-jpeg/jpeg-save.c	Thu Sep 25 14:24:27 2008
@@ -268,6 +268,7 @@
   guchar   *data;
   guchar   *src, *s;
   gboolean  has_alpha;
+  gint      subsampling;
   gint      rowstride, yend;
   gint      i, j;
 
@@ -393,8 +394,10 @@
 
   cinfo.optimize_coding = jsvals.optimize;
 
+  subsampling = gimp_drawable_is_rgb (drawable_ID) ? jsvals.subsmp : 2;
+
   /*  smoothing is not supported with nonstandard sampling ratios  */
-  if (jsvals.subsmp != 1 && jsvals.subsmp != 3)
+  if (subsampling != 1 && subsampling != 3)
     cinfo.smoothing_factor = (gint) (jsvals.smoothing * 100);
 
   if (jsvals.progressive)
@@ -402,7 +405,7 @@
       jpeg_simple_progression (&cinfo);
     }
 
-  switch (jsvals.subsmp)
+  switch (subsampling)
     {
     case 0:
     default:
@@ -812,8 +815,6 @@
   GtkTextBuffer *text_buffer;
   GtkWidget     *scrolled_window;
   GtkWidget     *button;
-
-  GimpImageType  dtype;
   gchar         *text;
 
 
@@ -1091,19 +1092,27 @@
 
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
 
-  gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (combo), jsvals.subsmp,
+  gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (combo),
+                              gimp_drawable_is_rgb (drawable_ID_global) ?
+                              jsvals.subsmp : 2,
                               G_CALLBACK (subsampling_changed),
                               entry);
 
-  dtype = gimp_drawable_type (drawable_ID_global);
-  if (dtype == GIMP_RGB_IMAGE || dtype == GIMP_RGBA_IMAGE)
+  if ( gimp_drawable_is_rgb (drawable_ID_global))
     {
+      gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (combo),
+                                  jsvals.subsmp,
+                                  G_CALLBACK (subsampling_changed),
+                                  entry);
+
       g_signal_connect (pg.use_orig_quality, "toggled",
                         G_CALLBACK (use_orig_qual_changed2),
                         pg.subsmp);
     }
   else
     {
+      gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (combo), 2);
+
       gtk_widget_set_sensitive (combo, FALSE);
     }
 
@@ -1346,8 +1355,12 @@
   gtk_adjustment_set_value (GTK_ADJUSTMENT (pg->smoothing),
                             jsvals.smoothing);
 
-  gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (pg->subsmp),
-                                 jsvals.subsmp);
+  if (gimp_drawable_is_rgb (drawable_ID_global))
+    {
+      gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (pg->subsmp),
+                                     jsvals.subsmp);
+    }
+
   gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (pg->dct),
                                  jsvals.dct);
 }