[Gnash-commit] /srv/bzr/gnash/trunk r9587: Bugfix to PNG image input.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 9587
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Tue 2008-08-12 22:30:43 +0200
message:
  Bugfix to PNG image input.
modified:
  libbase/GnashImagePng.cpp
    ------------------------------------------------------------
    revno: 9581.1.1
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Tue 2008-08-12 14:35:43 +0200
    message:
      Get the comment right.
    modified:
      libbase/GnashImagePng.cpp
    ------------------------------------------------------------
    revno: 9581.1.2
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Tue 2008-08-12 18:20:00 +0200
    message:
      Merge in from trunk. Why do I have to do this?
    modified:
      libbase/curl_adapter.cpp
      libcore/asobj/NetConnection.cpp
      libcore/asobj/NetConnection.h
      libcore/matrix.cpp
      libcore/namedStrings.cpp
      libcore/namedStrings.h
      libcore/swf/PlaceObject2Tag.cpp
    ------------------------------------------------------------
    revno: 9581.1.3
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Tue 2008-08-12 21:07:00 +0200
    message:
      Merge in from trunk
    added:
      macros/nspr.m4
      macros/xpcom.m4
      plugin/xpcom/
      plugin/xpcom/GnashComponent.cpp
      plugin/xpcom/GnashComponent.h
      plugin/xpcom/GnashComponentModule.cpp
      plugin/xpcom/Makefile.am
      plugin/xpcom/iGnashComponent.idl
    modified:
      Makefile.am
      configure.ac
      libcore/asobj/NetConnection.cpp
      libcore/parser/shape_character_def.cpp
      libcore/shape.h
      packaging/xpi.am
      packaging/xpi/install.rdf
      plugin/Makefile.am
    ------------------------------------------------------------
    revno: 9581.1.4
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Tue 2008-08-12 22:29:22 +0200
    message:
      Don't forget to initialize _currentRow. Should fix random assertion 
failures.
    modified:
      libbase/GnashImagePng.cpp

=== modified file 'libbase/GnashImagePng.cpp'
--- a/libbase/GnashImagePng.cpp 2008-08-12 10:58:20 +0000
+++ b/libbase/GnashImagePng.cpp 2008-08-12 20:29:22 +0000
@@ -70,7 +70,8 @@
 PngImageInput::PngImageInput(boost::shared_ptr<IOChannel> in) :
     ImageInput(in),
     _pngPtr(0),
-    _infoPtr(0)
+    _infoPtr(0),
+    _currentRow(0)
 {
     init();
 }
@@ -175,7 +176,7 @@
 
     boost::scoped_array<png_bytep> rows(new png_bytep[_height]);
 
-    // RGB
+    // RGBA
     const size_t components = 4;
 
     for (size_t y = 0; y < _height; ++y)