[fusion-commits] Change brightness and saturation values: Changes to 'master' (841a67972de595fb21f67313b555c451fe9802e5)

[maniac at server.opencompositing.org]

New commits:
commit 841a67972de595fb21f67313b555c451fe9802e5
Author: Danny Baumann <dannybaumann at web.de>
Date:   Sat May 10 09:21:05 2008 +0200

    Optimization.

commit 8e01131f14b0ce3687c98da7770fdaa8991e2c9b
Author: Danny Baumann <dannybaumann at web.de>
Date:   Sat May 10 09:20:53 2008 +0200

    Added cmake build file.


 CMakeLists.txt |    3 +++
 bs.c           |   28 ++++++++++++++++++----------
 2 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100644 CMakeLists.txt


Modified: fusion/plugins/bs/CMakeLists.txt
new file mode 100644
===================================================================
--- /dev/null
+++ fusion/plugins/bs/CMakeLists.txt
@@ -0,0 +1,3 @@
+include (CompizFusion)
+
+compiz_fusion_plugin (bs)

Modified: fusion/plugins/bs/bs.c
===================================================================
--- fusion/plugins/bs/bs.c
+++ fusion/plugins/bs/bs.c
@@ -406,22 +406,30 @@ BSPaintWindow (CompWindow              *w,
 	       Region                  region,
 	       unsigned int            mask)
 {
-    Bool status;
+    Bool       status;
+    CompScreen *s = w->screen;
 
-    BS_SCREEN (w->screen);
+    BS_SCREEN (s);
     BS_WINDOW (w);
 
-    WindowPaintAttrib wAttrib = *attrib;
-
-    if (w->paint.saturation != bw->saturation)
-	wAttrib.saturation = bw->saturation;
+    if (attrib->brightness != bw->brightness ||
+	attrib->saturation != bw->saturation)
+    {
+	WindowPaintAttrib wAttrib = *attrib;
 
-    if (w->paint.brightness != bw->brightness)
 	wAttrib.brightness = bw->brightness;
+	wAttrib.saturation = bw->saturation;
 
-    UNWRAP (bs, w->screen, paintWindow);
-    status = (*w->screen->paintWindow) (w, &wAttrib, transform, region, mask);
-    WRAP (bs, w->screen, paintWindow, BSPaintWindow);
+	UNWRAP (bs, s, paintWindow);
+	status = (*s->paintWindow) (w, &wAttrib, transform, region, mask);
+	WRAP (bs, s, paintWindow, BSPaintWindow);
+    }
+    else
+    {
+	UNWRAP (bs, s, paintWindow);
+	status = (*s->paintWindow) (w, attrib, transform, region, mask);
+	WRAP (bs, s, paintWindow, BSPaintWindow);
+    }
 
     return status;
 }