Skip to content

Commit

Permalink
beautify: defer applying effect to original image
Browse files Browse the repository at this point in the history 
1. set preview_image to PREVIEW_SIZE for speeding up preview
2. real image update when applying new effect or quit
thus:
1. adjustment will speed up a lot since only change the preview_image
2. opacity also speed up too, the same reason as the above
3. it would make a big difference when edit large image
  • Loading branch information
@oneyoung
oneyoung committed Jan 17, 2014
1 parent 800fd2b commit 41ce6d1
Showing 1 changed file with 84 additions and 53 deletions.
137 changes: 84 additions & 53 deletions beautify.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ static void cyan_red_update (GtkRange *range, gpointer data);
static void magenta_green_update (GtkRange *range, gpointer data);
static void yellow_blue_update (GtkRange *range, gpointer data);

static void adjustment();
static void adjustment(gint32 image);

static void reset_pressed (GtkButton *button, gpointer user_date);

Expand All @@ -165,7 +165,7 @@ static gboolean select_effect (GtkWidget *widget, GdkEvent *event, gpointer user

static void reset_adjustment ();

static void apply_effect ();
static void apply_effect (gint32 image);
static void cancel_effect ();

const GimpPlugInInfo PLUG_IN_INFO =
Expand Down Expand Up @@ -205,6 +205,7 @@ static GtkWidget *magenta_green = NULL;
static GtkWidget *yellow_blue = NULL;

static GtkWidget *preview = NULL;
static gint32 real_image = 0;
static gint32 preview_image = 0;
static gint32 saved_image = 0;
static gint32 thumbnail = 0;
Expand Down Expand Up @@ -336,11 +337,28 @@ run (const gchar *name,
gimp_drawable_detach (drawable);
}

static void
apply_real_image ()
{
/* apply effect */
if (current_effect != BEAUTIFY_EFFECT_NONE) {
run_effect(real_image, current_effect);
/* update opacity */
gdouble opacity = gtk_range_get_value (GTK_RANGE (effect_opacity));
if (opacity < 100) {
gint32 layer = gimp_image_get_active_layer (real_image);
gimp_layer_set_opacity (layer, opacity);
}
}
adjustment(real_image);
apply_effect(real_image);
}

static void
beautify (GimpDrawable *drawable)
{
apply_effect ();
gint32 source = gimp_image_get_active_layer (preview_image);
apply_real_image ();
gint32 source = gimp_image_get_active_layer (real_image);
gimp_edit_copy (source);
gint32 floating_sel = gimp_edit_paste (drawable->drawable_id, FALSE);
gimp_floating_sel_anchor (floating_sel);
Expand All @@ -357,6 +375,25 @@ beautify_effect (GimpDrawable *drawable)
gimp_image_merge_down (image_ID, layer, GIMP_CLIP_TO_IMAGE);
}

static gint32
image_copy_scale (gint32 src_image,
gint max_size)
{
gint32 image = gimp_image_duplicate(src_image);

if (width > max_size && height > max_size) {
if (width > height)
{
gimp_image_scale (image, max_size * width / height, max_size);
}
else
{
gimp_image_scale (image, max_size, max_size * height / width);
}
}
return image;
}

static gboolean
beautify_dialog (gint32 image_ID,
GimpDrawable *drawable)
Expand Down Expand Up @@ -421,8 +458,11 @@ beautify_dialog (gint32 image_ID,
gtk_widget_show (reset);
g_signal_connect (reset, "pressed", G_CALLBACK (reset_pressed), NULL);

real_image = gimp_image_duplicate (image_ID);
/* preview */
preview_image = gimp_image_duplicate (image_ID);
preview_image = image_copy_scale (real_image, PREVIEW_SIZE);
/* create thumbnail cache for effect icon */
thumbnail = image_copy_scale (preview_image, THUMBNAIL_SIZE);

preview = gtk_image_new();
preview_update (preview);
Expand All @@ -439,23 +479,11 @@ beautify_dialog (gint32 image_ID,
gtk_box_pack_start (GTK_BOX (right_vbox), notebook, FALSE, FALSE, 0);
gtk_widget_show (notebook);

/* create thumbnail cache for effect icon */
thumbnail = gimp_image_duplicate (preview_image);
if (width > THUMBNAIL_SIZE && height > THUMBNAIL_SIZE) {
if (width > height)
{
gimp_image_scale (thumbnail, THUMBNAIL_SIZE * width / height, THUMBNAIL_SIZE);
}
else
{
gimp_image_scale (thumbnail, THUMBNAIL_SIZE, THUMBNAIL_SIZE * height / width);
}
}

create_effect_pages (GTK_NOTEBOOK (notebook));

gboolean run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);

gimp_image_delete(preview_image);
gimp_image_delete(thumbnail);
gtk_widget_destroy (dialog);

Expand Down Expand Up @@ -536,32 +564,33 @@ create_base_page (GtkNotebook *notebook) {
gtk_notebook_append_page_menu (notebook, thispage, pagelabel, NULL);
}

static void adjustment_update () {
adjustment (preview_image);
preview_update (preview);
}

static void
brightness_update (GtkRange *range, gpointer data) {
bvals.brightness = gtk_range_get_value (range);
adjustment ();
preview_update (preview);
adjustment_update ();
}

static void
contrast_update (GtkRange *range, gpointer data) {
bvals.contrast = gtk_range_get_value (range);
adjustment ();
preview_update (preview);
adjustment_update ();
}

static void
saturation_update (GtkRange *range, gpointer data) {
bvals.saturation = gtk_range_get_value (range);
adjustment ();
preview_update (preview);
adjustment_update ();
}

static void
definition_update (GtkRange *range, gpointer data) {
bvals.definition = gtk_range_get_value (range);
adjustment ();
preview_update (preview);
adjustment_update ();
}

static void
Expand Down Expand Up @@ -700,43 +729,46 @@ create_color_page (GtkNotebook *notebook) {
static void
hue_update (GtkRange *range, gpointer data) {
bvals.hue = gtk_range_get_value (range);
adjustment ();
preview_update (preview);
adjustment_update ();
}

static void
cyan_red_update (GtkRange *range, gpointer data) {
bvals.cyan_red = gtk_range_get_value (range);
adjustment ();
preview_update (preview);
adjustment_update ();
}

static void
magenta_green_update (GtkRange *range, gpointer data) {
bvals.magenta_green = gtk_range_get_value (range);
adjustment ();
preview_update (preview);
adjustment_update ();
}

static void
yellow_blue_update (GtkRange *range, gpointer data) {
bvals.yellow_blue = gtk_range_get_value (range);
adjustment ();
preview_update (preview);
adjustment_update ();
}

static void
adjustment () {
adjustment (gint32 image) {
if (bvals.brightness == 0 && bvals.contrast == 0 && bvals.saturation == 0 && bvals.definition == 0 && bvals.hue == 0 && bvals.cyan_red == 0 && bvals.magenta_green == 0 && bvals.yellow_blue == 0)
return;

apply_effect ();

if (!saved_image)
saved_image = gimp_image_duplicate (preview_image);

preview_image = gimp_image_duplicate (saved_image);
gint32 layer = gimp_image_get_active_layer (preview_image);
if (image == preview_image) {
/* need to save previous image for preview,
* since bvals should to apply origin image,
* otherwise, they would accumulate and result in unwanted effect.
*/
if (!saved_image) {
/* first adjustment after effect */
apply_effect (image);
saved_image = gimp_image_duplicate (preview_image);
}
preview_image = gimp_image_duplicate (saved_image);
image = preview_image;
}
gint32 layer = gimp_image_get_active_layer (image);

if (bvals.brightness != 0 || bvals.contrast != 0)
{
Expand Down Expand Up @@ -805,8 +837,10 @@ reset_pressed (GtkButton *button, gpointer user_date)
reset_adjustment ();
cancel_effect ();

gimp_image_delete (real_image);
gimp_image_delete (preview_image);
preview_image = gimp_image_duplicate (image_ID);
real_image = gimp_image_duplicate (image_ID);
preview_image = image_copy_scale(real_image, PREVIEW_SIZE);
preview_update (preview);
}

Expand Down Expand Up @@ -1182,8 +1216,11 @@ effect_icon_new (BeautifyEffectType effect)
static gboolean
select_effect (GtkWidget *widget, GdkEvent *event, gpointer user_data)
{
apply_real_image ();

reset_adjustment ();
apply_effect();
apply_effect(preview_image);


BeautifyEffectType effect = (BeautifyEffectType) user_data;
run_effect (preview_image, effect);
Expand Down Expand Up @@ -1235,16 +1272,10 @@ reset_adjustment ()
}

static void
apply_effect ()
apply_effect (gint32 image)
{
if (current_effect == BEAUTIFY_EFFECT_NONE) {
return;
}

gint32 current_layer = gimp_image_get_active_layer (preview_image);
gimp_image_merge_down (preview_image, current_layer, GIMP_CLIP_TO_IMAGE);

current_effect = BEAUTIFY_EFFECT_NONE;
gint32 current_layer = gimp_image_get_active_layer (image);
gimp_image_merge_down (image, current_layer, GIMP_CLIP_TO_IMAGE);

gtk_widget_hide (effect_option);

Expand Down

0 comments on commit 41ce6d1

Please sign in to comment.