[Gnash-commit] [SCM] Gnash branch, master, updated. ee36c59bdf5ff5964629e6f43326167fdcc9b100

[Sandro Santilli]

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  ee36c59bdf5ff5964629e6f43326167fdcc9b100 (commit)
      from  7ffcf380483239f13328b87e55d1cb8fece98958 (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=ee36c59bdf5ff5964629e6f43326167fdcc9b100


commit ee36c59bdf5ff5964629e6f43326167fdcc9b100
Author: Sandro Santilli <address@hidden>
Date:   Mon Nov 22 16:47:28 2010 +0100

    Do not log an error about missing export symbols when export symbols ARE 
FOUND!

diff --git a/libcore/parser/SWFMovieDefinition.cpp 
b/libcore/parser/SWFMovieDefinition.cpp
index 8bdc265..72f247b 100644
--- a/libcore/parser/SWFMovieDefinition.cpp
+++ b/libcore/parser/SWFMovieDefinition.cpp
@@ -704,22 +704,34 @@ SWFMovieDefinition::importResources(
 
         }
 
-        // timed out
-        if (!timeout) {
-            log_error("Timeout (%d milliseconds) seeking export "
-                "symbol %s in movie %s. Frames loaded %d/%d",
-                timeout_ms / 1000, symbolName,
-                source->get_url(), loading_frame, source->get_frame_count());
+        if ( ! targetID ) {
+            // timed out
+            if (!timeout) {
+                log_error("Timeout (%d milliseconds) seeking export "
+                    "symbol %s in movie %s. Frames loaded %d/%d",
+                    timeout_ms / 1000, symbolName,
+                    source->get_url(),
+                    loading_frame, source->get_frame_count());
+            }
+            else {
+                // eof
+                //assert(loading_frame >= m_frame_count);
+                log_error("No export symbol %s found in movie %s. "
+                    "Frames loaded %d/%d",
+                    symbolName, source->get_url(), loading_frame,
+                    source->get_frame_count());
+            }
             continue;
         }
-        else {
-            // eof
-            //assert(loading_frame >= m_frame_count);
-            log_error("No export symbol %s found in movie %s. "
-                "Frames loaded %d/%d",
-                symbolName, source->get_url(), loading_frame,
-                source->get_frame_count());
-        }
+
+#ifdef DEBUG_EXPORTS
+        log_debug("Export symbol %s found in movie %s with targetID %d. "
+                    "Frames loaded %d/%d",
+                    symbolName, source->get_url(),
+                    targetID,
+                    loading_frame,
+                    source->get_frame_count());
+#endif
 
         boost::intrusive_ptr<SWF::DefinitionTag> res =
             source->getDefinitionTag(targetID);
@@ -739,6 +751,7 @@ SWFMovieDefinition::importResources(
             ++importedSyms;
             continue;
         }
+
         log_error(_("import error: could not find resource '%s' in "
                     "movie '%s'"), symbolName, source->get_url());
     }

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

Summary of changes:
 libcore/parser/SWFMovieDefinition.cpp |   41 +++++++++++++++++++++-----------
 1 files changed, 27 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
Gnash