[Gnash-commit] /srv/bzr/gnash/trunk r9579: Minor cleanups to ImageOutput.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 9579
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Tue 2008-08-12 10:28:22 +0200
message:
  Minor cleanups to ImageOutput.
modified:
  libbase/GnashImageJpeg.cpp
  libbase/GnashImagePng.cpp
    ------------------------------------------------------------
    revno: 9577.1.1
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Mon 2008-08-11 21:05:37 +0200
    message:
      Small cleanups, fix unused variable warning.
    modified:
      libbase/GnashImageJpeg.cpp
      libbase/GnashImagePng.cpp
    ------------------------------------------------------------
    revno: 9577.1.2
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Tue 2008-08-12 09:41:54 +0200
    message:
      Release the auto_ptr when constructing a shared_ptr, as some machines
      won't take an auto_ptr.
    modified:
      libcore/swf/tag_loaders.cpp

=== modified file 'libbase/GnashImageJpeg.cpp'
--- a/libbase/GnashImageJpeg.cpp        2008-08-11 16:42:50 +0000
+++ b/libbase/GnashImageJpeg.cpp        2008-08-11 19:05:37 +0000
@@ -432,6 +432,15 @@
 }
 
 
+void
+JpegImageInput::errorOccurred(const char* msg)
+{
+       gnash::log_debug("Long jump: banzaaaaaai!");
+       _errorOccurred = msg;
+       std::longjmp(_jmpBuf, 1);
+}
+
+
 // A jpeglib destination manager that writes to a gnash::IOChannel.
 // Paraphrased from IJG jpeglib jdatadst.c.
 class rw_dest_IOChannel
@@ -572,15 +581,6 @@
 }
 
 
-void
-JpegImageInput::errorOccurred(const char* msg)
-{
-       gnash::log_debug("Long jump: banzaaaaaai!");
-       _errorOccurred = msg;
-       std::longjmp(_jmpBuf, 1);
-}
-
-
 std::auto_ptr<ImageOutput>
 JpegImageOutput::create(boost::shared_ptr<IOChannel> out, size_t width, size_t 
height, int quality)
 {

=== modified file 'libbase/GnashImagePng.cpp'
--- a/libbase/GnashImagePng.cpp 2008-08-11 16:42:50 +0000
+++ b/libbase/GnashImagePng.cpp 2008-08-11 19:05:37 +0000
@@ -135,7 +135,7 @@
 /// PNG output
 ///
 
-PngImageOutput::PngImageOutput(boost::shared_ptr<IOChannel> out, size_t width, 
size_t height, int quality)
+PngImageOutput::PngImageOutput(boost::shared_ptr<IOChannel> out, size_t width, 
size_t height, int /* quality */)
     :
     ImageOutput(out, width, height),
     _pngPtr(0),