Mercurial > mplayer.hg
changeset 4806:a14eff26f66a
use assert.h
more assertions
| author | michael |
|---|---|
| date | Fri, 22 Feb 2002 15:24:19 +0000 |
| parents | 79b753e2e84a |
| children | 156482788caf |
| files | postproc/swscale.c |
| diffstat | 1 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/postproc/swscale.c Fri Feb 22 15:22:27 2002 +0000 +++ b/postproc/swscale.c Fri Feb 22 15:24:19 2002 +0000 @@ -52,6 +52,7 @@ #include <stdio.h> #include "../config.h" #include "../mangle.h" +#include <assert.h> #ifdef HAVE_MALLOC_H #include <malloc.h> #endif @@ -76,7 +77,7 @@ #define RET 0xC3 //near return opcode for X86 #ifdef MP_DEBUG -#define ASSERT(x) if(!(x)) { printf("ASSERT " #x " failed\n"); *((int*)0)=0; } +#define ASSERT(x) assert(x); #else #define ASSERT(x) ; #endif @@ -806,6 +807,8 @@ else // downscale { int xDstInSrc; + ASSERT(dstW <= srcW) + if(flags&SWS_BICUBIC) filterSize= (int)ceil(1 + 4.0*srcW / (double)dstW); else if(flags&SWS_X) filterSize= (int)ceil(1 + 4.0*srcW / (double)dstW); else if(flags&SWS_AREA) filterSize= (int)ceil(1 + 1.0*srcW / (double)dstW); @@ -858,9 +861,11 @@ /* apply src & dst Filter to filter -> filter2 free(filter); */ + ASSERT(filterSize>0) filter2Size= filterSize; if(srcFilter) filter2Size+= srcFilter->length - 1; if(dstFilter) filter2Size+= dstFilter->length - 1; + ASSERT(filter2Size>0) filter2= (double*)memalign(8, filter2Size*dstW*sizeof(double)); for(i=0; i<dstW; i++) @@ -929,7 +934,9 @@ if(min>minFilterSize) minFilterSize= min; } + ASSERT(minFilterSize > 0) filterSize= (minFilterSize +(filterAlign-1)) & (~(filterAlign-1)); + ASSERT(filterSize > 0) filter= (double*)memalign(8, filterSize*dstW*sizeof(double)); *outFilterSize= filterSize; @@ -948,7 +955,6 @@ } free(filter2); filter2=NULL; - ASSERT(filterSize > 0) //FIXME try to align filterpos if possible