[Gnash-commit] gnash ./ChangeLog server/movie_def_impl.h serve...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Sandro Santilli <address@hidden>        06/05/16 08:02:18

Modified files:
        .              : ChangeLog 
        server         : movie_def_impl.h movie_def_impl.cpp 

Log message:
        * server/movie_def_impl.{h,cpp}: changed
        read() method to return bool (false on error)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.327&tr2=1.328&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/movie_def_impl.h.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/movie_def_impl.cpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.327 gnash/ChangeLog:1.328
--- gnash/ChangeLog:1.327       Mon May 15 23:08:34 2006
+++ gnash/ChangeLog     Tue May 16 08:02:18 2006
@@ -1,3 +1,8 @@
+2006-05-16 Sandro Santilli <address@hidden>
+
+       * server/movie_def_impl.{h,cpp}: changed
+       read() method to return bool (false on error)
+
 2006-05-15 Sandro Santilli <address@hidden>
 
        * server/as_object.cpp: fixed compiler warnings.
Index: gnash/server/movie_def_impl.cpp
diff -u gnash/server/movie_def_impl.cpp:1.7 gnash/server/movie_def_impl.cpp:1.8
--- gnash/server/movie_def_impl.cpp:1.7 Tue May  9 17:43:38 2006
+++ gnash/server/movie_def_impl.cpp     Tue May 16 08:02:18 2006
@@ -309,7 +309,8 @@
 
 
 // Read a .SWF movie.
-void movie_def_impl::read(tu_file* in, const std::string& url)
+bool
+movie_def_impl::read(tu_file* in, const std::string& url)
 {
 
        assert(_url == "");
@@ -327,7 +328,7 @@
         {
             // ERROR
             log_error("gnash::movie_def_impl::read() -- file does not start 
with a SWF header!\n");
-            return;
+            return false;
         }
     bool       compressed = (header & 255) == 'C';
 
@@ -338,7 +339,7 @@
         {
 #if TU_CONFIG_LINK_TO_ZLIB == 0
             log_error("movie_def_impl::read(): unable to read zipped SWF data; 
TU_CONFIG_LINK_TO_ZLIB is 0\n");
-            return;
+            return false;
 #endif
 
             IF_VERBOSE_PARSE(log_msg("file is compressed.\n"));
@@ -420,6 +421,8 @@
             // Done with the zlib_adapter.
             delete in;
         }
+
+       return true;
 }
 
 
Index: gnash/server/movie_def_impl.h
diff -u gnash/server/movie_def_impl.h:1.6 gnash/server/movie_def_impl.h:1.7
--- gnash/server/movie_def_impl.h:1.6   Thu May 11 11:15:32 2006
+++ gnash/server/movie_def_impl.h       Tue May 16 08:02:18 2006
@@ -399,8 +399,9 @@
        ///
        /// @param in the tu_file from which to read SWF
        /// @param url the url associated with the input
+       /// @return false if SWF file could not be parsed
        ///
-       void read(tu_file *in, const std::string& url);
+       bool read(tu_file *in, const std::string& url);
 
        /// Fill up *fonts with fonts that we own.
        void get_owned_fonts(std::vector<font*>* fonts);