beautify: fix the Sketch effect.

hejiann · Aug 3, 2012 · 9e0a6a9 · 9e0a6a9
1 parent 8c90227
commit 9e0a6a9
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 25 deletions.
diff --git a/README b/README
@@ -50,6 +50,7 @@ CHANGELOG
 2012-08-03:
 beautify: fix the Soft Light effect.
 beautify: fix the Black And White effect.
+beautify: fix the Sketch effect.
 
 2012-08-02:
 beautify: add the Relief effect.

diff --git a/beautify-effect.c b/beautify-effect.c
@@ -23,6 +23,32 @@
 #include "beautify-effect.h"
 #include "beautify-textures.h"
 
+static void black_and_white (gint32 image_ID, gint32 drawable_ID)
+{
+  gint       nreturn_vals;
+  GimpParam *return_vals;
+
+  return_vals = gimp_run_procedure ("plug-in-colors-channel-mixer",
+                                    &nreturn_vals,
+                                    GIMP_PDB_INT32, 1,
+                                    GIMP_PDB_IMAGE, image_ID,
+                                    GIMP_PDB_DRAWABLE, drawable_ID,
+                                    GIMP_PDB_INT32, 0,
+                                    GIMP_PDB_FLOAT, 0.30,
+                                    GIMP_PDB_FLOAT, 0.59,
+                                    GIMP_PDB_FLOAT, 0.11,
+                                    GIMP_PDB_FLOAT, 0.30,
+                                    GIMP_PDB_FLOAT, 0.59,
+                                    GIMP_PDB_FLOAT, 0.11,
+                                    GIMP_PDB_FLOAT, 0.30,
+                                    GIMP_PDB_FLOAT, 0.59,
+                                    GIMP_PDB_FLOAT, 0.11,
+                                    GIMP_PDB_END);
+  gimp_destroy_params (return_vals, nreturn_vals);
+
+  gimp_desaturate_full (drawable_ID, GIMP_DESATURATE_LUMINOSITY);
+}
+
 void
 run_effect (gint32 image_ID, BeautifyEffectType effect)
 {
@@ -217,29 +243,7 @@ run_effect (gint32 image_ID, BeautifyEffectType effect)
       break;
     case BEAUTIFY_EFFECT_BLACK_AND_WHITE:
     {
-      gint       nreturn_vals;
-      GimpParam *return_vals;
-
-      return_vals = gimp_run_procedure ("plug-in-colors-channel-mixer",
-                                        &nreturn_vals,
-                                        GIMP_PDB_INT32, 1,
-                                        GIMP_PDB_IMAGE, image_ID,
-                                        GIMP_PDB_DRAWABLE, effect_layer,
-                                        GIMP_PDB_INT32, 0,
-                                        GIMP_PDB_FLOAT, 0.30,
-                                        GIMP_PDB_FLOAT, 0.59,
-                                        GIMP_PDB_FLOAT, 0.11,
-                                        GIMP_PDB_FLOAT, 0.30,
-                                        GIMP_PDB_FLOAT, 0.59,
-                                        GIMP_PDB_FLOAT, 0.11,
-                                        GIMP_PDB_FLOAT, 0.30,
-                                        GIMP_PDB_FLOAT, 0.59,
-                                        GIMP_PDB_FLOAT, 0.11,
-                                        GIMP_PDB_END);
-      gimp_destroy_params (return_vals, nreturn_vals);
-
-      gimp_desaturate_full (effect_layer, GIMP_DESATURATE_LUMINOSITY);
-
+      black_and_white (image_ID, effect_layer);
       break;
     }
     case BEAUTIFY_EFFECT_INVERT:
@@ -1640,7 +1644,7 @@ run_effect (gint32 image_ID, BeautifyEffectType effect)
     {
       gint32     layer;
 
-      gimp_desaturate_full (effect_layer, GIMP_DESATURATE_LUMINOSITY);
+      black_and_white (image_ID, effect_layer);
 
       layer = gimp_layer_copy (effect_layer);
       gimp_image_add_layer (image_ID, layer, -1);
@@ -1660,7 +1664,7 @@ run_effect (gint32 image_ID, BeautifyEffectType effect)
                                         GIMP_PDB_END);
       gimp_destroy_params (return_vals, nreturn_vals);
 
-      gimp_levels (layer, GIMP_HISTOGRAM_VALUE, 0, 255, 1, 0, 240);
+      gimp_levels (layer, GIMP_HISTOGRAM_VALUE, 0, 255, 1, 0, 251);
 
       gimp_image_merge_down (image_ID, layer, GIMP_CLIP_TO_BOTTOM_LAYER);