replace more assertions to get proper log messages

diff --git a/lib/base/smartptr.h b/lib/base/smartptr.h
index 782ff48e913049fb8e00cb528843917275399641..ac6b9eb0767fe8d8854e43043c63bc67e4c368f9 100644 (file)
--- a/lib/base/smartptr.h
+++ b/lib/base/smartptr.h
@@ -56,7 +56,7 @@ public:
        
 #ifndef SWIG
        T* grabRef() { if (!ptr) return 0; ptr->AddRef(); return ptr; }
-       T* &ptrref() { assert(!ptr); return ptr; }
+       T* &ptrref() { ASSERT(!ptr); return ptr; }
 #endif
        T* operator->() const { ptrAssert(ptr); return ptr; }
        operator T*() const { return this->ptr; }
@@ -135,7 +135,7 @@ public:
        
 #ifndef SWIG
        T* grabRef() { if (!ptr) return 0; ptr->AddRef(); ptr->AddUse(); return ptr; }
-       T* &ptrref() { assert(!ptr); return ptr; }
+       T* &ptrref() { ASSERT(!ptr); return ptr; }
 #endif
        T* operator->() const { ptrAssert(ptr); return ptr; }
        operator T*() const { return this->ptr; }

diff --git a/lib/dvb/esection.h b/lib/dvb/esection.h
index 5720d5ded82d37b30544177a0003163354c8c392..2bb17a98e5a70fb9321788bc608be7f254351687 100644 (file)
--- a/lib/dvb/esection.h
+++ b/lib/dvb/esection.h
@@ -189,7 +189,7 @@ public:
                next=0;
                first=0;
                
-               assert(current->ready);
+               ASSERT(current->ready);
                        
                /*emit*/ tableReady(0);
                

diff --git a/lib/gdi/font.h b/lib/gdi/font.h
index 41d51ddc0ec2df9b273cb326f701af01132a47c4..2643fda20215e7099aebbaaeb02a9b5274507d21 100644 (file)
--- a/lib/gdi/font.h
+++ b/lib/gdi/font.h
@@ -160,22 +160,22 @@ public:
 
        const eRect& getGlyphBBox(int num) const
        {
-               assert(num >= 0);
-               assert(num < (int)glyphs.size());
+               ASSERT(num >= 0);
+               ASSERT(num < (int)glyphs.size());
                return glyphs[num].bbox;
        }
        
        void setGlyphFlag(int g, int f)
        {
-               assert(g >= 0);
-               assert(g < (int)glyphs.size());
+               ASSERT(g >= 0);
+               ASSERT(g < (int)glyphs.size());
                glyphs[g].flags |= f;
        }
 
        void clearGlyphFlag(int g, int f)
        {
-               assert(g >= 0);
-               assert(g < (int)glyphs.size());
+               ASSERT(g >= 0);
+               ASSERT(g < (int)glyphs.size());
                glyphs[g].flags |= f;
        }
 };