From 497ea0d46a7e29c3d316dc1abe53dc3396bfcb73 Mon Sep 17 00:00:00 2001
From: Josh Klontz <Joshua.Klontz@noblis.org>
Date: Tue, 25 Mar 2014 14:36:00 -0400
Subject: [PATCH] Revert "finer grain concurrency for _projectPartial"

---
 openbr/plugins/meta.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/openbr/plugins/meta.cpp b/openbr/plugins/meta.cpp
index ebc4fcd..c713c98 100644
--- a/openbr/plugins/meta.cpp
+++ b/openbr/plugins/meta.cpp
@@ -76,7 +76,7 @@ class PipeTransform : public CompositeTransform
 {
     Q_OBJECT    
 
-    void _projectPartial(Template *srcdst, int startIndex, int stopIndex)
+    void _projectPartial(TemplateList *srcdst, int startIndex, int stopIndex)
     {
         for (int i=startIndex; i<stopIndex; i++)
             *srcdst >> *transforms[i];
@@ -124,9 +124,8 @@ class PipeTransform : public CompositeTransform
 
             fprintf(stderr, " projecting...");
             QFutureSynchronizer<void> futures;
-            for (int j=0; j<dataLines.size(); j++)
-                for (int k=0; k<dataLines[j].size(); k++)
-                    futures.addFuture(QtConcurrent::run(this, &PipeTransform::_projectPartial, &dataLines[j][k], i, nextTrainableTransform));
+            for (int j=0; j < dataLines.size(); j++)
+                futures.addFuture(QtConcurrent::run(this, &PipeTransform::_projectPartial, &dataLines[j], i, nextTrainableTransform));
             futures.waitForFinished();
 
             i = nextTrainableTransform;
--
libgit2 0.21.4