[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. dd2f2fc87bfa8291c18e
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. dd2f2fc87bfa8291c18eaa1774196072d020a489 |
|
Date: |
Wed, 01 Dec 2010 18:03:01 +0000 |
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 dd2f2fc87bfa8291c18eaa1774196072d020a489 (commit)
via 8ccff732e3438feca6c6710a0fe7744471019f47 (commit)
via f3a48bf745e9ed16fc92d816019f382851d5e0c8 (commit)
via 4cf2b1977e54148df4a136beb7f0d0a136adada4 (commit)
via 167c34450616ef5544fcd1839a099ed09ffb8521 (commit)
via c67d26ba852e63f0079261947992596b49ad1a2b (commit)
via de5fa5ff540b991760c4d47c694a30c911847dc4 (commit)
via 83dbc326b189e220f0786d894acfda9bcec9a525 (commit)
via a349bbf0829843e198ada38612a04ee0121b8f6e (commit)
via e0f85cd134b7ec2cf06078da94dad2ec9b92d7fa (commit)
from b60afaef20bae8a183d3f77b373fef0760cf8b1e (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=dd2f2fc87bfa8291c18eaa1774196072d020a489
commit dd2f2fc87bfa8291c18eaa1774196072d020a489
Author: Benjamin Wolsey <address@hidden>
Date: Wed Dec 1 19:03:01 2010 +0100
Include iostream.
diff --git a/utilities/findmicrophones.cpp b/utilities/findmicrophones.cpp
index b686de8..eb5218d 100644
--- a/utilities/findmicrophones.cpp
+++ b/utilities/findmicrophones.cpp
@@ -31,6 +31,7 @@
#include <vector>
#include <string>
+#include <iostream>
namespace {
//get rc file for webcam selection
diff --git a/utilities/findwebcams.cpp b/utilities/findwebcams.cpp
index 96e360c..bb0d58b 100644
--- a/utilities/findwebcams.cpp
+++ b/utilities/findwebcams.cpp
@@ -20,13 +20,14 @@
#include "gnashconfig.h"
#endif
+#include <vector>
+#include <string>
+#include <iostream>
+
#include "rc.h"
#include "gst/gst.h"
#include <gst/interfaces/propertyprobe.h>
-#include <vector>
-#include <string>
-
namespace {
//get rc file for webcam selection
gnash::RcInitFile& rcfile = gnash::RcInitFile::getDefaultInstance();
diff --git a/utilities/rtmpget.cpp b/utilities/rtmpget.cpp
index cc2a49c..559e52a 100644
--- a/utilities/rtmpget.cpp
+++ b/utilities/rtmpget.cpp
@@ -33,6 +33,7 @@
#include <algorithm>
#include <iterator>
#include <fstream>
+#include <iostream>
using namespace gnash;
http://git.savannah.gnu.org/cgit//commit/?id=8ccff732e3438feca6c6710a0fe7744471019f47
commit 8ccff732e3438feca6c6710a0fe7744471019f47
Author: Benjamin Wolsey <address@hidden>
Date: Wed Dec 1 19:02:48 2010 +0100
Don't include thread.hpp arbitrarily.
diff --git a/libcore/movie_root.h b/libcore/movie_root.h
index fabe555..b09211e 100644
--- a/libcore/movie_root.h
+++ b/libcore/movie_root.h
@@ -76,7 +76,6 @@
#include <set>
#include <bitset>
#include <boost/noncopyable.hpp>
-#include <boost/thread/thread.hpp>
#include "smart_ptr.h" // GNASH_USE_GC
#include "dsodefs.h" // DSOEXPORT
http://git.savannah.gnu.org/cgit//commit/?id=f3a48bf745e9ed16fc92d816019f382851d5e0c8
commit f3a48bf745e9ed16fc92d816019f382851d5e0c8
Author: Benjamin Wolsey <address@hidden>
Date: Wed Dec 1 18:15:04 2010 +0100
Don't exit; throw an exception and let callers handle it.
Use Gnash logging instead of iostreams.
diff --git a/libcore/FreetypeGlyphsProvider.cpp
b/libcore/FreetypeGlyphsProvider.cpp
index 55a9dae..77b87da 100644
--- a/libcore/FreetypeGlyphsProvider.cpp
+++ b/libcore/FreetypeGlyphsProvider.cpp
@@ -22,6 +22,12 @@
#endif
#include "FreetypeGlyphsProvider.h"
+
+#include <string>
+#include <memory> // for auto_ptr
+#include <boost/cstdint.hpp>
+#include <boost/format.hpp>
+
#include "smart_ptr.h" // for intrusive_ptr
#include "GnashException.h"
#include "ShapeRecord.h"
@@ -56,11 +62,6 @@
# include <FindDirectory.h>
#endif
-#include <string>
-#include <memory> // for auto_ptr
-#include <boost/cstdint.hpp>
-#include <boost/format.hpp>
-
// Define the following to make outline decomposition verbose
//#define DEBUG_OUTLINE_DECOMPOSITION 1
@@ -249,21 +250,21 @@ FreetypeGlyphsProvider::init()
if (m_lib) return;
- int error = FT_Init_FreeType(&m_lib);
+ const int error = FT_Init_FreeType(&m_lib);
if (error) {
- std::cerr << boost::format(_("Can't init FreeType! Error "
- "= %d")) % error << std::endl;
- exit(EXIT_FAILURE);
+ boost::format err = boost::format(_("Can't init FreeType! Error "
+ "= %d")) % error;
+ throw GnashException(err.str());
}
}
// static private
-void FreetypeGlyphsProvider::close()
+void
+FreetypeGlyphsProvider::close()
{
- int error = FT_Done_FreeType(m_lib);
+ const int error = FT_Done_FreeType(m_lib);
if (error) {
- std::cerr << boost::format(_("Can't close FreeType! Error "
- "= %d")) % error << std::endl;
+ log_error(_("Can't close FreeType! Error %d"), error);
}
}
@@ -375,8 +376,9 @@ FreetypeGlyphsProvider::createFace(const std::string& name,
bool bold, bool ital
std::auto_ptr<FreetypeGlyphsProvider> ret;
try {
- ret.reset( new FreetypeGlyphsProvider(name, bold, italic) );
- } catch (GnashException& ge) {
+ ret.reset(new FreetypeGlyphsProvider(name, bold, italic));
+ }
+ catch (const GnashException& ge) {
log_error(ge.what());
assert(! ret.get());
}
http://git.savannah.gnu.org/cgit//commit/?id=4cf2b1977e54148df4a136beb7f0d0a136adada4
commit 4cf2b1977e54148df4a136beb7f0d0a136adada4
Author: Benjamin Wolsey <address@hidden>
Date: Wed Dec 1 18:09:19 2010 +0100
Include <ostream>, not <iostream> for std::ostream.
diff --git a/libbase/Range2d.h b/libbase/Range2d.h
index 5c5fca3..92b4910 100644
--- a/libbase/Range2d.h
+++ b/libbase/Range2d.h
@@ -29,7 +29,6 @@
#include <limits>
#include <algorithm>
#include <cassert> // for inlines
-#include <iostream> // temporary include for debugging
#include <cmath> // for floor / ceil
namespace gnash {
diff --git a/libbase/URLAccessManager.cpp b/libbase/URLAccessManager.cpp
index 8740f08..da258ef 100644
--- a/libbase/URLAccessManager.cpp
+++ b/libbase/URLAccessManager.cpp
@@ -24,7 +24,6 @@
#include "GnashSystemNetHeaders.h"
#include <cerrno>
-#include <iostream>
#include <algorithm> // for find / find_if
#include <cstring> // for strerror
#include <cstdio>
diff --git a/libbase/sharedlib.cpp b/libbase/sharedlib.cpp
index 1fd7e2d..c2619dd 100644
--- a/libbase/sharedlib.cpp
+++ b/libbase/sharedlib.cpp
@@ -30,7 +30,6 @@
#include <unistd.h>
#include <string>
-#include <iostream>
#include <cstdlib>
#if defined(WIN32) || defined(_WIN32)
diff --git a/libcore/DisplayList.cpp b/libcore/DisplayList.cpp
index ca02e8d..87d036f 100644
--- a/libcore/DisplayList.cpp
+++ b/libcore/DisplayList.cpp
@@ -27,7 +27,7 @@
#include "ObjectURI.h"
#include <typeinfo>
-#include <iostream>
+#include <ostream>
#include <algorithm>
#include <stack>
#include <cassert>
diff --git a/libcore/FillStyle.cpp b/libcore/FillStyle.cpp
index 1b325ef..d160e6b 100644
--- a/libcore/FillStyle.cpp
+++ b/libcore/FillStyle.cpp
@@ -19,7 +19,7 @@
#include "FillStyle.h"
-#include <iostream>
+#include <ostream>
#include <boost/variant.hpp>
#include "smart_ptr.h"
diff --git a/libcore/SWFRect.h b/libcore/SWFRect.h
index 746525f..6354042 100644
--- a/libcore/SWFRect.h
+++ b/libcore/SWFRect.h
@@ -20,14 +20,14 @@
#ifndef GNASH_RECT_H
#define GNASH_RECT_H
-#include "dsodefs.h"
-#include "Range2d.h"
-
#include <string>
-#include <cassert> // for inlines
-#include <iostream> // for output operator
+#include <cassert>
+#include <ostream>
#include <boost/cstdint.hpp>
+#include "dsodefs.h"
+#include "Range2d.h"
+
// Forward decl
namespace gnash {
class SWFMatrix;
diff --git a/libcore/asobj/NetConnection_as.cpp
b/libcore/asobj/NetConnection_as.cpp
index ba6621a..09a5912 100644
--- a/libcore/asobj/NetConnection_as.cpp
+++ b/libcore/asobj/NetConnection_as.cpp
@@ -25,7 +25,6 @@
#include "NetConnection_as.h"
-#include <iostream>
#include <string>
#include <utility>
#include <boost/scoped_ptr.hpp>
diff --git a/libcore/movie_root.cpp b/libcore/movie_root.cpp
index 95a6fb0..0467794 100644
--- a/libcore/movie_root.cpp
+++ b/libcore/movie_root.cpp
@@ -23,7 +23,6 @@
#include <boost/algorithm/string/erase.hpp>
#include <boost/algorithm/string/replace.hpp>
#include <utility>
-#include <iostream>
#include <string>
#include <sstream>
#include <map>
diff --git a/libcore/swf/DefineFontAlignZonesTag.cpp
b/libcore/swf/DefineFontAlignZonesTag.cpp
index 328f1e7..feab96e 100644
--- a/libcore/swf/DefineFontAlignZonesTag.cpp
+++ b/libcore/swf/DefineFontAlignZonesTag.cpp
@@ -17,17 +17,17 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#include "DefineFontAlignZonesTag.h"
+
+#include <boost/cstdint.hpp>
#include "RunResources.h"
#include "Font.h"
#include "log.h"
#include "SWFStream.h"
#include "movie_definition.h"
-#include "DefineFontAlignZonesTag.h"
#include "smart_ptr.h"
-#include <iostream>
-
namespace gnash {
namespace SWF {
diff --git a/libcore/swf/DefineFontAlignZonesTag.h
b/libcore/swf/DefineFontAlignZonesTag.h
index ed7d6a7..5f8d9c2 100644
--- a/libcore/swf/DefineFontAlignZonesTag.h
+++ b/libcore/swf/DefineFontAlignZonesTag.h
@@ -20,6 +20,8 @@
#ifndef GNASH_SWF_DEFINEFONTALIGNZONESTAG_H
#define GNASH_SWF_DEFINEFONTALIGNZONESTAG_H
+#include "SWF.h"
+
// Forward declarations
namespace gnash {
class movie_definition;
@@ -30,7 +32,8 @@ namespace gnash {
namespace gnash {
namespace SWF {
-class DefineFontAlignZonesTag {
+class DefineFontAlignZonesTag
+{
public:
enum {
@@ -56,10 +59,6 @@ private:
};
-
-
-
-
} // namespace gnash::SWF
} // namespace gnash
diff --git a/libcore/swf/SWF.cpp b/libcore/swf/SWF.cpp
index c4b34d4..276159a 100644
--- a/libcore/swf/SWF.cpp
+++ b/libcore/swf/SWF.cpp
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "SWF.h"
-#include <iostream>
+#include <ostream>
namespace gnash {
namespace SWF {
diff --git a/libcore/vm/VM.cpp b/libcore/vm/VM.cpp
index b078550..464691c 100644
--- a/libcore/vm/VM.cpp
+++ b/libcore/vm/VM.cpp
@@ -24,7 +24,7 @@
#include "VM.h"
-#include <iostream>
+#include <ostream>
#include <memory>
#include <boost/random.hpp> // for random generator
#include <cstdlib>
diff --git a/libsound/WAVWriter.cpp b/libsound/WAVWriter.cpp
index 866c80c..b3299f3 100644
--- a/libsound/WAVWriter.cpp
+++ b/libsound/WAVWriter.cpp
@@ -18,14 +18,14 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "WAVWriter.h"
-#include "GnashException.h" // for SoundException
-#include "log.h" // will import boost::format too
#include <cstring> // for strncpy
#include <boost/cstdint.hpp>
#include <fstream> // for composition (file_stream)
-#include <iostream>
+#include <iostream>
+#include "GnashException.h" // for SoundException
+#include "log.h" // will import boost::format too
namespace gnash {
namespace sound {
http://git.savannah.gnu.org/cgit//commit/?id=167c34450616ef5544fcd1839a099ed09ffb8521
commit 167c34450616ef5544fcd1839a099ed09ffb8521
Author: Benjamin Wolsey <address@hidden>
Date: Wed Dec 1 17:59:13 2010 +0100
Use forward declaration of streams.
diff --git a/libbase/rc.h b/libbase/rc.h
index 9414b40..6e49f72 100644
--- a/libbase/rc.h
+++ b/libbase/rc.h
@@ -21,15 +21,15 @@
#define GNASH_RC_H
#include "dsodefs.h"
-#include "StringPredicates.h"
-
#include <string>
#include <vector>
-#include <iostream>
+#include <iosfwd>
#include <sstream>
#include <boost/cstdint.hpp>
#include <boost/tokenizer.hpp>
+#include "StringPredicates.h"
+
#if !defined(_WIN32) && !defined(__HAIKU__) && !defined(ANDROID)
#include <sys/shm.h>
#else
@@ -392,10 +392,6 @@ protected:
std::istringstream in(value);
if (in >> num) return true;
- // If conversion fails, set value to 0 rather than leaving
- // it as the default.
- std::cerr << "Conversion overflow in extractNumber: " <<
- value << std::endl;
num = 0;
return true;
}
http://git.savannah.gnu.org/cgit//commit/?id=c67d26ba852e63f0079261947992596b49ad1a2b
commit c67d26ba852e63f0079261947992596b49ad1a2b
Author: Benjamin Wolsey <address@hidden>
Date: Wed Dec 1 17:59:04 2010 +0100
Reorder includes.
diff --git a/libbase/IOChannel.h b/libbase/IOChannel.h
index 2de054d..8c11369 100644
--- a/libbase/IOChannel.h
+++ b/libbase/IOChannel.h
@@ -21,17 +21,18 @@
#ifndef GNASH_IOCHANNEL_H
#define GNASH_IOCHANNEL_H
-#include "dsodefs.h" // DSOEXPORT
-#include "GnashException.h" // for IOException inheritance
-
#include <string>
#include <boost/cstdint.hpp> // for boost int types
#include <ios>
+#include "dsodefs.h" // DSOEXPORT
+#include "GnashException.h" // for IOException inheritance
+
namespace gnash {
/// Exception signalling an IO error
-class DSOEXPORT IOException : public GnashException {
+class DSOEXPORT IOException : public GnashException
+{
public:
IOException(const std::string& s) : GnashException(s) {}
IOException() : GnashException("IO error") {}
http://git.savannah.gnu.org/cgit//commit/?id=de5fa5ff540b991760c4d47c694a30c911847dc4
commit de5fa5ff540b991760c4d47c694a30c911847dc4
Author: Benjamin Wolsey <address@hidden>
Date: Wed Dec 1 17:58:31 2010 +0100
Rearrange includes.
diff --git a/libbase/rc.cpp b/libbase/rc.cpp
index 68a90f1..31e1de1 100644
--- a/libbase/rc.cpp
+++ b/libbase/rc.cpp
@@ -23,18 +23,9 @@
# include "gnashconfig.h"
#endif
-#include "StringPredicates.h"
-#include "log.h"
#include "rc.h"
-#ifdef HAVE_PWD_H
-# include <pwd.h>
-#endif
-
#include <boost/cstdint.hpp>
-#include <sys/types.h>
-#include <unistd.h> // for getuid()
-#include <sys/stat.h>
#include <limits>
#include <cstdlib> // getenv
#include <string>
@@ -42,14 +33,24 @@
#include <iostream>
#include <fstream>
#include <sstream>
-
#include <boost/format.hpp>
+#include <sys/types.h>
+#include <unistd.h> // for getuid()
+#include <sys/stat.h>
+
+#ifdef HAVE_PWD_H
+# include <pwd.h>
+#endif
+
#ifdef HAIKU_HOST
# include <Path.h>
# include <FindDirectory.h>
#endif
+#include "StringPredicates.h"
+#include "log.h"
+
using std::endl;
using std::cout;
using std::cerr;
http://git.savannah.gnu.org/cgit//commit/?id=83dbc326b189e220f0786d894acfda9bcec9a525
commit 83dbc326b189e220f0786d894acfda9bcec9a525
Author: Benjamin Wolsey <address@hidden>
Date: Wed Dec 1 17:56:35 2010 +0100
Include <iostream>.
diff --git a/libbase/noseek_fd_adapter.cpp b/libbase/noseek_fd_adapter.cpp
index 69248ea..0193060 100644
--- a/libbase/noseek_fd_adapter.cpp
+++ b/libbase/noseek_fd_adapter.cpp
@@ -23,6 +23,7 @@
#include <cstdio>
#include <string>
#include <boost/format.hpp>
+#include <iostream>
#include "IOChannel.h" // for inheritance
#include "GnashSystemIOHeaders.h" // for read
@@ -38,7 +39,6 @@
namespace gnash {
namespace noseek_fd_adapter {
-
/***********************************************************************
*
* NoSeekFile definition
http://git.savannah.gnu.org/cgit//commit/?id=a349bbf0829843e198ada38612a04ee0121b8f6e
commit a349bbf0829843e198ada38612a04ee0121b8f6e
Author: Benjamin Wolsey <address@hidden>
Date: Wed Dec 1 17:56:17 2010 +0100
Include <iostream> for cerr and cout.
diff --git a/libbase/memory.cpp b/libbase/memory.cpp
index a2f80b8..921c9dd 100644
--- a/libbase/memory.cpp
+++ b/libbase/memory.cpp
@@ -27,10 +27,12 @@
// If we don't have support for mallinfo(), this code is useless
#if HAVE_MALLINFO
+#include "gmemory.h"
+
#include <vector>
+#include <iostream>
#include "log.h"
-#include "gmemory.h"
#include "getclocktime.hpp"
using namespace std;
http://git.savannah.gnu.org/cgit//commit/?id=e0f85cd134b7ec2cf06078da94dad2ec9b92d7fa
commit e0f85cd134b7ec2cf06078da94dad2ec9b92d7fa
Author: Benjamin Wolsey <address@hidden>
Date: Wed Dec 1 17:55:57 2010 +0100
Include required headers.
diff --git a/libbase/log.cpp b/libbase/log.cpp
index ef36834..0f89113 100644
--- a/libbase/log.cpp
+++ b/libbase/log.cpp
@@ -18,27 +18,23 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#include <ctime> // std::strftime, std::time etc
-#include <cctype> // for std::isprint
-#include <cstring> // std::memset
+#include "log.h"
+#include <ctime>
+#include <cctype>
+#include <cstring>
+#include <iostream>
#include <map>
#include <sstream>
#include <fstream>
-#include <iomanip> // for std::setfill
+#include <iomanip>
#include <string>
#include <boost/format.hpp>
-#if defined(_WIN32) && defined(WIN32)
-// Required for SYSTEMTIME definitions
-# include <windows.h>
-# include <sys/types.h>
-#endif
-
#include <unistd.h> // for getpid
-#include "log.h"
#include "utility.h"
+#include "GnashAlgorithm.h"
using std::cout;
using std::endl;
@@ -83,16 +79,15 @@ timestamp(std::ostream& o)
const char fmt[] = "%H:%M:%S";
time_t t;
- char buf[sizeof(fmt)];
+ char buf[sizeof fmt];
std::time(&t);
- std::strftime(buf, sizeof(buf), fmt, std::localtime(&t));
+ std::strftime(buf, sizeof buf, fmt, std::localtime(&t));
static std::map<int, int> threadMap;
int tid = get_thread_id();
int& htid = threadMap[tid];
- if ( ! htid )
- {
+ if (!htid) {
htid = threadMap.size();
// TODO: notify actual thread id for index
}
@@ -201,16 +196,15 @@ LogFile::log(const std::string& msg)
if ( !_verbose ) return; // nothing to do if not verbose
- if (openLogIfNeeded())
- {
+ if (openLogIfNeeded()) {
if (_stamp) {
_outstream << timestamp << ": " << msg << "\n";
} else {
_outstream << msg << "\n";
}
}
- else // log to stdout
- {
+ else {
+ // log to stdout
if (_stamp) {
cout << timestamp << " " << msg << endl;
} else {
@@ -218,8 +212,7 @@ LogFile::log(const std::string& msg)
}
}
- if (_listener)
- {
+ if (_listener) {
(*_listener)(msg);
}
}
@@ -268,7 +261,7 @@ LogFile::openLogIfNeeded()
if (_state != CLOSED) return true;
if (!_write) return false;
- if ( _logFilename.empty() ) _logFilename = DEFAULT_LOGFILE;
+ if (_logFilename.empty()) _logFilename = DEFAULT_LOGFILE;
// TODO: expand ~ to getenv("HOME") !!
-----------------------------------------------------------------------
Summary of changes:
libbase/IOChannel.h | 9 ++++---
libbase/Range2d.h | 1 -
libbase/URLAccessManager.cpp | 1 -
libbase/log.cpp | 37 ++++++++++++------------------
libbase/memory.cpp | 4 ++-
libbase/noseek_fd_adapter.cpp | 2 +-
libbase/rc.cpp | 21 +++++++++--------
libbase/rc.h | 10 ++------
libbase/sharedlib.cpp | 1 -
libcore/DisplayList.cpp | 2 +-
libcore/FillStyle.cpp | 2 +-
libcore/FreetypeGlyphsProvider.cpp | 32 ++++++++++++++------------
libcore/SWFRect.h | 10 ++++----
libcore/asobj/NetConnection_as.cpp | 1 -
libcore/movie_root.cpp | 1 -
libcore/movie_root.h | 1 -
libcore/swf/DefineFontAlignZonesTag.cpp | 6 ++--
libcore/swf/DefineFontAlignZonesTag.h | 9 +++----
libcore/swf/SWF.cpp | 2 +-
libcore/vm/VM.cpp | 2 +-
libsound/WAVWriter.cpp | 6 ++--
utilities/findmicrophones.cpp | 1 +
utilities/findwebcams.cpp | 7 +++--
utilities/rtmpget.cpp | 1 +
24 files changed, 80 insertions(+), 89 deletions(-)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. dd2f2fc87bfa8291c18eaa1774196072d020a489,
Benjamin Wolsey <=