[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1231-g8063f6e

[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, master has been updated
       via  8063f6e7496d653ae1216b6a0a58b7cf1e0beb47 (commit)
       via  f57d5ee53534cd443b8625917a9c2becf7f6bb92 (commit)
       via  5cb726b4768c270483c1b9df50963ad4a0944994 (commit)
       via  244f2c1162de347d4f56a9917c08c35edab0fb19 (commit)
      from  fa481c116e65ccf9137c7ddc8abc3cf05dc12f55 (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=8063f6e7496d653ae1216b6a0a58b7cf1e0beb47


commit 8063f6e7496d653ae1216b6a0a58b7cf1e0beb47
Author: Rob Savoye <address@hidden>
Date:   Tue Nov 22 19:48:01 2011 -0700

    Don't create the shared object directory if they're read only, bug #34837

diff --git a/libcore/asobj/SharedObject_as.cpp 
b/libcore/asobj/SharedObject_as.cpp
index 46e63a9..39c3444 100644
--- a/libcore/asobj/SharedObject_as.cpp
+++ b/libcore/asobj/SharedObject_as.cpp
@@ -326,23 +326,25 @@ SharedObject_as::flush(int space) const
 
     const std::string& filespec = getFilespec();
 
-    if (!mkdirRecursive(filespec)) {
-        log_error("Couldn't create dir for flushing SharedObject %s", 
filespec);
-        return false;
-    }
-
+    if (!rcfile.getSOLReadOnly()) {
+        if (!mkdirRecursive(filespec)) {
+            log_error("Couldn't create dir for flushing SharedObject %s", 
filespec);
+            return false;
+        }
+        
 #ifdef USE_SOL_READONLY
-    log_debug(_("SharedObject %s not flushed (compiled as read-only mode)"),
-            filespec);
-    return false;
+        log_debug(_("SharedObject %s not flushed (compiled as read-only 
mode)"),
+                  filespec);
+        return false;
 #endif
+    }
 
     if (rcfile.getSOLReadOnly()) {
         log_security("Attempting to write object %s when it's SOL "
-                "Read Only is set! Refusing...", filespec);
+                     "Read Only is set! Refusing...", filespec);
         return false;
     }
-    
+
     // Open file
     std::ofstream ofs(filespec.c_str(), std::ios::binary);
     if (!ofs) {

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


commit f57d5ee53534cd443b8625917a9c2becf7f6bb92
Merge: 5cb726b fa481c1
Author: Rob Savoye <address@hidden>
Date:   Sun Nov 20 17:04:45 2011 -0700

    Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=5cb726b4768c270483c1b9df50963ad4a0944994


commit 5cb726b4768c270483c1b9df50963ad4a0944994
Merge: 244f2c1 3dea070
Author: Rob Savoye <address@hidden>
Date:   Tue Nov 8 10:37:53 2011 -0700

    Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=244f2c1162de347d4f56a9917c08c35edab0fb19


commit 244f2c1162de347d4f56a9917c08c35edab0fb19
Author: Rob Savoye <address@hidden>
Date:   Sun Oct 30 19:10:18 2011 -0600

    remove debug accessor for drawbounds, as it's unused

diff --git a/gui/fb/fb_glue_ovg.h b/gui/fb/fb_glue_ovg.h
index 53d1242..de09411 100644
--- a/gui/fb/fb_glue_ovg.h
+++ b/gui/fb/fb_glue_ovg.h
@@ -79,19 +79,10 @@ public:
     int height() { return _height; };
     int stride() { return _stride; };
 
-    // these are used only for debugging purpose to access private data
-    size_t getBounds() { return _drawbounds.size(); };
-    // size_t getMemSize() { return _fixinfo.smem_len; };
-
 private:
     int         _stride;
     int         _width;
     int         _height;
-    boost::uint8_t *_offscreenbuf; // FIXME: I think this should go away
-    
-    //Rectangle _bounds;
-    std::vector< geometry::Range2d<int> > _drawbounds;
-    geometry::Range2d<int>              _validbounds;
     
     // EGL needs it's own display device, as that's how it stays platform
     // independent. For a Framebuffer we use that, and on the desktop,
@@ -105,7 +96,6 @@ private:
     renderer::x11::X11Device            _display;
 # endif
 #endif
-    //    boost::scoped_ptr<Renderer> _renderer;
 };
 
 } // end of namespace gui

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

Summary of changes:
 gui/fb/fb_glue_ovg.h              |   10 ----------
 libcore/asobj/SharedObject_as.cpp |   22 ++++++++++++----------
 2 files changed, 12 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
Gnash