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

[ipdf/code.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index afcffe8..f1a0172 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -9,16 +9,17 @@
 using namespace std;
 using namespace IPDF;
 
-inline void OverlayBMP(Document & doc, const char * filename, const Rect & bounds = Rect(0,0,1,1), const Colour & c = Colour(0.f,0.f,0.f,1.f))
+inline void OverlayBMP(Document & doc, const char * input, const char * output, const Rect & bounds = Rect(0,0,1,1), const Colour & c = Colour(0.f,0.f,0.f,1.f))
 {
        View view(doc, bounds, c);
        Screen scr;
-       //view.Render();
-       scr.RenderBMP(filename);
+       scr.RenderBMP(input);
+       view.Render();
+       sleep(1);
+       scr.ScreenShot(output);
        scr.Present();
-       //MainLoop(doc, bounds, c);
-       sleep(3);
-       scr.ScreenShot(filename);
+       
+       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 +59,7 @@ inline void MainLoop(Document & doc, const Rect & bounds = Rect(0,0,1,1), const
 
        while (scr.PumpEvents())
        {
+               scr.Clear();
                view.Render();
                scr.Present();
        }