From c559a03ce571d2f8bea2150cd96d876b7f248bfe Mon Sep 17 00:00:00 2001
From: Francois Beaune <franz@appleseedhq.net>
Date: Sat, 21 Nov 2015 12:26:07 +0100
Subject: [PATCH] Cosmetics

---
 .../mainwindow/rendering/renderwidget.cpp          |  8 ++++----
 .../kernel/rendering/serialrenderercontroller.cpp  | 14 +++++++-------
 .../kernel/rendering/serialrenderercontroller.h    |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/appleseed.studio/mainwindow/rendering/renderwidget.cpp b/src/appleseed.studio/mainwindow/rendering/renderwidget.cpp
index 1ebaf98d47..d38763c311 100644
--- a/src/appleseed.studio/mainwindow/rendering/renderwidget.cpp
+++ b/src/appleseed.studio/mainwindow/rendering/renderwidget.cpp
@@ -203,8 +203,8 @@ void RenderWidget::highlight_region(
     uint8* dest = get_image_pointer(m_image, x, y);
 
     // Draw a bracket around the tile.
-    const uint8 BracketColor[3] = { 255, 255, 255 };
     const size_t BracketExtent = 5;
+    const uint8 BracketColor[3] = { 255, 255, 255 };
     draw_bracket(
         dest,
         width,
@@ -235,10 +235,10 @@ void RenderWidget::blit_frame(const Frame& frame)
 
     allocate_working_storage(frame_props);
 
-    for (size_t ty = 0; ty < frame_props.m_tile_count_y; ++ty)
+    for (size_t y = 0; y < frame_props.m_tile_count_y; ++y)
     {
-        for (size_t tx = 0; tx < frame_props.m_tile_count_x; ++tx)
-            blit_tile_no_lock(frame, tx, ty);
+        for (size_t x = 0; x < frame_props.m_tile_count_x; ++x)
+            blit_tile_no_lock(frame, x, y);
     }
 }
 
diff --git a/src/appleseed/renderer/kernel/rendering/serialrenderercontroller.cpp b/src/appleseed/renderer/kernel/rendering/serialrenderercontroller.cpp
index cfb9a28b13..c4eaf2c499 100644
--- a/src/appleseed/renderer/kernel/rendering/serialrenderercontroller.cpp
+++ b/src/appleseed/renderer/kernel/rendering/serialrenderercontroller.cpp
@@ -58,9 +58,9 @@ void SerialRendererController::on_rendering_begin()
 
 void SerialRendererController::on_rendering_success()
 {
-    // Execute any pending callback since the
-    // last time on_progress was called.
+    // Execute any pending callback since the last time on_progress() was called.
     exec_callbacks();
+
     m_controller->on_rendering_success();
 }
 
@@ -142,20 +142,20 @@ void SerialRendererController::add_post_render_tile_callback(const Frame* frame)
     m_pending_callbacks.push_back(callback);
 }
 
-void SerialRendererController::exec_callback(const PendingTileCallback& call)
+void SerialRendererController::exec_callback(const PendingTileCallback& cb)
 {
-    switch (call.m_type)
+    switch (cb.m_type)
     {
       case PendingTileCallback::PreRender:
-        m_tile_callback->pre_render(call.m_x, call.m_y, call.m_width, call.m_height);
+        m_tile_callback->pre_render(cb.m_x, cb.m_y, cb.m_width, cb.m_height);
         break;
 
       case PendingTileCallback::PostRenderTile:
-        m_tile_callback->post_render_tile(call.m_frame, call.m_x, call.m_y);
+        m_tile_callback->post_render_tile(cb.m_frame, cb.m_x, cb.m_y);
         break;
 
       case PendingTileCallback::PostRender:
-        m_tile_callback->post_render(call.m_frame);
+        m_tile_callback->post_render(cb.m_frame);
         break;
 
       assert_otherwise;
diff --git a/src/appleseed/renderer/kernel/rendering/serialrenderercontroller.h b/src/appleseed/renderer/kernel/rendering/serialrenderercontroller.h
index f81f938161..0b3a3cfa06 100644
--- a/src/appleseed/renderer/kernel/rendering/serialrenderercontroller.h
+++ b/src/appleseed/renderer/kernel/rendering/serialrenderercontroller.h
@@ -105,7 +105,7 @@ class SerialRendererController
     boost::mutex                        m_mutex;
     std::deque<PendingTileCallback>     m_pending_callbacks;
 
-    void exec_callback(const PendingTileCallback& call);
+    void exec_callback(const PendingTileCallback& cb);
     void exec_callbacks();
 };