Merge branch 'master' of git.ucc.asn.au:ipdf/code

diff --combined src/view.cpp
index a1a70f4,bd9b2fa..5ea61f8
--- 1/src/view.cpp
--- 2/src/view.cpp
+++ b/src/view.cpp
@@@ -10,12 -10,7 +10,7 @@@ void View::Render(
        static bool debug_output_done = false;
        if (!debug_output_done)
        {
-               Debug("Bounds are %s", m_bounds.Str().c_str());
-               Debug("Objects are:");
-               for (unsigned id = 0; id < m_document.ObjectCount(); ++id)
-               {
-                       Debug("%u\t%s", id, m_document.m_objects.bounds[id].Str().c_str());
-               }
+               m_document.DebugDumpObjects();
                debug_output_done = true;
        }
  
@@@ -32,21 -27,6 +27,21 @@@
        glBegin(GL_QUADS);
        for (unsigned id = 0; id < m_document.ObjectCount(); ++id)
        {
 +              if (m_document.m_objects.types[id] == RECT_FILLED)
 +                      continue;
 +              Rect obj_bounds = m_document.m_objects.bounds[id];
 +              glVertex2f(obj_bounds.x, obj_bounds.y);
 +              glVertex2f(obj_bounds.x + obj_bounds.w, obj_bounds.y);
 +              glVertex2f(obj_bounds.x + obj_bounds.w, obj_bounds.y + obj_bounds.h);
 +              glVertex2f(obj_bounds.x, obj_bounds.y + obj_bounds.h);
 +      }
 +      glEnd();
 +
 +      glBegin(GL_LINE_LOOP);
 +      for (unsigned id = 0; id < m_document.ObjectCount(); ++id)
 +      {
 +              if (m_document.m_objects.types[id] == RECT_OUTLINE)
 +                      continue;
                Rect obj_bounds = m_document.m_objects.bounds[id];
                glVertex2f(obj_bounds.x, obj_bounds.y);
                glVertex2f(obj_bounds.x + obj_bounds.w, obj_bounds.y);