CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/10/30 18:55:43
Modified files:
. : ChangeLog
backend : render_handler.h render_handler_agg.cpp
render_handler_agg_style.h
render_handler_d3d.cpp
gui : sdl_agg_glue.cpp
libbase : config.cpp curl_adapter.cpp grid_index.h
image_filters.cpp noseek_fd_adapter.cpp
triangulate_impl.h tu_types.cpp
zlib_adapter.cpp
libgeometry : bsp.cpp kd_tree_dynamic.cpp kd_tree_packed.cpp
libmedia : AudioDecoderSimple.cpp
libmedia/sdl : VideoDecoderFfmpeg.cpp
server : FreetypeGlyphsProvider.cpp Property.cpp
as_object.cpp as_object.h as_value.cpp
button_character_instance.cpp fill_style.cpp
font.cpp fontlib.cpp generic_character.cpp
matrix.cpp movie_root.h render.cpp
sprite_instance.h swf_event.h tesselate.cpp
tools.cpp
server/asobj : LoadVars.cpp NetStreamFfmpeg.cpp
NetStreamGst.cpp
server/parser : action_buffer.cpp action_buffer.h
button_character_def.h movie_def_impl.cpp
movie_def_impl.h sprite_definition.h
Log message:
assert(0) -> abort()
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4748&r2=1.4749
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler.h?cvsroot=gnash&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.112&r2=1.113
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg_style.h?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_d3d.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl_agg_glue.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/config.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/curl_adapter.cpp?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/grid_index.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/image_filters.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/noseek_fd_adapter.cpp?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/triangulate_impl.h?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_types.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/zlib_adapter.cpp?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/bsp.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/kd_tree_dynamic.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/kd_tree_packed.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/AudioDecoderSimple.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/VideoDecoderFfmpeg.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/FreetypeGlyphsProvider.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Property.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.cpp?cvsroot=gnash&r1=1.78&r2=1.79
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.h?cvsroot=gnash&r1=1.81&r2=1.82
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.90&r2=1.91
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.cpp?cvsroot=gnash&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/gnash/server/fill_style.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.cpp?cvsroot=gnash&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/gnash/server/fontlib.cpp?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/server/generic_character.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/matrix.cpp?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&r1=1.83&r2=1.84
http://cvs.savannah.gnu.org/viewcvs/gnash/server/render.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.146&r2=1.147
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf_event.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/tesselate.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/tools.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/LoadVars.cpp?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.93&r2=1.94
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.cpp?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.h?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/button_character_def.h?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.h?cvsroot=gnash&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.h?cvsroot=gnash&r1=1.31&r2=1.32
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4748
retrieving revision 1.4749
diff -u -b -r1.4748 -r1.4749
--- ChangeLog 30 Oct 2007 17:53:53 -0000 1.4748
+++ ChangeLog 30 Oct 2007 18:55:40 -0000 1.4749
@@ -1,5 +1,9 @@
2007-10-30 Sandro Santilli <[EMAIL PROTECTED]>
+ * lots of files: assert(0) -> abort()
+
+2007-10-30 Sandro Santilli <[EMAIL PROTECTED]>
+
* testsuite/actionscript.all/toString_valueOf.as: add a test which
seems to be killing gnash (segfault).
Index: backend/render_handler.h
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- backend/render_handler.h 23 Aug 2007 09:53:02 -0000 1.46
+++ backend/render_handler.h 30 Oct 2007 18:55:40 -0000 1.47
@@ -18,7 +18,7 @@
//
//
-/* $Id: render_handler.h,v 1.46 2007/08/23 09:53:02 udog Exp $ */
+/* $Id: render_handler.h,v 1.47 2007/10/30 18:55:40 strk Exp $ */
#ifndef RENDER_HANDLER_H
#define RENDER_HANDLER_H
@@ -526,7 +526,7 @@
{
log_msg("getPixel() not implemented for this renderer");
- assert(0);
+ abort();
return false; // avoid compiler warning
}
Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- backend/render_handler_agg.cpp 24 Oct 2007 12:55:37 -0000 1.112
+++ backend/render_handler_agg.cpp 30 Oct 2007 18:55:40 -0000 1.113
@@ -17,7 +17,7 @@
-/* $Id: render_handler_agg.cpp,v 1.112 2007/10/24 12:55:37 udog Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.113 2007/10/30 18:55:40 strk Exp $ */
// Original version by Udo Giacomozzi and Hannes Mayr,
// INDUNET GmbH (www.indunet.it)
@@ -397,7 +397,7 @@
{
return new agg_bitmap_info<agg::pixfmt_rgb24_pre> (im->width(),
im->height(),
im->pitch(), im->data(), 24);
- assert(0);
+ abort();
}
@@ -1375,7 +1375,7 @@
const std::vector<line_style> &line_styles,
const matrix& linestyle_matrix) {
- assert(0); // should not be used currently
+ abort(); // should not be used currently
size_t pcount=paths.size();
dest.resize(pcount);
@@ -2237,7 +2237,7 @@
{
log_error("Unknown pixelformat: %s\n", pixelformat);
return NULL;
- //assert(0);
+ //abort();
}
return NULL; // avoid compiler warning
Index: backend/render_handler_agg_style.h
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_agg_style.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- backend/render_handler_agg_style.h 24 Oct 2007 18:28:33 -0000 1.26
+++ backend/render_handler_agg_style.h 30 Oct 2007 18:55:40 -0000 1.27
@@ -75,7 +75,7 @@
void generate_span(agg::rgba8* /*span*/, int /*x*/, int /*y*/, unsigned
/*len*/)
{
- assert(0); // never call generate_span for solid fill styles
+ abort(); // never call generate_span for solid fill styles
}
};
@@ -354,7 +354,7 @@
if (bi->get_bpp()==32)
add_bitmap_repeat_aa_rgba32 (bi, mat, cx);
else
- assert(0);
+ abort();
} else {
@@ -364,7 +364,7 @@
if (bi->get_bpp()==32)
add_bitmap_repeat_nn_rgba32 (bi, mat, cx);
else
- assert(0);
+ abort();
} // if smooth
} else {
@@ -376,7 +376,7 @@
if (bi->get_bpp()==32)
add_bitmap_clip_aa_rgba32 (bi, mat, cx);
else
- assert(0);
+ abort();
} else {
@@ -386,7 +386,7 @@
if (bi->get_bpp()==32)
add_bitmap_clip_nn_rgba32 (bi, mat, cx);
else
- assert(0);
+ abort();
} // if smooth
} // if repeat
@@ -703,7 +703,7 @@
void generate_span(agg::gray8* /*span*/, int /*x*/, int /*y*/, int /*len*/,
unsigned /*style*/)
{
- assert(0); // never call generate_span for solid fill styles
+ abort(); // never call generate_span for solid fill styles
}
private:
Index: backend/render_handler_d3d.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_d3d.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- backend/render_handler_d3d.cpp 6 Dec 2006 10:58:34 -0000 1.10
+++ backend/render_handler_d3d.cpp 30 Oct 2007 18:55:40 -0000 1.11
@@ -215,7 +215,7 @@
if (m_bitmap_info == NULL)
{
- assert(0);
+ abort();
m_pd3dDevice->SetTextureStageState(0, D3DTSS_COLOROP,
D3DTOP_SELECTARG2);
m_pd3dDevice->SetTextureStageState(0, D3DTSS_ALPHAOP,
D3DTOP_SELECTARG2);
}
@@ -504,7 +504,7 @@
// Munges *data (in order to make mipmaps)!!
{
assert(bi);
- assert(0); // not tested
+ abort(); // not tested
//pk bi->set_alpha_image(w, h, data);
}
@@ -614,7 +614,7 @@
if( NULL == m_pd3dDevice )
{
- assert(0);
+ abort();
return;
}
@@ -645,7 +645,7 @@
// End the scene
m_pd3dDevice->EndScene();
- assert(0);
+ abort();
}
@@ -898,7 +898,7 @@
if( FAILED( m_pVB->Lock( 0, 0, (tLock**)&pVertices, D3DLOCK_DISCARD ) ) )
{
- assert(0);
+ abort();
}
pVertices[0].x = a.m_x ;
Index: gui/sdl_agg_glue.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl_agg_glue.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gui/sdl_agg_glue.cpp 15 Oct 2007 12:31:33 -0000 1.14
+++ gui/sdl_agg_glue.cpp 30 Oct 2007 18:55:41 -0000 1.15
@@ -75,7 +75,7 @@
break;
default:
log_error (_("AGG's bit depth must be 16, 24 or 32 bits, not %d."),
_bpp);
- assert(0);
+ abort();
}
return _agg_renderer;
}
@@ -119,7 +119,7 @@
amask = 0;
break;
default:
- assert(0);
+ abort();
}
#define CHUNK_SIZE (100 * 100 * depth_bytes)
Index: libbase/config.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/config.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libbase/config.cpp 26 Feb 2006 15:49:29 -0000 1.2
+++ libbase/config.cpp 30 Oct 2007 18:55:41 -0000 1.3
@@ -147,7 +147,7 @@
if (varname == p) {
// null string for a key.
// warning("something or other");
- assert(0); // TODO: recover somehow.
+ abort(); // TODO: recover somehow.
}
// Reference the name of the table.
Index: libbase/curl_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/curl_adapter.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- libbase/curl_adapter.cpp 8 Oct 2007 12:56:27 -0000 1.43
+++ libbase/curl_adapter.cpp 30 Oct 2007 18:55:41 -0000 1.44
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: curl_adapter.cpp,v 1.43 2007/10/08 12:56:27 bwy Exp $ */
+/* $Id: curl_adapter.cpp,v 1.44 2007/10/30 18:55:41 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -58,7 +58,7 @@
tu_file* make_stream(const char * /*url */)
{
fprintf(stderr, "libcurl is not available, but curl_adapter has
been attempted to use\n");
- return NULL; // should assert(0) instead ?
+ return NULL; // should abort() instead ?
}
}
@@ -761,7 +761,7 @@
static int
write(const void* /*src*/, int /*bytes*/, void* /*appdata*/)
{
- assert(0); // not supported
+ abort(); // not supported
return 0;
}
Index: libbase/grid_index.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/grid_index.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libbase/grid_index.h 26 Aug 2006 18:45:49 -0000 1.6
+++ libbase/grid_index.h 30 Oct 2007 18:55:41 -0000 1.7
@@ -325,7 +325,7 @@
}
// Didn't find entry! Something is wrong.
- assert(0);
+ abort();
}
iterator find(const point_t& location, payload p)
Index: libbase/image_filters.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/image_filters.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- libbase/image_filters.cpp 10 Sep 2007 16:53:29 -0000 1.16
+++ libbase/image_filters.cpp 30 Oct 2007 18:55:41 -0000 1.17
@@ -11,7 +11,7 @@
// converted from K&R C to C-like C++, changed the interfaces a bit,
// etc.
-/* $Id: image_filters.cpp,v 1.16 2007/09/10 16:53:29 strk Exp $ */
+/* $Id: image_filters.cpp,v 1.17 2007/10/30 18:55:41 strk Exp $ */
#include "image.h"
#include "utility.h"
@@ -104,7 +104,7 @@
{
if ((x < 0) || (x >= image->width())) {
- assert(0);
+ abort();
x = iclamp(x, 0, image->width() - 1);
}
@@ -122,7 +122,7 @@
// Copy RGBA data from the specified column into the given buffer.
{
if ((x < 0) || (x >= image->width())) {
- assert(0);
+ abort();
x = iclamp(x, 0, image->width() - 1);
}
@@ -146,7 +146,7 @@
static uint8_t* p = NULL;
if ((x < 0) || (x >= image->width()) || (y < 0) || (y >= image->height()))
{
- assert(0);
+ abort();
return;
}
if ((im != image) || (yy != y)) {
@@ -169,7 +169,7 @@
static uint8_t* p = NULL;
if ((x < 0) || (x >= image->width()) || (y < 0) || (y >= image->height()))
{
- assert(0);
+ abort();
return;
}
if ((im != image) || (yy != y)) {
Index: libbase/noseek_fd_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/noseek_fd_adapter.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- libbase/noseek_fd_adapter.cpp 1 Jul 2007 10:54:09 -0000 1.21
+++ libbase/noseek_fd_adapter.cpp 30 Oct 2007 18:55:41 -0000 1.22
@@ -426,7 +426,7 @@
static int
write(const void* /*src*/, int /*bytes*/, void* /*appdata*/)
{
- assert(0); // not supported
+ abort(); // not supported
return 0;
}
@@ -441,7 +441,7 @@
static int
seek_to_end(void* /*appdata*/)
{
- assert(0); // not supported
+ abort(); // not supported
return 0;
}
Index: libbase/triangulate_impl.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/triangulate_impl.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- libbase/triangulate_impl.h 13 Sep 2007 09:47:31 -0000 1.26
+++ libbase/triangulate_impl.h 30 Oct 2007 18:55:41 -0000 1.27
@@ -24,7 +24,7 @@
// code, see the FIST web page at:
// http://www.cosy.sbg.ac.at/~held/projects/triang/triang.html
-/* $Id: triangulate_impl.h,v 1.26 2007/09/13 09:47:31 strk Exp $ */
+/* $Id: triangulate_impl.h,v 1.27 2007/10/30 18:55:41 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1021,7 +1021,7 @@
if (vertex_left_test(pv0->m_v, pv1->m_v, pv2->m_v) == 0)
{
// Degenerate triangle! Don't emit it.
- assert(0); // This should have already been removed by
remove_degenerate_chain().
+ abort(); // This should have already been removed by
remove_degenerate_chain().
}
else
{
@@ -1066,7 +1066,7 @@
{
// remove_degenerate_chain() should have taken care of
// this before we got here.
- assert(0);
+ abort();
}
// ear status of v0 and v2 could have changed now.
@@ -1877,7 +1877,7 @@
if (path.size() & 1)
{
// Bad input, odd number of coords.
- assert(0);
+ abort();
fprintf(stderr, "path[%d] has odd number of coords ("
SIZET_FMT
"), dropping last value\n", i,
path.size());//xxxx
path_size--;
Index: libbase/tu_types.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_types.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libbase/tu_types.cpp 30 Apr 2007 17:27:39 -0000 1.6
+++ libbase/tu_types.cpp 30 Oct 2007 18:55:41 -0000 1.7
@@ -24,7 +24,7 @@
|| sizeof(int64_t) != 8)
{
// No good.
- assert(0);
+ abort();
return false;
}
Index: libbase/zlib_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/zlib_adapter.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- libbase/zlib_adapter.cpp 2 Sep 2007 01:02:31 -0000 1.18
+++ libbase/zlib_adapter.cpp 30 Oct 2007 18:55:41 -0000 1.19
@@ -25,12 +25,12 @@
{
std::auto_ptr<tu_file> make_inflater(std::auto_ptr<tu_file> /*in*/)
{
- assert(0); // callers should check this themselves
+ abort(); // callers should check this themselves
return std::auto_ptr<tu_file>(NULL);
}
tu_file* make_deflater(tu_file* /*out*/)
{
- assert(0); // callers should check this themselves
+ abort(); // callers should check this themselves
return NULL;
}
}
@@ -237,7 +237,7 @@
// Return number of bytes actually written.
{
// *In*flaters can't write!!!
- assert(0);
+ abort();
return 0;
}
Index: libgeometry/bsp.cpp
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/bsp.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- libgeometry/bsp.cpp 14 Sep 2006 17:29:12 -0000 1.9
+++ libgeometry/bsp.cpp 30 Oct 2007 18:55:41 -0000 1.10
@@ -122,7 +122,7 @@
// faces. Otherwise volume queries will be wrong.
{
if ( m_partitioning_plane != true ) {
- assert(0);
+ abort();
// Trying to add a partitioning plane to a tree that already
// contains faces. Refuse to add the plane.
return;
Index: libgeometry/kd_tree_dynamic.cpp
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/kd_tree_dynamic.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- libgeometry/kd_tree_dynamic.cpp 10 Feb 2007 18:40:20 -0000 1.16
+++ libgeometry/kd_tree_dynamic.cpp 30 Oct 2007 18:55:41 -0000 1.17
@@ -209,7 +209,7 @@
{
// Trouble: couldn't reduce vert count by
// splitting.
- assert(0);
+ abort();
// log error
return;
}
Index: libgeometry/kd_tree_packed.cpp
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/kd_tree_packed.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- libgeometry/kd_tree_packed.cpp 11 Apr 2007 17:54:21 -0000 1.11
+++ libgeometry/kd_tree_packed.cpp 30 Oct 2007 18:55:41 -0000 1.12
@@ -246,7 +246,7 @@
if (sl->m_faces.size() > 255)
{
// problem.
- assert(0);
+ abort();
l.m_face_count = 255;
}
else
@@ -308,7 +308,7 @@
if (pos_child_delta >= (1 << 24))
{
// Problem.
- assert(0);
+ abort();
}
else
{
Index: libmedia/AudioDecoderSimple.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/AudioDecoderSimple.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libmedia/AudioDecoderSimple.cpp 8 Oct 2007 11:00:05 -0000 1.5
+++ libmedia/AudioDecoderSimple.cpp 30 Oct 2007 18:55:41 -0000 1.6
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: AudioDecoderSimple.cpp,v 1.5 2007/10/08 11:00:05 tgc Exp $
+// $Id: AudioDecoderSimple.cpp,v 1.6 2007/10/30 18:55:41 strk Exp $
#include <boost/scoped_array.hpp>
@@ -171,7 +171,7 @@
{
if (n_bits == 0) {
- assert(0);
+ abort();
} else if (n_bits == 2) {
sample_count += doMonoBlock(&out_data,
2, in, sample, stepsize_index);
} else if (n_bits == 3) {
@@ -194,7 +194,7 @@
assert(STEPSIZE_CT >= (1 << 6)); //
ensure we don't need to clamp.
if (n_bits == 0) {
- assert(0);
+ abort();
} else if (n_bits == 2) {
sample_count +=
doStereoBlock(&out_data, 2, in, sample, stepsize_index, right_sample,
right_stepsize_index);
} else if (n_bits == 3) {
Index: libmedia/sdl/VideoDecoderFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/VideoDecoderFfmpeg.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libmedia/sdl/VideoDecoderFfmpeg.cpp 26 Oct 2007 18:43:36 -0000 1.7
+++ libmedia/sdl/VideoDecoderFfmpeg.cpp 30 Oct 2007 18:55:42 -0000 1.8
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: VideoDecoderFfmpeg.cpp,v 1.7 2007/10/26 18:43:36 tgc Exp $
+// $Id: VideoDecoderFfmpeg.cpp,v 1.8 2007/10/30 18:55:42 strk Exp $
#include "VideoDecoderFfmpeg.h"
@@ -251,7 +251,7 @@
return;
} else if (_videoFrameFormat == YUV && _videoCodecCtx->pix_fmt
!= PIX_FMT_YUV420P) {
- assert(0); // TODO
+ abort(); // TODO
//img_convert((AVPicture*) pFrameYUV, PIX_FMT_YUV420P,
(AVPicture*) pFrame, pCodecCtx->pix_fmt, pCodecCtx->width, pCodecCtx->height);
// Don't use depreceted img_convert, use sws_scale
@@ -261,7 +261,7 @@
raw_mediadata_t* video = new raw_mediadata_t;
if (_videoFrameFormat == YUV) {
- assert(0); // See image.cpp to see what yuv size is
+ abort(); // See image.cpp to see what yuv size is
//video->m_data = new
uint8_t[static_cast<image::yuv*>(m_imageframe)->size()];
} else if (_videoFrameFormat == RGB) {
video->m_data = new uint8_t[_videoCodecCtx->width *
_videoCodecCtx->height * 3];
Index: server/FreetypeGlyphsProvider.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/FreetypeGlyphsProvider.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/FreetypeGlyphsProvider.cpp 14 Sep 2007 08:49:56 -0000 1.13
+++ server/FreetypeGlyphsProvider.cpp 30 Oct 2007 18:55:42 -0000 1.14
@@ -386,7 +386,7 @@
#else // ndef(USE_FREETYPE)
FreetypeGlyphsProvider::FreetypeGlyphsProvider(const std::string&, bool, bool)
{
- assert(0); // should never be called
+ abort(); // should never be called
}
#endif // ndef USE_FREETYPE
@@ -457,7 +457,7 @@
boost::intrusive_ptr<shape_character_def>
FreetypeGlyphsProvider::getGlyph(uint16_t, float& advance)
{
- assert(0); // should never be called...
+ abort(); // should never be called...
}
#endif // ndef(USE_FREETYPE)
Index: server/Property.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/Property.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/Property.cpp 29 Oct 2007 21:50:14 -0000 1.2
+++ server/Property.cpp 30 Oct 2007 18:55:42 -0000 1.3
@@ -108,7 +108,7 @@
break;
}
default:
- assert(0); // Not here.
+ abort(); // Not here.
break;
}
};
Index: server/as_object.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- server/as_object.cpp 29 Oct 2007 21:07:33 -0000 1.78
+++ server/as_object.cpp 30 Oct 2007 18:55:42 -0000 1.79
@@ -400,7 +400,7 @@
" on object ``%p'' twice"),
_vm.getStringTable().value(key).c_str(), (void*)this);
// We shouldn't attempt to initialize a member twice, should we
?
- assert(0);
+ abort();
}
// TODO: optimize this, don't scan again !
_members.setFlags(key, flags, nsname);
Index: server/as_object.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.h,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- server/as_object.h 29 Oct 2007 21:07:33 -0000 1.81
+++ server/as_object.h 30 Oct 2007 18:55:42 -0000 1.82
@@ -86,7 +86,7 @@
/// Don't allow implicit copy, must think about behaviour
as_object& operator=(const as_object&)
{
- assert(0);
+ abort();
return *this;
}
Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- server/as_value.cpp 30 Oct 2007 17:46:39 -0000 1.90
+++ server/as_value.cpp 30 Oct 2007 18:55:42 -0000 1.91
@@ -837,7 +837,7 @@
default:
if (is_exception())
return "exception";
- assert(0);
+ abort();
return NULL;
}
}
@@ -886,7 +886,7 @@
return false; // Exceptions equal nothing.
}
- assert(0);
+ abort();
return false;
}
Index: server/button_character_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- server/button_character_instance.cpp 26 Oct 2007 13:03:56 -0000
1.61
+++ server/button_character_instance.cpp 30 Oct 2007 18:55:42 -0000
1.62
@@ -506,7 +506,7 @@
break;
default:
- //assert(0); // missed a case?
+ //abort(); // missed a case?
log_error(_("Unhandled button event %s"),
event.get_function_name().c_str());
break;
};
Index: server/fill_style.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/fill_style.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/fill_style.cpp 10 Sep 2007 16:53:29 -0000 1.13
+++ server/fill_style.cpp 30 Oct 2007 18:55:42 -0000 1.14
@@ -308,7 +308,7 @@
} else {
log_error(_("Unknown fill style %d"), m_type);
- assert(0);
+ abort();
}
}
Index: server/font.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/font.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- server/font.cpp 3 Sep 2007 16:50:09 -0000 1.48
+++ server/font.cpp 30 Oct 2007 18:55:42 -0000 1.49
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: font.cpp,v 1.48 2007/09/03 16:50:09 cmusick Exp $ */
+/* $Id: font.cpp,v 1.49 2007/10/30 18:55:42 strk Exp $ */
// Based on the public domain work of Thatcher Ulrich <[EMAIL PROTECTED]> 2003
@@ -570,7 +570,7 @@
else
{
// Bad glyph index. Due to bad data file?
- assert(0);
+ abort();
return 0;
}
}
Index: server/fontlib.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/fontlib.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- server/fontlib.cpp 10 Sep 2007 16:53:29 -0000 1.34
+++ server/fontlib.cpp 30 Oct 2007 18:55:42 -0000 1.35
@@ -5,7 +5,7 @@
// A module to take care of all of gnash's loaded fonts.
-/* $Id: fontlib.cpp,v 1.34 2007/09/10 16:53:29 strk Exp $ */
+/* $Id: fontlib.cpp,v 1.35 2007/10/30 18:55:42 strk Exp $ */
#include "container.h"
#include "tu_file.h"
@@ -531,7 +531,7 @@
const point* /*coords*/, int /*coord_count*/)
{
// Shape glyphs should not contain lines.
- assert(0);
+ abort();
}
};
@@ -705,7 +705,7 @@
if (found_it == false)
{
// Should not happen -- glyph
should either be in the font, or in s_pending_glyphs.
- assert(0);
+ abort();
return false;
}
}
Index: server/generic_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/generic_character.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/generic_character.cpp 1 Jul 2007 10:54:22 -0000 1.8
+++ server/generic_character.cpp 30 Oct 2007 18:55:42 -0000 1.9
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: generic_character.cpp,v 1.8 2007/07/01 10:54:22 bjacques Exp $ */
+/* $Id: generic_character.cpp,v 1.9 2007/10/30 18:55:42 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -46,7 +46,7 @@
generic_character::enclose_own_bounds(rect *) const
{
log_unimpl("generic_character::enclose_own_bounds");
- assert(0); // TO BE IMPLEMENTED!!!!!
+ abort(); // TO BE IMPLEMENTED!!!!!
}
bool
Index: server/matrix.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/matrix.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/matrix.cpp 27 Aug 2007 12:44:28 -0000 1.18
+++ server/matrix.cpp 30 Oct 2007 18:55:42 -0000 1.19
@@ -19,7 +19,7 @@
//
// Original author: Thatcher Ulrich <[EMAIL PROTECTED]> 2003
//
-// $Id: matrix.cpp,v 1.18 2007/08/27 12:44:28 strk Exp $
+// $Id: matrix.cpp,v 1.19 2007/10/30 18:55:42 strk Exp $
//
#ifdef HAVE_CONFIG_H
@@ -353,7 +353,7 @@
if (det == 0.0f)
{
// Not invertible.
- //assert(0); // castano: this happens sometimes! (ie.
sample6.swf)
+ //abort(); // castano: this happens sometimes! (ie.
sample6.swf)
// Arbitrary fallback.
set_identity();
Index: server/movie_root.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.h,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- server/movie_root.h 22 Oct 2007 19:53:35 -0000 1.83
+++ server/movie_root.h 30 Oct 2007 18:55:42 -0000 1.84
@@ -15,7 +15,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: movie_root.h,v 1.83 2007/10/22 19:53:35 strk Exp $ */
+/* $Id: movie_root.h,v 1.84 2007/10/30 18:55:42 strk Exp $ */
/// \page events_handling Handling of user events
///
@@ -623,10 +623,10 @@
LiveChars _liveChars;
/// Forbid copy
- movie_root(const movie_root& ) { assert(0); }
+ movie_root(const movie_root& ) { abort(); }
/// Forbid assignment
- movie_root& operator=(const movie_root& ) { assert(0); return *this; }
+ movie_root& operator=(const movie_root& ) { abort(); return *this; }
/// Execute expired timers
void executeTimers();
Index: server/render.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/render.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/render.cpp 23 Aug 2007 09:53:03 -0000 1.17
+++ server/render.cpp 30 Oct 2007 18:55:42 -0000 1.18
@@ -61,7 +61,7 @@
{
#ifdef DEBUG_RENDER_CALLS
GNASH_REPORT_FUNCTION;
- //assert(0);
+ //abort();
#endif
if (s_render_handler) return
s_render_handler->create_bitmap_info_rgb(im);
else return new bogus_bi;
@@ -71,7 +71,7 @@
{
#ifdef DEBUG_RENDER_CALLS
GNASH_REPORT_FUNCTION;
- //assert(0);
+ //abort();
#endif
if (s_render_handler) return
s_render_handler->create_bitmap_info_rgba(im);
Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -b -r1.146 -r1.147
--- server/sprite_instance.h 26 Oct 2007 13:03:56 -0000 1.146
+++ server/sprite_instance.h 30 Oct 2007 18:55:42 -0000 1.147
@@ -816,11 +816,11 @@
:
character(NULL, 0)
{
- assert(0);
+ abort();
}
/// Forbid assignment
- sprite_instance& operator=(const sprite_instance&) { assert(0); return
*this; }
+ sprite_instance& operator=(const sprite_instance&) { abort(); return
*this; }
/// \brief
/// Call has_key_event() or has_mouse_event()
Index: server/swf_event.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf_event.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/swf_event.h 1 Jul 2007 10:54:25 -0000 1.7
+++ server/swf_event.h 30 Oct 2007 18:55:43 -0000 1.8
@@ -73,8 +73,8 @@
event_id m_event;
std::auto_ptr<action_buffer> m_action_buffer;
// DON'T USE THESE
- swf_event(const swf_event& /*s*/) { assert(0); }
- void operator=(const swf_event& /*s*/) { assert(0); }
+ swf_event(const swf_event& /*s*/) { abort(); }
+ void operator=(const swf_event& /*s*/) { abort(); }
};
Index: server/tesselate.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/tesselate.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/tesselate.cpp 19 May 2007 22:24:48 -0000 1.13
+++ server/tesselate.cpp 30 Oct 2007 18:55:43 -0000 1.14
@@ -71,7 +71,7 @@
// rationally deals with self-intersection by just overlapping parts
// of the tesselated poly.
-/* $Id: tesselate.cpp,v 1.13 2007/05/19 22:24:48 nihilus Exp $ */
+/* $Id: tesselate.cpp,v 1.14 2007/10/30 18:55:43 strk Exp $ */
#include "tesselate.h"
#include "types.h"
@@ -486,7 +486,7 @@
recursion_count++;
if (recursion_count > 500)
{
- assert(0); // probably a bug!
+ abort(); // probably a bug!
}
#endif // not NDEBUG
Index: server/tools.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/tools.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/tools.cpp 2 May 2007 18:19:02 -0000 1.5
+++ server/tools.cpp 30 Oct 2007 18:55:43 -0000 1.6
@@ -49,7 +49,7 @@
{
if (m_done_copy)
{
- assert(0);
+ abort();
log_error("gnash::tools::copy_helper() already
done copy\n");
return false;
}
Index: server/asobj/LoadVars.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/LoadVars.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- server/asobj/LoadVars.cpp 10 Oct 2007 17:49:45 -0000 1.31
+++ server/asobj/LoadVars.cpp 30 Oct 2007 18:55:43 -0000 1.32
@@ -152,10 +152,10 @@
LoadVars(const LoadVars&)
:
as_object()
- { assert(0); }
+ { abort(); }
/// Forbid assignment
- LoadVars& operator=(const LoadVars&) { assert(0); return *this; }
+ LoadVars& operator=(const LoadVars&) { abort(); return *this; }
/// Return enumerable property pairs in url-encoded form
//
Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- server/asobj/NetStreamFfmpeg.cpp 28 Sep 2007 00:33:30 -0000 1.93
+++ server/asobj/NetStreamFfmpeg.cpp 30 Oct 2007 18:55:43 -0000 1.94
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: NetStreamFfmpeg.cpp,v 1.93 2007/09/28 00:33:30 tgc Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.94 2007/10/30 18:55:43 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -850,7 +850,7 @@
return false;
} else if (m_videoFrameFormat == render::YUV &&
m_VCodecCtx->pix_fmt != PIX_FMT_YUV420P) {
- assert(0); // TODO
+ abort(); // TODO
//img_convert((AVPicture*) pFrameYUV, PIX_FMT_YUV420P,
(AVPicture*) pFrame, pCodecCtx->pix_fmt, pCodecCtx->width, pCodecCtx->height);
// Don't use depreceted img_convert, use sws_scale
Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- server/asobj/NetStreamGst.cpp 10 Sep 2007 14:27:45 -0000 1.60
+++ server/asobj/NetStreamGst.cpp 30 Oct 2007 18:55:43 -0000 1.61
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: NetStreamGst.cpp,v 1.60 2007/09/10 14:27:45 strk Exp $ */
+/* $Id: NetStreamGst.cpp,v 1.61 2007/10/30 18:55:43 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -299,7 +299,7 @@
if (ns->m_imageframe) {
// ns->m_imageframe->update(GST_BUFFER_DATA(buffer));
if (ns->m_videoFrameFormat == render::YUV) {
- assert(0);
+ abort();
/* image::yuv* yuvframe =
static_cast<image::yuv*>(m_imageframe);
int copied = 0;
Index: server/parser/action_buffer.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/action_buffer.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/parser/action_buffer.cpp 10 Oct 2007 07:15:09 -0000 1.26
+++ server/parser/action_buffer.cpp 30 Oct 2007 18:55:43 -0000 1.27
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: action_buffer.cpp,v 1.26 2007/10/10 07:15:09 strk Exp $ */
+/* $Id: action_buffer.cpp,v 1.27 2007/10/30 18:55:43 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -531,7 +531,7 @@
break;
default:
log_error(_("Native floating point format not recognised"));
- assert(0);
+ abort();
}
return u.f;
@@ -607,7 +607,7 @@
break;
default:
log_error(_("Native double floating point format not
recognised"));
- assert(0);
+ abort();
}
return u.d;
Index: server/parser/action_buffer.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/action_buffer.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/parser/action_buffer.h 4 Oct 2007 22:55:53 -0000 1.18
+++ server/parser/action_buffer.h 30 Oct 2007 18:55:43 -0000 1.19
@@ -265,7 +265,7 @@
// internal pointers and cannot be moved or copied.
// If you need to keep an array of them, keep pointers
// to new'd instances.
- action_buffer(const action_buffer& /*a*/) { assert(0); }
+ action_buffer(const action_buffer& /*a*/) { abort(); }
/// the code itself, as read from the SWF
std::vector<uint8_t> m_buffer;
Index: server/parser/button_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/button_character_def.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/parser/button_character_def.h 29 Jun 2007 06:31:46 -0000
1.17
+++ server/parser/button_character_def.h 30 Oct 2007 18:55:43 -0000
1.18
@@ -199,14 +199,14 @@
// is used only shape character definitions. See character_def.h to learn
// why it is virtual anyway.
// get_button_bound() is used for buttons.
- assert(0); // should not be called
+ abort(); // should not be called
static rect unused;
return unused;
}
const rect& get_button_bound(int id) const {
UNUSED(id);
- assert(0); // not implemented
+ abort(); // not implemented
}
protected:
Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- server/parser/movie_def_impl.cpp 7 Oct 2007 21:15:59 -0000 1.85
+++ server/parser/movie_def_impl.cpp 30 Oct 2007 18:55:43 -0000 1.86
@@ -124,7 +124,7 @@
{
#ifndef LOAD_MOVIES_IN_A_SEPARATE_THREAD
// don't start MovieLoader thread !
- assert(0);
+ abort();
#endif
// We have two sanity checks, started() and isSelfThread() which rely
// on boost::thread() returning before they are executed. Therefore,
@@ -820,7 +820,7 @@
log_error(_("Could not advance to frame " SIZET_FMT),
nextframe);
// these kind of errors should be handled by callers
- assert(0);
+ abort();
}
}
#ifdef DEBUG_FRAMES_LOAD
Index: server/parser/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- server/parser/movie_def_impl.h 6 Oct 2007 09:06:28 -0000 1.56
+++ server/parser/movie_def_impl.h 30 Oct 2007 18:55:43 -0000 1.57
@@ -620,7 +620,7 @@
// get_bound() is currently only used by generic_character which normally
// is used only shape character definitions. See character_def.h to learn
// why it is virtual anyway.
- assert(0); // should not be called
+ abort(); // should not be called
static rect unused;
return unused;
}
Index: server/parser/sprite_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- server/parser/sprite_definition.h 25 Sep 2007 14:57:05 -0000 1.31
+++ server/parser/sprite_definition.h 30 Oct 2007 18:55:43 -0000 1.32
@@ -170,7 +170,7 @@
const rect& get_frame_size() const
{
- assert(0);
+ abort();
static const rect unused;
return unused;
}
@@ -376,7 +376,7 @@
// get_bound() is currently only used by generic_character which normally
// is used only shape character definitions. See character_def.h to learn
// why it is virtual anyway.
- assert(0); // should not be called
+ abort(); // should not be called
static rect unused;
return unused;
}
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
