Dedent PathClipper implementation

All the other path converters do an early return if they're disabled,
which can be done here as well to drop one extra indent level.

Author: QuLogic

src/path_converters.h

@@ -193,8 +193,8 @@ class PathNanRemover : protected EmbeddedQueue<4>
         }
 
         if (m_has_codes) {
-	    /* This is the slow method for when there might be curves or closed
-	     * loops. */
+            /* This is the slow method for when there might be curves or closed
+             * loops. */
             if (queue_pop(&code, x, y)) {
                 return code;
             }
@@ -365,75 +365,79 @@ class PathClipper : public EmbeddedQueue<3>
         unsigned code;
         bool emit_moveto = false;
 
-        if (m_do_clipping) {
-            /* This is the slow path where we actually do clipping */
-
-            if (queue_pop(&code, x, y)) {
-                return code;
-            }
+        if (!m_do_clipping) {
+            // If not doing any clipping, just pass along the vertices verbatim
+            return m_source->vertex(x, y);
+        }
 
-            while ((code = m_source->vertex(x, y)) != agg::path_cmd_stop) {
-                emit_moveto = false;
+        /* This is the slow path where we actually do clipping */
 
-                switch (code) {
-                case (agg::path_cmd_end_poly | agg::path_flags_close):
-                    if (m_has_init) {
-                        draw_clipped_line(m_lastX, m_lastY, m_initX, m_initY);
-                    }
-                    queue_push(
-                        agg::path_cmd_end_poly | agg::path_flags_close,
-                        m_lastX, m_lastY);
-                    goto exit_loop;
+        if (queue_pop(&code, x, y)) {
+            return code;
+        }
 
-                case agg::path_cmd_move_to:
-
-                    // was the last command a moveto (and we have
-                    // seen at least one command ?
-                    // if so, shove it in the queue if in clip box
-                    if (m_moveto && m_has_init &&
-                        m_lastX >= m_cliprect.x1 &&
-                        m_lastX <= m_cliprect.x2 &&
-                        m_lastY >= m_cliprect.y1 &&
-                        m_lastY <= m_cliprect.y2) {
-                        // push the last moveto onto the queue
-                        queue_push(agg::path_cmd_move_to, m_lastX, m_lastY);
-                        // flag that we need to emit it
-                        emit_moveto = true;
-                    }
-                    // update the internal state for this moveto
-                    m_initX = m_lastX = *x;
-                    m_initY = m_lastY = *y;
-                    m_has_init = true;
-                    m_moveto = true;
-                    // if the last command was moveto exit the loop to emit the code
-                    if (emit_moveto) {
-                        goto exit_loop;
-                    }
-                    // else, break and get the next point
-                    break;
+        while ((code = m_source->vertex(x, y)) != agg::path_cmd_stop) {
+            emit_moveto = false;
 
-                case agg::path_cmd_line_to:
-                    if (draw_clipped_line(m_lastX, m_lastY, *x, *y)) {
-                        m_lastX = *x;
-                        m_lastY = *y;
-                        goto exit_loop;
-                    }
-                    m_lastX = *x;
-                    m_lastY = *y;
-                    break;
-
-                default:
-                    if (m_moveto) {
-                        queue_push(agg::path_cmd_move_to, m_lastX, m_lastY);
-                        m_moveto = false;
-                    }
+            switch (code) {
+            case (agg::path_cmd_end_poly | agg::path_flags_close):
+                if (m_has_init) {
+                    draw_clipped_line(m_lastX, m_lastY, m_initX, m_initY);
+                }
+                queue_push(
+                    agg::path_cmd_end_poly | agg::path_flags_close,
+                    m_lastX, m_lastY);
+                goto exit_loop;
+
+            case agg::path_cmd_move_to:
+
+                // was the last command a moveto (and we have
+                // seen at least one command ?
+                // if so, shove it in the queue if in clip box
+                if (m_moveto && m_has_init &&
+                    m_lastX >= m_cliprect.x1 &&
+                    m_lastX <= m_cliprect.x2 &&
+                    m_lastY >= m_cliprect.y1 &&
+                    m_lastY <= m_cliprect.y2) {
+                    // push the last moveto onto the queue
+                    queue_push(agg::path_cmd_move_to, m_lastX, m_lastY);
+                    // flag that we need to emit it
+                    emit_moveto = true;
+                }
+                // update the internal state for this moveto
+                m_initX = m_lastX = *x;
+                m_initY = m_lastY = *y;
+                m_has_init = true;
+                m_moveto = true;
+                // if the last command was moveto exit the loop to emit the code
+                if (emit_moveto) {
+                    goto exit_loop;
+                }
+                // else, break and get the next point
+                break;
 
-                    queue_push(code, *x, *y);
+            case agg::path_cmd_line_to:
+                if (draw_clipped_line(m_lastX, m_lastY, *x, *y)) {
                     m_lastX = *x;
                     m_lastY = *y;
                     goto exit_loop;
                 }
+                m_lastX = *x;
+                m_lastY = *y;
+                break;
+
+            default:
+                if (m_moveto) {
+                    queue_push(agg::path_cmd_move_to, m_lastX, m_lastY);
+                    m_moveto = false;
+                }
+
+                queue_push(code, *x, *y);
+                m_lastX = *x;
+                m_lastY = *y;
+                goto exit_loop;
             }
+        }
 
         exit_loop:
 
@@ -453,11 +457,6 @@ class PathClipper : public EmbeddedQueue<3>
             }
 
             return agg::path_cmd_stop;
-        } else {
-            // If not doing any clipping, just pass along the vertices
-            // verbatim
-            return m_source->vertex(x, y);
-        }
     }
 };