>From 1c51b02ed418064ff21dfe15b9f389bbeb89b848 Mon Sep 17 00:00:00 2001
From: Keiji Costantini <lists@strites.net>
Date: Fri, 4 Jul 2008 12:10:47 +0900
Subject: [PATCH] ASSERT -> assert

---
 swscale.c          |   24 +++++++++---------------
 swscale_template.c |   36 ++++++++++++++++++------------------
 2 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/swscale.c b/swscale.c
index d151c72..af01960 100644
--- a/swscale.c
+++ b/swscale.c
@@ -87,12 +87,6 @@ untested special converters
 
 #define RET 0xC3 //near return opcode for X86
 
-#ifdef MP_DEBUG
-#define ASSERT(x) assert(x);
-#else
-#define ASSERT(x) ;
-#endif
-
 #ifdef M_PI
 #define PI M_PI
 #else
@@ -977,7 +971,7 @@ static inline int initFilter(int16_t **outFilter, int16_t **filterPos, int *outF
         else if (flags&SWS_BILINEAR)     sizeFactor=  2.0;
         else {
             sizeFactor= 0.0; //GCC warning killer
-            ASSERT(0)
+            assert(0)
         }
 
         if (xInc1 <= 1.0)       filterSizeInSrc= sizeFactor; // upscale
@@ -1062,7 +1056,7 @@ static inline int initFilter(int16_t **outFilter, int16_t **filterPos, int *outF
                 }
                 else {
                     coeff= 0.0; //GCC warning killer
-                    ASSERT(0)
+                    assert(0)
                 }
 
                 filter[i*filterSize + j]= coeff;
@@ -1075,11 +1069,11 @@ static inline int initFilter(int16_t **outFilter, int16_t **filterPos, int *outF
     /* apply src & dst Filter to filter -> filter2
        av_free(filter);
     */
-    ASSERT(filterSize>0)
+    assert(filterSize>0)
     filter2Size= filterSize;
     if (srcFilter) filter2Size+= srcFilter->length - 1;
     if (dstFilter) filter2Size+= dstFilter->length - 1;
-    ASSERT(filter2Size>0)
+    assert(filter2Size>0)
     filter2= av_malloc(filter2Size*dstW*sizeof(double));
 
     for (i=0; i<dstW; i++)
@@ -1094,7 +1088,7 @@ static inline int initFilter(int16_t **outFilter, int16_t **filterPos, int *outF
         if (srcFilter) outVec= sws_getConvVec(srcFilter, &scaleFilter);
         else           outVec= &scaleFilter;
 
-        ASSERT(outVec->length == filter2Size)
+        assert(outVec->length == filter2Size)
         //FIXME dstFilter
 
         for (j=0; j<outVec->length; j++)
@@ -1169,9 +1163,9 @@ static inline int initFilter(int16_t **outFilter, int16_t **filterPos, int *outF
             filterAlign= 1;
     }
 
-    ASSERT(minFilterSize > 0)
+    assert(minFilterSize > 0)
     filterSize= (minFilterSize +(filterAlign-1)) & (~(filterAlign-1));
-    ASSERT(filterSize > 0)
+    assert(filterSize > 0)
     filter= av_malloc(filterSize*dstW*sizeof(double));
     if (filterSize >= MAX_FILTER_SIZE)
         return -1;
@@ -1663,7 +1657,7 @@ static int simpleCopy(SwsContext *c, uint8_t* src[], int srcStride[], int srcSli
         /* universal length finder */
         while(length+c->srcW <= FFABS(dstStride[0])
            && length+c->srcW <= FFABS(srcStride[0])) length+= c->srcW;
-        ASSERT(length!=0);
+        assert(length!=0);
 
         for (i=0; i<srcSliceH; i++)
         {
@@ -2306,7 +2300,7 @@ SwsContext *sws_getContext(int srcW, int srcH, int srcFormat, int dstW, int dstH
 
     assert(2*VOFW == VOF);
 
-    ASSERT(c->chrDstH <= dstH)
+    assert(c->chrDstH <= dstH)
 
     if (flags&SWS_PRINT_INFO)
     {
diff --git a/swscale_template.c b/swscale_template.c
index f76c594..f69a1ff 100644
--- a/swscale_template.c
+++ b/swscale_template.c
@@ -3038,8 +3038,8 @@ static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int s
         if (firstLumSrcY > lastInLumBuf) lastInLumBuf= firstLumSrcY-1;
         if (firstChrSrcY > lastInChrBuf) lastInChrBuf= firstChrSrcY-1;
         //printf("%d %d %d\n", firstChrSrcY, lastInChrBuf, vChrBufSize);
-        ASSERT(firstLumSrcY >= lastInLumBuf - vLumBufSize + 1)
-        ASSERT(firstChrSrcY >= lastInChrBuf - vChrBufSize + 1)
+        assert(firstLumSrcY >= lastInLumBuf - vLumBufSize + 1)
+        assert(firstChrSrcY >= lastInChrBuf - vChrBufSize + 1)
 
         // Do we have enough lines in this slice to output the dstY line
         if (lastLumSrcY < srcSliceY + srcSliceH && lastChrSrcY < -((-srcSliceY - srcSliceH)>>c->chrSrcVSubSample))
@@ -3050,9 +3050,9 @@ static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int s
                 uint8_t *s= src[0]+(lastInLumBuf + 1 - srcSliceY)*srcStride[0];
                 lumBufIndex++;
                 //printf("%d %d %d %d\n", lumBufIndex, vLumBufSize, lastInLumBuf,  lastLumSrcY);
-                ASSERT(lumBufIndex < 2*vLumBufSize)
-                ASSERT(lastInLumBuf + 1 - srcSliceY < srcSliceH)
-                ASSERT(lastInLumBuf + 1 - srcSliceY >= 0)
+                assert(lumBufIndex < 2*vLumBufSize)
+                assert(lastInLumBuf + 1 - srcSliceY < srcSliceH)
+                assert(lastInLumBuf + 1 - srcSliceY >= 0)
                 //printf("%d %d\n", lumBufIndex, vLumBufSize);
                 RENAME(hyscale)(lumPixBuf[ lumBufIndex ], dstW, s, srcW, lumXInc,
                                 flags, canMMX2BeUsed, hLumFilter, hLumFilterPos, hLumFilterSize,
@@ -3065,9 +3065,9 @@ static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int s
                 uint8_t *src1= src[1]+(lastInChrBuf + 1 - chrSrcSliceY)*srcStride[1];
                 uint8_t *src2= src[2]+(lastInChrBuf + 1 - chrSrcSliceY)*srcStride[2];
                 chrBufIndex++;
-                ASSERT(chrBufIndex < 2*vChrBufSize)
-                ASSERT(lastInChrBuf + 1 - chrSrcSliceY < (chrSrcSliceH))
-                ASSERT(lastInChrBuf + 1 - chrSrcSliceY >= 0)
+                assert(chrBufIndex < 2*vChrBufSize)
+                assert(lastInChrBuf + 1 - chrSrcSliceY < (chrSrcSliceH))
+                assert(lastInChrBuf + 1 - chrSrcSliceY >= 0)
                 //FIXME replace parameters through context struct (some at least)
 
                 if (!(isGray(srcFormat) || isGray(dstFormat)))
@@ -3093,9 +3093,9 @@ static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int s
             {
                 uint8_t *s= src[0]+(lastInLumBuf + 1 - srcSliceY)*srcStride[0];
                 lumBufIndex++;
-                ASSERT(lumBufIndex < 2*vLumBufSize)
-                ASSERT(lastInLumBuf + 1 - srcSliceY < srcSliceH)
-                ASSERT(lastInLumBuf + 1 - srcSliceY >= 0)
+                assert(lumBufIndex < 2*vLumBufSize)
+                assert(lastInLumBuf + 1 - srcSliceY < srcSliceH)
+                assert(lastInLumBuf + 1 - srcSliceY >= 0)
                 RENAME(hyscale)(lumPixBuf[ lumBufIndex ], dstW, s, srcW, lumXInc,
                                 flags, canMMX2BeUsed, hLumFilter, hLumFilterPos, hLumFilterSize,
                                 funnyYCode, c->srcFormat, formatConvBuffer,
@@ -3107,9 +3107,9 @@ static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int s
                 uint8_t *src1= src[1]+(lastInChrBuf + 1 - chrSrcSliceY)*srcStride[1];
                 uint8_t *src2= src[2]+(lastInChrBuf + 1 - chrSrcSliceY)*srcStride[2];
                 chrBufIndex++;
-                ASSERT(chrBufIndex < 2*vChrBufSize)
-                ASSERT(lastInChrBuf + 1 - chrSrcSliceY < chrSrcSliceH)
-                ASSERT(lastInChrBuf + 1 - chrSrcSliceY >= 0)
+                assert(chrBufIndex < 2*vChrBufSize)
+                assert(lastInChrBuf + 1 - chrSrcSliceY < chrSrcSliceH)
+                assert(lastInChrBuf + 1 - chrSrcSliceY >= 0)
 
                 if (!(isGray(srcFormat) || isGray(dstFormat)))
                     RENAME(hcscale)(chrPixBuf[ chrBufIndex ], chrDstW, src1, src2, chrSrcW, chrXInc,
@@ -3198,8 +3198,8 @@ static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int s
             }
             else
             {
-                ASSERT(lumSrcPtr + vLumFilterSize - 1 < lumPixBuf + vLumBufSize*2);
-                ASSERT(chrSrcPtr + vChrFilterSize - 1 < chrPixBuf + vChrBufSize*2);
+                assert(lumSrcPtr + vLumFilterSize - 1 < lumPixBuf + vLumBufSize*2);
+                assert(chrSrcPtr + vChrFilterSize - 1 < chrPixBuf + vChrBufSize*2);
                 if (vLumFilterSize == 1 && vChrFilterSize == 2) //Unscaled RGB
                 {
                     int chrAlpha= vChrFilter[2*dstY+1];
@@ -3249,8 +3249,8 @@ static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int s
             }
             else
             {
-                ASSERT(lumSrcPtr + vLumFilterSize - 1 < lumPixBuf + vLumBufSize*2);
-                ASSERT(chrSrcPtr + vChrFilterSize - 1 < chrPixBuf + vChrBufSize*2);
+                assert(lumSrcPtr + vLumFilterSize - 1 < lumPixBuf + vLumBufSize*2);
+                assert(chrSrcPtr + vChrFilterSize - 1 < chrPixBuf + vChrBufSize*2);
                 yuv2packedXinC(c,
                     vLumFilter+dstY*vLumFilterSize, lumSrcPtr, vLumFilterSize,
                     vChrFilter+dstY*vChrFilterSize, chrSrcPtr, vChrFilterSize,
-- 
1.5.4.5