From 49327f43ca2196122a60314e67eeee929efea873 Mon Sep 17 00:00:00 2001 From: Stephen Torri Date: Fri, 28 Feb 2003 02:51:47 +0000 Subject: Xine assert() replacement: All assert() function calls, with exceptions of libdvdread and libdvdnav, have been replaced with XINE_ASSERT. Functionally XINE_ASSERT behaves just likes its predecesor but its adding the ability to print out a stack trace at the point where the assertion fails. So here are a few examples. assert (0); This use of assert was found in a couple locations most favorably being the default case of a switch statement. This was the only thing there. So if the switch statement was unable to find a match it would have defaulted to this and the user and the developers would be stuck wonder who died and where. So it has been replaced with XINE_ASSERT(0, "We have reach this point and don't have a default case"); It may seem a bit none descriptive but there is more going on behind the scene. In addition to checking a condition is true/false, in this case '0', the XINE_ASSERT prints out: :: - assertion '' failed. An example of this might be: input_dvd.c:open_plugin:1178 - assertion '0' failed. xine_malloc failed!!! You have run out of memory XINE_ASSERT and its helper function, print_trace, are found in src/xine-utils/xineutils.h CVS patchset: 4301 CVS date: 2003/02/28 02:51:47 --- src/xine-engine/vo_scale.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/xine-engine/vo_scale.c') diff --git a/src/xine-engine/vo_scale.c b/src/xine-engine/vo_scale.c index a785c9f5d..ed024a1dc 100644 --- a/src/xine-engine/vo_scale.c +++ b/src/xine-engine/vo_scale.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: vo_scale.c,v 1.18 2002/11/25 16:56:06 mroi Exp $ + * $Id: vo_scale.c,v 1.19 2003/02/28 02:51:51 storri Exp $ * * Contains common code to calculate video scaling parameters. * In short, it will map frame dimensions to screen/window size. @@ -101,7 +101,8 @@ void vo_scale_compute_ideal_size (vo_scale_t *this) { this->video_pixel_aspect = desired_ratio / image_ratio; - assert (this->gui_pixel_aspect != 0.0); + XINE_ASSERT(this->gui_pixel_aspect != 0.0, "GUI pixel aspect is not 0.0: %f",this->gui_pixel_aspect); + if (fabs (this->video_pixel_aspect / this->gui_pixel_aspect - 1.0) < 0.01) { this->video_pixel_aspect = this->gui_pixel_aspect; -- cgit v1.2.3