[Gnash-commit] gnash ChangeLog libbase/jpeg.cpp libbase/zlib_a...

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/05/27 07:49:46

Modified files:
        .              : ChangeLog 
        libbase        : jpeg.cpp zlib_adapter.cpp rc.cpp 

Log message:
                * libbase/jpeg.cpp, libbase/rc.cpp, libbase/zlib_adapter.cpp:
                  header cleanup - include sstream where it's used (It'll be
                  dropped from log.h shortly). Drop c_str() for logging, use
                  ostringstream where there's no >>. Try dropping #undef
                  HAVE_STDLIB_H in jpeg.cpp (as queried in comment) to see
                  who squeals.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6715&r2=1.6716
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/jpeg.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/zlib_adapter.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&r1=1.73&r2=1.74

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6715
retrieving revision 1.6716
diff -u -b -r1.6715 -r1.6716
--- ChangeLog   27 May 2008 04:11:32 -0000      1.6715
+++ ChangeLog   27 May 2008 07:49:45 -0000      1.6716
@@ -1,3 +1,12 @@
+2008-05-27 Benjamin Wolsey <address@hidden>
+
+       * libbase/jpeg.cpp, libbase/rc.cpp, libbase/zlib_adapter.cpp:
+         header cleanup - include sstream where it's used (It'll be
+         dropped from log.h shortly). Drop c_str() for logging, use
+         ostringstream where there's no >>. Try dropping #undef
+         HAVE_STDLIB_H in jpeg.cpp (as queried in comment) to see
+         who squeals.
+
 2008-05-26 Bastiaan Jacques <address@hidden>
 
        * backend/render_handler_cairo.cpp: Don't apply the shape matrix to

Index: libbase/jpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/jpeg.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- libbase/jpeg.cpp    29 Jan 2008 21:23:44 -0000      1.23
+++ libbase/jpeg.cpp    27 May 2008 07:49:46 -0000      1.24
@@ -13,12 +13,11 @@
 #include "log.h"
 #include "GnashException.h"
 
-#include <cstdio>
+#include <sstream>
 
 extern "C" {
 
 // do we reall want to undefine HAVE_STDLIB_H here ??
-#undef HAVE_STDLIB_H
 #include <jpeglib.h>
 }
 

Index: libbase/zlib_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/zlib_adapter.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- libbase/zlib_adapter.cpp    19 May 2008 13:03:55 -0000      1.23
+++ libbase/zlib_adapter.cpp    27 May 2008 07:49:46 -0000      1.24
@@ -13,6 +13,7 @@
 #include "GnashException.h"
 #include <algorithm> // std::min
 
+#include <sstream>
 #include <memory>
 
 using namespace gnash;
@@ -86,7 +87,7 @@
 
                        int     err = inflateInit(&m_zstream);
                        if (err != Z_OK) {
-                               gnash::log_error("inflater_impl::ctor() 
inflateInit() returned %d\n", err);
+                               gnash::log_error("inflater_impl::ctor() 
inflateInit() returned %d", err);
                                m_error = 1;
                                return;
                        }
@@ -107,7 +108,7 @@
                        m_at_eof = 0;
                        int     err = inflateReset(&m_zstream);
                        if (err != Z_OK) {
-                               gnash::log_error("inflater_impl::reset() 
inflateReset() returned %d\n", err);
+                               gnash::log_error("inflater_impl::reset() 
inflateReset() returned %d", err);
                                m_error = 1;
                                return;
                        }
@@ -167,22 +168,22 @@
                                }
                                if (err == Z_BUF_ERROR)
                                {
-                                       std::stringstream ss;
+                                       std::ostringstream ss;
                                        ss << __FILE__ << ":" << __LINE__ << ": 
" << m_zstream.msg;
                                        // we should call inflate again... 
giving more input or output space !
-                                       gnash::log_error("%s", 
ss.str().c_str());
+                                       gnash::log_error("%s", ss.str());
                                        break;
                                }
                                if (err == Z_DATA_ERROR)
                                {
-                                       std::stringstream ss;
+                                       std::ostringstream ss;
                                        ss << __FILE__ << ":" << __LINE__ << ": 
" << m_zstream.msg;
                                        throw ParserException(ss.str());
                                        break;
                                }
                                if (err == Z_MEM_ERROR)
                                {
-                                       std::stringstream ss;
+                                       std::ostringstream ss;
                                        ss << __FILE__ << ":" << __LINE__ << ": 
" << m_zstream.msg;
                                        throw ParserException(ss.str());
                                        break;
@@ -190,7 +191,7 @@
                                if (err != Z_OK)
                                {
                                        // something's wrong.
-                                       std::stringstream ss;
+                                       std::ostringstream ss;
                                        ss << __FILE__ << ":" << __LINE__ << ": 
" << m_zstream.msg;
                                        throw ParserException(ss.str());
                                        //m_error = 1;

Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- libbase/rc.cpp      30 Apr 2008 07:52:53 -0000      1.73
+++ libbase/rc.cpp      27 May 2008 07:49:46 -0000      1.74
@@ -40,6 +40,7 @@
 #include <vector>
 #include <iostream>
 #include <fstream>
+#include <sstream>
 
 #include <boost/format.hpp>