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

1 files changed, 3 insertions, 3 deletions

diff --git a/src/dxr3/dxr3_spu_encoder.c b/src/dxr3/dxr3_spu_encoder.c
index 7b662efbe..c145f134f 100644
--- a/src/dxr3/dxr3_spu_encoder.c
+++ b/src/dxr3/dxr3_spu_encoder.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: dxr3_spu_encoder.c,v 1.3 2003/12/05 15:54:58 f1rmb Exp $
+ * $Id: dxr3_spu_encoder.c,v 1.4 2003/12/07 15:34:29 f1rmb Exp $
  */
 
 #include <stdio.h>
@@ -382,7 +382,7 @@ static void convert_overlay(spu_encoder_t *this)
   }
   
   /* we should be byte aligned here */
-  XINE_ASSERT(higher_nibble, "bad state during spu encoding");
+  _x_assert(higher_nibble);
   
   /* control sequence starts here */
   this->target[2] = offset >> 8;
@@ -467,7 +467,7 @@ static void write_rle(spu_encoder_t *this, int *offset, int *higher_nibble, int
     write_nibble(this, offset, higher_nibble, (length & 0xc) | color);
     return;
   }
-  XINE_ASSERT(0, "bad state during spu encoding");
+  abort();
 }
 
 static void write_byte(spu_encoder_t *this, int *offset, uint8_t byte)