From d98c26da667460ec38f8278d0c94cc0133e94d87 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop+git@gmail.com>
Date: Wed, 15 Apr 2009 00:58:35 +0000
Subject: [PATCH] rearranged the failure handling code

git-svn-id: svn://anubis/fart/trunk@241 7f9b0f55-74a9-4bce-be96-3c2cd072584d
---
 distrib/distrib.cc | 6 +++---
 main/fart.cc       | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/distrib/distrib.cc b/distrib/distrib.cc
index e6590d1..dfa9476 100644
--- a/distrib/distrib.cc
+++ b/distrib/distrib.cc
@@ -374,7 +374,9 @@ int distrib::getTask()
             m_next_task++;
         }
         pthread_mutex_unlock(&m_task_mutex);
-        if (task == -1)
+        if (task > -1)
+            startTask(task);
+        else
         {
             pthread_mutex_lock(&m_tasks_in_progress_mutex);
             std::map<int, int>::const_iterator it = m_tasks_in_progress.begin();
@@ -384,8 +386,6 @@ int distrib::getTask()
             }
             pthread_mutex_unlock(&m_tasks_in_progress_mutex);
         }
-        if (task > -1)
-            startTask(task);
     }
     else
     {
diff --git a/main/fart.cc b/main/fart.cc
index a9571cf..ac201a3 100644
--- a/main/fart.cc
+++ b/main/fart.cc
@@ -195,13 +195,12 @@ int main(int argc, char * argv[])
     else
     {
         /* "sequential" version */
-        unsigned char * pixel = &data[0];
         for (int i = 0; i < height; i++)
         {
             for (int j = 0; j < width; j++)
             {
-                scene.renderPixel(j, i, pixel);
-                pixel += 3;
+                int pixel = i * width + j;
+                scene.renderPixel(j, i, &data[3 * pixel]);
             }
         }
     }