[Gnash-commit] [SCM] Gnash branch, hwaccel, updated. release_0_8_9_final-724-geeb6cd6

[Rob Savoye]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, hwaccel has been updated
       via  eeb6cd6cad76d184b48900449fa736a5ea8af378 (commit)
       via  8699b20a5a4debb451984b02688fe55fa61f5095 (commit)
       via  77ecadca0b5bb550b392eb5b04dea2b06b88bfab (commit)
      from  60dc390604b29f511e115a7a0e8a7aa25efa2e46 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=eeb6cd6cad76d184b48900449fa736a5ea8af378


commit eeb6cd6cad76d184b48900449fa736a5ea8af378
Author: Rob Savoye <address@hidden>
Date:   Wed Apr 27 22:03:25 2011 -0600

    cleanup to eliminate compiler warnings

diff --git a/gui/fb/fb_glue.h b/gui/fb/fb_glue.h
index b229afd..381ad76 100644
--- a/gui/fb/fb_glue.h
+++ b/gui/fb/fb_glue.h
@@ -64,14 +64,14 @@ public:
     virtual void prepDrawingArea(FbWidget *drawing_area) = 0;
     virtual Renderer* createRenderHandler() = 0;
     virtual void setRenderHandlerSize(int /*width*/, int /*height*/) {}
-    virtual void setInvalidatedRegions(const InvalidatedRanges &ranges) {};
+    virtual void setInvalidatedRegions(const InvalidatedRanges &/* ranges */) 
{};
     
     virtual void render() = 0;
     
     virtual int width() = 0;
     virtual int height() = 0;
     
-    virtual void render(void* const region) {};
+    virtual void render(void* const /* region */) {};
 
     virtual void beforeRendering(movie_root *) {};
 
