diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2003-12-07 15:34:29 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2003-12-07 15:34:29 +0000 |
| commit | c8fdff20285b59cd892297317572fbb4c3633f78 (patch) | |
| tree | 102be6141b635eb2bff16358ca13b79924b211f4 /src/xine-engine/vo_scale.c | |
| parent | a2dcf860b2777e530646abd00202c3fb5b3a5a81 (diff) | |
| download | xine-lib-c8fdff20285b59cd892297317572fbb4c3633f78.tar.gz xine-lib-c8fdff20285b59cd892297317572fbb4c3633f78.tar.bz2 | |
get rid of XINE_{ASSERT,ABORT} and useless xine_print_trace (useless). Replace XINE_ASSERT by _x_assert, which works exaclty as assert, except that it still warns with NDEBUG defined (but don't abort). Fix missuning of assert(0), which isn't safe, abort is abort, assert is for debugging purpose only, so all assert(0) has been converted to abort() alls. In osd_preload_fonts(): alloc needed memory chunk. Define NDEBUG in CFLAGS, for non DEBUG build only.
CVS patchset: 5860
CVS date: 2003/12/07 15:34:29
Diffstat (limited to 'src/xine-engine/vo_scale.c')
| -rw-r--r-- | src/xine-engine/vo_scale.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xine-engine/vo_scale.c b/src/xine-engine/vo_scale.c index 170e3158a..870811c34 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.27 2003/11/26 19:43:38 f1rmb Exp $ + * $Id: vo_scale.c,v 1.28 2003/12/07 15:34:31 f1rmb Exp $ * * Contains common code to calculate video scaling parameters. * In short, it will map frame dimensions to screen/window size. @@ -79,7 +79,7 @@ void _x_vo_scale_compute_ideal_size (vo_scale_t *this) { this->video_pixel_aspect = desired_ratio / image_ratio; - XINE_ASSERT(this->gui_pixel_aspect != 0.0, "GUI pixel aspect is not 0.0: %f",this->gui_pixel_aspect); + _x_assert(this->gui_pixel_aspect != 0.0); if (fabs (this->video_pixel_aspect / this->gui_pixel_aspect - 1.0) < 0.01) { |