[Gnash-commit] /srv/bzr/gnash/trunk r11632: Guess at some fixes to other people's build problems.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 11632 [merge]
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Tue 2009-11-17 10:39:37 +0100
message:
  Guess at some fixes to other people's build problems.
  
  Drop something useless from AbcBlock.
  
  Minor alterations to fb code.
modified:
  gui/fb.cpp
  gui/fbsup.h
  libcore/abc/AbcBlock.cpp
  libcore/abc/AbcBlock.h
  libcore/asobj/Makefile.am
  libcore/parser/Makefile.am

=== modified file 'gui/fb.cpp'
--- a/gui/fb.cpp        2009-11-16 12:57:54 +0000
+++ b/gui/fb.cpp        2009-11-17 09:33:58 +0000
@@ -291,26 +291,28 @@
 }
 
 bool FBGui::initialize_renderer() {
-  int _width    = var_screeninfo.xres;
-  int _height   = var_screeninfo.yres;
-  int _bpp = var_screeninfo.bits_per_pixel;
-  int _size = fix_screeninfo.smem_len;   // TODO: should recalculate!  
-  unsigned char *_mem;
-  Renderer_agg_base *agg_handler;
-  
-  m_stage_width = _width;
-  m_stage_height = _height;
-  
-  _validbounds.setTo(0, 0, _width-1, _height-1);
+  const int width    = var_screeninfo.xres;
+  const int height   = var_screeninfo.yres;
+  const int bpp = var_screeninfo.bits_per_pixel;
+  const int size = fix_screeninfo.smem_len; 
+
+  // TODO: should recalculate!  
+  unsigned char* mem;
+  Renderer_agg_base* agg_handler;
+  
+  m_stage_width = width;
+  m_stage_height = height;
+  
+  _validbounds.setTo(0, 0, width - 1, height - 1);
     
   
-  #ifdef DOUBLE_BUFFER
+#ifdef DOUBLE_BUFFER
   log_debug(_("Double buffering enabled"));
-  _mem = buffer;
-  #else
+  mem = buffer;
+#else
   log_debug(_("Double buffering disabled"));
-  _mem = fbmem;
-  #endif
+  mem = fbmem;
+#endif
   
   
   agg_handler = NULL;
@@ -329,7 +331,7 @@
     var_screeninfo.red.offset, var_screeninfo.red.length,
     var_screeninfo.green.offset, var_screeninfo.green.length,
     var_screeninfo.blue.offset, var_screeninfo.blue.length,
-    _bpp
+    bpp
   );
 
   if (pixelformat) {    
@@ -339,14 +341,15 @@
     return false;
   }
 
-  assert(agg_handler!=NULL);
+  assert(agg_handler);
+
   _renderer.reset(agg_handler);
 
-  _runResources.setRenderer(boost::shared_ptr<Renderer>(_renderer));
-  
-  m_rowsize = var_screeninfo.xres_virtual*((_bpp+7)/8);
-  
-  agg_handler->init_buffer(_mem, _size, _width, _height, m_rowsize);
+  _runResources.setRenderer(_renderer);
+  
+  m_rowsize = var_screeninfo.xres_virtual*((bpp+7)/8);
+  
+  agg_handler->init_buffer(mem, size, width, height, m_rowsize);
   
   disable_terminal();
 

=== modified file 'gui/fbsup.h'
--- a/gui/fbsup.h       2009-11-16 12:57:54 +0000
+++ b/gui/fbsup.h       2009-11-17 09:33:58 +0000
@@ -15,8 +15,8 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-#ifndef __FBSUP_H__
-#define __FBSUP_H__
+#ifndef GNASH_FBSUP_H
+#define GNASH_FBSUP_H
 
 #ifdef HAVE_CONFIG_H
 #include "gnashconfig.h"
@@ -107,8 +107,6 @@
 ///
 ///   any PS/2 compatible mouse (may be emulated by the kernel) talking 
 ///   to /dev/input/mice
-
-
 class FBGui : public Gui
 {
        private:

=== modified file 'libcore/abc/AbcBlock.cpp'
--- a/libcore/abc/AbcBlock.cpp  2009-11-16 14:42:56 +0000
+++ b/libcore/abc/AbcBlock.cpp  2009-11-17 08:09:35 +0000
@@ -529,11 +529,9 @@
        boost::uint32_t count = _stream->read_V32();
        log_abc("There are %u string constants.", count);
        _stringPool.resize(count);
-       _stringPoolTableIDs.resize(count);
 
     if (count) {
                _stringPool[0] = "";
-               _stringPoolTableIDs[0] = 0;
        }
 
     for (size_t i = 1; i < count; ++i) {
@@ -541,7 +539,6 @@
                _stream->read_string_with_length(length, _stringPool[i]);
                log_abc("Adding string constant to string pool: index=%u %s",
                 i, _stringPool[i]);
-               _stringPoolTableIDs[i] = 0;
        }
        return true;
 }

=== modified file 'libcore/abc/AbcBlock.h'
--- a/libcore/abc/AbcBlock.h    2009-11-16 14:42:56 +0000
+++ b/libcore/abc/AbcBlock.h    2009-11-17 08:09:35 +0000
@@ -329,7 +329,6 @@
        std::vector<boost::uint32_t> _uIntegerPool;
        std::vector<double> _doublePool;
        std::vector<std::string> _stringPool;
-       std::vector<string_table::key> _stringPoolTableIDs;
        std::vector<Namespace*> _namespacePool;
        std::vector<NamespaceSet> _namespaceSetPool;
        std::vector<Method*> _methods;

=== modified file 'libcore/asobj/Makefile.am'
--- a/libcore/asobj/Makefile.am 2009-09-09 19:50:57 +0000
+++ b/libcore/asobj/Makefile.am 2009-11-17 09:36:06 +0000
@@ -38,6 +38,7 @@
        -I$(top_srcdir)/backend \
        -I$(top_srcdir)/libcore \
        -I$(top_srcdir)/libcore/swf \
+       -I$(top_srcdir)/libcore/abc \
        -I$(top_srcdir)/libcore/parser \
        -I$(top_srcdir)/libcore/vm \
        -I$(top_srcdir)/libcore/asobj/flash \

=== modified file 'libcore/parser/Makefile.am'
--- a/libcore/parser/Makefile.am        2009-11-16 14:01:20 +0000
+++ b/libcore/parser/Makefile.am        2009-11-17 09:35:40 +0000
@@ -30,6 +30,7 @@
        -I$(top_srcdir)/backend \
        -I$(top_srcdir)/libcore \
        -I$(top_srcdir)/libcore/swf \
+       -I$(top_srcdir)/libcore/abc \
        -I$(top_srcdir)/libcore/parser \
        -I$(top_srcdir)/libcore/vm \
        -I$(top_srcdir)/libcore/asobj \