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

Conflicts:
	src/screen.cpp

David's way is better.

diff --combined src/main.h
index 7cfa22c,9fcc26b..f1a0172
--- 1/src/main.h
--- 2/src/main.h
+++ b/src/main.h
@@@ -13,12 -13,11 +13,13 @@@ inline void OverlayBMP(Document & doc, 
  {
        View view(doc, bounds, c);
        Screen scr;
-       //view.Render();
        scr.RenderBMP(input);
-       scr.Present();
+       view.Render();
 -      scr.Present();
 -      sleep(5);
 +      sleep(1);
        scr.ScreenShot(output);
++      scr.Present();
++      
 +      sleep(1);
  }
  
  inline void MainLoop(Document & doc, const Rect & bounds = Rect(0,0,1,1), const Colour & c = Colour(0.f,0.f,0.f,1.f))
@@@ -58,6 -57,7 +59,7 @@@
  
        while (scr.PumpEvents())
        {
+               scr.Clear();
                view.Render();
                scr.Present();
        }

diff --combined src/screen.cpp
index 5f32f0d,59d4334..01e7364
--- 1/src/screen.cpp
--- 2/src/screen.cpp
+++ b/src/screen.cpp
@@@ -19,11 -19,11 +19,11 @@@ Screen::Screen(
  
        m_gl_context = SDL_GL_CreateContext(m_window);
  
-       glClearColor(1.f,1.f,1.f,1.f);
-       glClear(GL_COLOR_BUFFER_BIT);
+       ResizeViewport(800, 600);
+ 
+       Clear();
        Present();
        
-       ResizeViewport(800, 600);
  
  }
  
@@@ -34,6 -34,12 +34,12 @@@ Screen::~Screen(
        SDL_Quit();
  }
  
+ void Screen::Clear(float r, float g, float b, float a)
+ {
+       glClearColor(r,g,b,a);
+       glClear(GL_COLOR_BUFFER_BIT);
+ }
+ 
  void Screen::ResizeViewport(int width, int height)
  {
        glViewport(0, 0, width, height);
@@@ -133,13 -139,16 +139,17 @@@ void Screen::ScreenShot(const char * fi
        if (pixels == NULL)
                Fatal("Failed to allocate %d x %d x 4 = %d pixel array", w, h, w*h*4);
  
-       glReadBuffer(GL_FRONT);
-       glPixelStorei(GL_PACK_ALIGNMENT, 1);
- 
-       glReadPixels(0,0,w, h, GL_BGRA, GL_UNSIGNED_BYTE, pixels);
 +
+       for (int y = 0; y < h; ++y)
+       {
+               glReadPixels(0,h-y-1,w, 1, GL_RGBA, GL_UNSIGNED_BYTE, &pixels[y*w*4]);
+       }
  
-       SDL_Surface * surf = SDL_CreateRGBSurfaceFrom(pixels, w, h, 8*4, w*4, 0,0,0,0);
+ #if SDL_BYTEORDER == SDL_LIL_ENDIAN
+       SDL_Surface * surf = SDL_CreateRGBSurfaceFrom(pixels, w, h, 8*4, w*4, 0x000000ff,0x0000ff00,0x00ff0000,0xff000000);
+ #else
+       SDL_Surface * surf = SDL_CreateRGBSurfaceFrom(pixels, w, h, 8*4, w*4, 0xff000000,0x00ff0000,0x0000ff00,0x000000ff);
+ #endif
        if (surf == NULL)
                Fatal("Failed to create SDL_Surface from pixel data - %s", SDL_GetError());