Merge lp:~niclasl/granite/threaded_blur into lp:~elementary-pantheon/granite/granite

[Niclas Lockner]

Do the exponential blur and the gaussian blur in parallel

Do the exponential blur and the gaussian blur in parallel.

[Niclas Lockner (niclasl)]

This is how the code looked before rev 494. The code in this branch is also equal to the corresponding code in Plank.

[David Gomes (davidgomes)]

+1 for parallel solution, very much approve.

review: Approve

=== modified file 'lib/Drawing/BufferSurface.vala'
--- lib/Drawing/BufferSurface.vala	2013-04-05 07:11:07 +0000
+++ lib/Drawing/BufferSurface.vala	2013-12-11 14:24:12 +0000
@@ -385,23 +385,21 @@
             
             try {
                 // Process Rows
+                var th = new Thread<void*>.try (null, () => {
+                    exponential_blur_rows (pixels, width, height, 0, height / 2, 0, width, alpha);
+                    return null;
+                });
+
                 exponential_blur_rows (pixels, width, height, height / 2, height, 0, width, alpha);
-
-                var th = new Thread<void*>.try (null, () => {
-                    exponential_blur_rows (pixels, width, height, 0, height / 2, 0, width, alpha);
-                    return null;
-                });
-                
                 th.join ();
                 
                 // Process Columns
+                var th2 = new Thread<void*>.try (null, () => {
+                    exponential_blur_columns (pixels, width, height, 0, width / 2, 0, height, alpha);
+                    return null;
+                });
+
                 exponential_blur_columns (pixels, width, height, width / 2, width, 0, height, alpha);
-
-                var th2 = new Thread<void*>.try (null, () => {
-                    exponential_blur_columns (pixels, width, height, 0, width / 2, 0, height, alpha);
-                    return null;
-                });
-                
                 th2.join ();
             } catch (Error err) {
                 warning (err.message);
@@ -517,13 +515,12 @@
             
             try {
                 // Horizontal Pass
+                var th = new Thread<void*>.try (null, () => {
+                    gaussian_blur_horizontal (abuffer, bbuffer, kernel, gausswidth, width, height, 0, height / 2, shiftar);
+                    return null;
+                });
+
                 gaussian_blur_horizontal (abuffer, bbuffer, kernel, gausswidth, width, height, height / 2, height, shiftar);
-
-                var th = new Thread<void*>.try (null, () => {
-                    gaussian_blur_horizontal (abuffer, bbuffer, kernel, gausswidth, width, height, 0, height / 2, shiftar);
-                    return null;
-                });
-                
                 th.join ();
                 
                 // Clear buffer
@@ -541,13 +538,12 @@
                     }
                 
                 // Vertical Pass
+                var th2 = new Thread<void*>.try (null, () => {
+                    gaussian_blur_vertical (bbuffer, abuffer, kernel, gausswidth, width, height, 0, width / 2, shiftar);
+                    return null;
+                });
+
                 gaussian_blur_vertical (bbuffer, abuffer, kernel, gausswidth, width, height, width / 2, width, shiftar);
-
-                var th2 = new Thread<void*>.try (null, () => {
-                    gaussian_blur_vertical (bbuffer, abuffer, kernel, gausswidth, width, height, 0, width / 2, shiftar);
-                    return null;
-                });
-                
                 th2.join ();
             } catch (Error err) {
                 message (err.message);