gimp r27247 - in trunk: . app/actions app/gegl

[mitch svn gnome org]

Author: mitch
Date: Sun Oct 12 19:01:22 2008
New Revision: 27247
URL: http://svn.gnome.org/viewvc/gimp?rev=27247&view=rev

Log:
2008-10-12  Michael Natterer  <mitch gimp org>

	* app/gegl/gimpoperationadditionmode.c: commit some #if 0'ed
	experimental code.

	* app/actions/view-commands.c (view_use_gegl_cmd_callback): use
	gimp_image_update(), simply exposing the shell doesn't reconstruct
	the projection.



Modified:
   trunk/ChangeLog
   trunk/app/actions/view-commands.c
   trunk/app/gegl/gimpoperationadditionmode.c

Modified: trunk/app/actions/view-commands.c
==============================================================================
--- trunk/app/actions/view-commands.c	(original)
+++ trunk/app/actions/view-commands.c	Sun Oct 12 19:01:22 2008
@@ -691,7 +691,7 @@
   GimpImage        *image;
   GimpDisplay      *display;
   GimpDisplayShell *shell;
-  gboolean   active;
+  gboolean          active;
   return_if_no_image (image, data);
   return_if_no_display (display, data);
 
@@ -700,7 +700,8 @@
   active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
 
   image->projection->use_gegl = active;
-  gimp_display_shell_expose_full (shell);
+  gimp_image_update (image, 0, 0, image->width, image->height);
+  gimp_image_flush (image);
 }
 
 

Modified: trunk/app/gegl/gimpoperationadditionmode.c
==============================================================================
--- trunk/app/gegl/gimpoperationadditionmode.c	(original)
+++ trunk/app/gegl/gimpoperationadditionmode.c	Sun Oct 12 19:01:22 2008
@@ -71,10 +71,17 @@
 
   while (samples--)
     {
+if 1
       dest[RED_PIX]   = src[RED_PIX]   + aux[RED_PIX];
       dest[GREEN_PIX] = src[GREEN_PIX] + aux[GREEN_PIX];
       dest[BLUE_PIX]  = src[BLUE_PIX]  + aux[BLUE_PIX];
       dest[ALPHA_PIX] = src[ALPHA_PIX];
+#else
+      dest[RED_PIX]   = src[RED_PIX]   * src[ALPHA_PIX] + aux[RED_PIX]   * aux[ALPHA_PIX];
+      dest[GREEN_PIX] = src[GREEN_PIX] * src[ALPHA_PIX] + aux[GREEN_PIX] * aux[ALPHA_PIX];
+      dest[BLUE_PIX]  = src[BLUE_PIX]  * src[ALPHA_PIX] + aux[BLUE_PIX]  * aux[ALPHA_PIX];
+      dest[ALPHA_PIX] = src[ALPHA_PIX] + aux[ALPHA_PIX] - src[ALPHA_PIX] * aux[ALPHA_PIX];
+#endif
 
       src  += 4;
       aux  += 4;