diff --git a/gui/fb/fb_glue_gles1.h b/gui/fb/fb_glue_gles1.h
index 02d0132..b984703 100644
--- a/gui/fb/fb_glue_gles1.h
+++ b/gui/fb/fb_glue_gles1.h
@@ -51,25 +51,25 @@ namespace gnash {
 
 namespace gui {
 
-class Renderer;
+class render_handler;
 
 class FBgles1Glue: public FBGlue
 {
 public:
     FBgles1Glue(int fd);
-    virtual ~FBgles1Glue();
-    virtual bool init(int argc, char ***);
+    ~FBgles1Glue();
+    bool init(int argc, char ***);
     
-    virtual Renderer* createRenderHandler();
-    virtual void setInvalidatedRegions(const InvalidatedRanges& /* ranges */) 
{}
+    Renderer* createRenderHandler();
+    void setInvalidatedRegions(const InvalidatedRanges& /* ranges */) {}
     
-    virtual int width ();
-    virtual int height ();
-    virtual void render ();
+    int width ();
+    int height ();
+    void render ();
     
-    virtual void render_to_pbuffer ();
-    virtual void prepare_copy_from_pbuffer ();
-    virtual void render_to_display ();
+    void render_to_pbuffer ();
+    void prepare_copy_from_pbuffer ();
+    void render_to_display ();
     
 protected:
     int         _fd;
diff --git a/gui/fb/fb_glue_ovg.cpp b/gui/fb/fb_glue_ovg.cpp
index 87a75a8..b449698 100644
--- a/gui/fb/fb_glue_ovg.cpp
+++ b/gui/fb/fb_glue_ovg.cpp
@@ -58,8 +58,8 @@ FBOvgGlue::init(int /* argc */, char **/*argv*/[])
 {
     // GNASH_REPORT_FUNCTION;
 
-    bool egl = false;
 #if 0
+    bool egl = false;
     bool rawfb = false;
     bool dfb = false;
     bool x11 = false;
@@ -161,7 +161,7 @@ FBOvgGlue::createRenderHandler()
 
 /// Not implemented, Fixme
 void
-FBOvgGlue::setInvalidatedRegions(const InvalidatedRanges& ranges)
+FBOvgGlue::setInvalidatedRegions(const InvalidatedRanges& /* ranges */)
 {
     // GNASH_REPORT_FUNCTION;
     // if (_renderer) {
diff --git a/gui/gtk/gtk_glue_ovg.cpp b/gui/gtk/gtk_glue_ovg.cpp
index aafc7c9..4f494ad 100644
--- a/gui/gtk/gtk_glue_ovg.cpp
+++ b/gui/gtk/gtk_glue_ovg.cpp
@@ -172,7 +172,7 @@ GtkOvgGlue::createRenderHandler()
     
     GdkVisual* wvisual = gdk_drawable_get_visual(_drawing_area->window);
     GdkImage* tmpimage = gdk_image_new (GDK_IMAGE_FASTEST, wvisual, 1, 1);
-    const GdkVisual* visual = tmpimage->visual;
+    // const GdkVisual* visual = tmpimage->visual;
     gdk_image_destroy(tmpimage);
 
     _renderer.reset(reinterpret_cast<renderer::openvg::Renderer_ovg *>
@@ -273,7 +273,7 @@ GtkOvgGlue::render()
 }
 
 void
-GtkOvgGlue::render(int minx, int miny, int maxx, int maxy)
+GtkOvgGlue::render(int /* minx */, int /* miny */, int /* maxx */, int /* maxy 
*/)
 {
     GNASH_REPORT_FUNCTION;
 
diff --git a/gui/gui.cpp b/gui/gui.cpp
index fad83a5..3717b76 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -805,7 +805,6 @@ Gui::display(movie_root* m)
                     const geometry::Range2d<int>& bounds = 
                         changed_ranges.getRange(rno);
                     
-                    point corners[4];
                     float xmin = bounds.getMinX();
                     float xmax = bounds.getMaxX();
                     float ymin = bounds.getMinY();

http://git.savannah.gnu.org/cgit//commit/?id=8699b20a5a4debb451984b02688fe55fa61f5095


commit 8699b20a5a4debb451984b02688fe55fa61f5095
Author: Rob Savoye <address@hidden>
Date:   Wed Apr 27 22:00:18 2011 -0600

    update copyright date

diff --git a/librender/openvg/OpenVGRenderer.cpp 
b/librender/openvg/OpenVGRenderer.cpp
index 8c1b61d..20bde60 100644
--- a/librender/openvg/OpenVGRenderer.cpp
+++ b/librender/openvg/OpenVGRenderer.cpp
@@ -1,5 +1,6 @@
 // 
-//   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software 
Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010,
+//   2011 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

http://git.savannah.gnu.org/cgit//commit/?id=77ecadca0b5bb550b392eb5b04dea2b06b88bfab


commit 77ecadca0b5bb550b392eb5b04dea2b06b88bfab
Author: Rob Savoye <address@hidden>
Date:   Wed Apr 27 21:59:34 2011 -0600

    support AGG again in additional to OpenVG. Use the command line args to 
change renderers.

diff --git a/gui/fb/fb.cpp b/gui/fb/fb.cpp
index 9229f50..d4bdd7a 100644
--- a/gui/fb/fb.cpp
+++ b/gui/fb/fb.cpp
@@ -124,20 +124,13 @@
 # include "fb_glue_ovg.h"
 #endif
 
-#if 0
-// FIXME: this is just to remind us to implement these too
 #ifdef RENDERER_GLES1
 # include "fb_glue_gles1.h"
 #endif
 
-#ifdef RENDERER_GLES2
-# include "fb_glue_gles2.h"
-#endif
-#endif
-
-namespace {
-gnash::RcInitFile& rcfile = gnash::RcInitFile::getDefaultInstance();
-}
+// namespace {
+// gnash::RcInitFile& rcfile = gnash::RcInitFile::getDefaultInstance();
+// }
 namespace gnash {
 
 namespace gui {
@@ -196,8 +189,7 @@ FBGui::init(int argc, char *** argv)
     // GNASH_REPORT_FUNCTION;
 
     // the current renderer as set on the command line or gnashrc file
-//    std::string renderer = _runResources.getRenderBackend();
-    std::string renderer = rcfile.getRenderer();
+    std::string renderer = _runResources.getRenderBackend();
 
     // map framebuffer into memory
     // Create a new Glue layer
@@ -220,7 +212,8 @@ FBGui::init(int argc, char *** argv)
     if (renderer.empty()) {
         renderer = "openvg";
     }
-    if (renderer == "openvg") {
+    if ((renderer == "openvg") || (renderer == "ovg")) {
+        renderer = "openvg";
         _glue.reset(new FBOvgGlue(0));
         // Initialize the glue layer between the renderer and the gui toolkit
         _glue->init(argc, argv);
@@ -230,7 +223,8 @@ FBGui::init(int argc, char *** argv)
         _width =  ovg->getWidth();
         _height = ovg->getHeight();
         log_debug("Width:%d, Height:%d", _width, _height);
-    } else {
+    }
+    if ((renderer != "openvg") && (renderer != "agg")) {
         log_error("No renderer! %s not supported.", renderer);
     }
 #endif
@@ -315,17 +309,17 @@ FBGui::init(int argc, char *** argv)
 
     _validbounds.setTo(0, 0, _width - 1, _height - 1);
 
-#ifdef RENDERER_OPENVG
-    _renderer.reset(renderer::openvg::create_handler(0));
+    if (renderer == "openvg") {
+        _renderer.reset(renderer::openvg::create_handler(0));     
+        renderer::openvg::Renderer_ovg *rend = reinterpret_cast
+            <renderer::openvg::Renderer_ovg *>(_renderer.get());
+        rend->init(_width, _height);
+    }
     
-    renderer::openvg::Renderer_ovg *rend = reinterpret_cast
-        <renderer::openvg::Renderer_ovg *>(_renderer.get());
-    rend->init(_width, _height);
-#else
-# ifdef RENDERER_AGG
-    _renderer.reset(create_Renderer_agg(0));
-# endif
-#endif
+    if (renderer == "agg") {
+        _renderer.reset(create_Renderer_agg(0));
+    }
+
     return true;
 }
 
@@ -480,7 +474,7 @@ FBGui::showMouse(bool /*show*/)
 }
 
 void
-FBGui::setInvalidatedRegion(const SWFRect& bounds)
+FBGui::setInvalidatedRegion(const SWFRect& /* bounds */)
 {
     // GNASH_REPORT_FUNCTION;
 

-----------------------------------------------------------------------

Summary of changes:
 gui/fb/fb.cpp                       |   44 +++++++++++++++-------------------
 gui/fb/fb_glue.h                    |    4 +-
 gui/fb/fb_glue_gles1.h              |   22 ++++++++--------
 gui/fb/fb_glue_ovg.cpp              |    4 +-
 gui/gtk/gtk_glue_ovg.cpp            |    4 +-
 gui/gui.cpp                         |    1 -
 librender/openvg/OpenVGRenderer.cpp |    3 +-
 7 files changed, 38 insertions(+), 44 deletions(-)


hooks/post-receive
-- 
Gnash