[Gnash-commit] /srv/bzr/gnash/trunk r12044: Fix compilation.

[Bastiaan Jacques]

------------------------------------------------------------
revno: 12044
committer: Bastiaan Jacques <address@hidden>
branch nick: trunk
timestamp: Sun 2010-03-14 07:02:38 +0100
message:
  Fix compilation.
modified:
  gui/gui.h
  libcore/Video.h
  libcore/asobj/Date_as.h
  libcore/asobj/flash/display/BitmapData_as.h
  libcore/asobj/flash/geom/ColorTransform_as.h
  libcore/asobj/flash/media/Sound_as.h
  libcore/asobj/flash/net/NetConnection_as.h
  libcore/asobj/flash/xml/XMLNode_as.h
  librender/Renderer.h
  librender/Renderer_agg.cpp
  librender/Renderer_cairo.cpp
  librender/Renderer_ogl.cpp

=== modified file 'gui/gui.h'
--- a/gui/gui.h 2010-03-14 02:26:46 +0000
+++ b/gui/gui.h 2010-03-14 06:02:38 +0000
@@ -36,6 +36,7 @@
 #endif
 
 #include <boost/intrusive_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
 #include <vector>
 #include <cstdlib> 
 #include <string>

=== modified file 'libcore/Video.h'
--- a/libcore/Video.h   2010-03-11 01:47:08 +0000
+++ b/libcore/Video.h   2010-03-14 06:02:38 +0000
@@ -28,6 +28,7 @@
 namespace gnash {
        class NetStream_as;
     class GnashImage;
+    class ObjectURI;
     namespace SWF {
         class DefineVideoStreamTag;
     }

=== modified file 'libcore/asobj/Date_as.h'
--- a/libcore/asobj/Date_as.h   2010-03-14 04:51:25 +0000
+++ b/libcore/asobj/Date_as.h   2010-03-14 06:02:38 +0000
@@ -25,6 +25,7 @@
 
 namespace gnash {
     class as_object;
+    class ObjectURI;
 }
 
 namespace gnash {

=== modified file 'libcore/asobj/flash/display/BitmapData_as.h'
--- a/libcore/asobj/flash/display/BitmapData_as.h       2010-03-14 04:51:25 
+0000
+++ b/libcore/asobj/flash/display/BitmapData_as.h       2010-03-14 06:02:38 
+0000
@@ -25,6 +25,8 @@
 
 #include <list>
 #include <vector>
+#include <boost/cstdint.hpp>
+#include <cassert>
 
 namespace gnash {
 

=== modified file 'libcore/asobj/flash/geom/ColorTransform_as.h'
--- a/libcore/asobj/flash/geom/ColorTransform_as.h      2010-03-14 04:51:25 
+0000
+++ b/libcore/asobj/flash/geom/ColorTransform_as.h      2010-03-14 06:02:38 
+0000
@@ -26,6 +26,7 @@
 
 namespace gnash {
     class as_object;
+    class ObjectURI;
 }
 
 namespace gnash {

=== modified file 'libcore/asobj/flash/media/Sound_as.h'
--- a/libcore/asobj/flash/media/Sound_as.h      2010-03-14 04:51:25 +0000
+++ b/libcore/asobj/flash/media/Sound_as.h      2010-03-14 06:02:38 +0000
@@ -22,6 +22,7 @@
 
 
 #include "smart_ptr.h" //GNASH_USE_GC
+#include "Relay.h"
 
 #include <string>
 #include <boost/scoped_ptr.hpp>
@@ -45,6 +46,7 @@
        class fn_call;
        class as_object;
     class ObjectURI;
+    class DisplayObject;
 
 class Sound_as : public ActiveRelay
 {

=== modified file 'libcore/asobj/flash/net/NetConnection_as.h'
--- a/libcore/asobj/flash/net/NetConnection_as.h        2010-03-14 04:51:25 
+0000
+++ b/libcore/asobj/flash/net/NetConnection_as.h        2010-03-14 06:02:38 
+0000
@@ -25,11 +25,15 @@
 #include <vector>
 #include <string>
 #include <list>
+#include <memory>
 
 // Forward declarations
 namespace gnash {
     class ConnectionHandler;
     class as_object;
+    class as_value;
+    class IOChannel;
+    class ObjectURI;
 }
 
 namespace gnash {

=== modified file 'libcore/asobj/flash/xml/XMLNode_as.h'
--- a/libcore/asobj/flash/xml/XMLNode_as.h      2010-03-14 04:51:25 +0000
+++ b/libcore/asobj/flash/xml/XMLNode_as.h      2010-03-14 06:02:38 +0000
@@ -23,11 +23,14 @@
 #include <list>
 #include <string>
 #include <sstream>
+#include <cassert>
 
 #include "Relay.h"
 
 namespace gnash {
     class as_object;
+    class Global_as;
+    class ObjectURI;
 }
 
 namespace gnash {

=== modified file 'librender/Renderer.h'
--- a/librender/Renderer.h      2010-03-14 03:58:46 +0000
+++ b/librender/Renderer.h      2010-03-14 06:02:38 +0000
@@ -149,16 +149,16 @@
 
 #include "FileTypes.h"
 #include "gnash.h" // Quality
-#include "DisplayObject.h"
 #include "Range2d.h"
 #include "Point2d.h"
 #include "RGBA.h"
 #include "log.h"
+#include "snappingrange.h"
+#include "SWFRect.h"
 
 // Forward declarations.
 namespace gnash {
     class BitmapInfo;
-    class SWFRect;
     class rgba;
     class SWFMatrix;
     class cxform;
@@ -389,14 +389,18 @@
     typedef boost::shared_ptr<GnashVaapiImageProxy> RenderImage;
     typedef std::vector<RenderImage> RenderImages;
 
+    // Get first render image
     virtual RenderImages::iterator getFirstRenderImage()
-      { return RenderImages::iterator(0); }
+            { return _render_images.begin(); }
     virtual RenderImages::const_iterator getFirstRenderImage() const
-      { return RenderImages::const_iterator(0); }
+            { return _render_images.begin(); }
+
+    // Get last render image
     virtual RenderImages::iterator getLastRenderImage()
-      { return RenderImages::iterator(0); }
+            { return _render_images.end(); }
     virtual RenderImages::const_iterator getLastRenderImage() const
-      { return RenderImages::const_iterator(0); }
+            { return _render_images.end(); }
+    
     ///@}
         
     ///@{ Masks
@@ -606,6 +610,8 @@
     /// Kept in parallel with movie_root's setting.
     Quality _quality;
 
+    // Delayed imaged to render
+    RenderImages _render_images;
 }; 
 
 } // namespace gnash

=== modified file 'librender/Renderer_agg.cpp'
--- a/librender/Renderer_agg.cpp        2010-03-14 02:26:46 +0000
+++ b/librender/Renderer_agg.cpp        2010-03-14 06:02:38 +0000
@@ -121,13 +121,12 @@
 #include "Renderer.h"
 #include "Renderer_agg.h" 
 #include "Range2d.h"
-#include "swf/DefineMorphShapeTag.h" 
+#include "smart_ptr.h"
 #include "swf/ShapeRecord.h" 
 #include "DefineShapeTag.h" 
-#include "DisplayObject.h"
-#include "MorphShape.h"
-#include "Shape.h"
 #include "GnashNumeric.h"
+#include "GC.h"
+#include "cxform.h"
 
 #if USE_VAAPI
 #include "GnashVaapiImage.h"
@@ -921,19 +920,6 @@
         }
     }
 
-    // Get first render image
-    virtual RenderImages::iterator getFirstRenderImage()
-        { return _render_images.begin(); }
-    virtual RenderImages::const_iterator getFirstRenderImage() const
-        { return _render_images.begin(); }
-
-    // Get last render image
-    virtual RenderImages::iterator getLastRenderImage()
-        { return _render_images.end(); }
-    virtual RenderImages::const_iterator getLastRenderImage() const
-        { return _render_images.end(); }
-  
-
     // Draw the line strip formed by the sequence of points.
     void drawLine(const std::vector<point>& coords, const rgba& color,
             const SWFMatrix& line_mat)
@@ -2186,9 +2172,6 @@
     // renderer base
     std::auto_ptr<renderer_base> m_rbase;
 
-    // Delayed imaged to render
-    RenderImages _render_images;
-
     int xres;
     int yres;
     int bpp;  // bits per pixel

=== modified file 'librender/Renderer_cairo.cpp'
--- a/librender/Renderer_cairo.cpp      2010-03-14 02:26:46 +0000
+++ b/librender/Renderer_cairo.cpp      2010-03-14 06:02:38 +0000
@@ -44,6 +44,7 @@
 #include "PathParser.h"
 #include "swf/ShapeRecord.h"
 #include "Renderer_cairo.h"
+#include "utility.h"
 
 namespace gnash {
 

=== modified file 'librender/Renderer_ogl.cpp'
--- a/librender/Renderer_ogl.cpp        2010-03-14 02:26:46 +0000
+++ b/librender/Renderer_ogl.cpp        2010-03-14 06:02:38 +0000
@@ -34,6 +34,7 @@
 #include "log.h"
 #include "utility.h"
 #include "Range2d.h"
+#include "cxform.h"
 
 #if defined(_WIN32) || defined(WIN32)
 #  include <Windows.h>