]>
Commit | Line | Data |
---|---|---|
f3e23709 JR |
1 | --- FRAMEWAVE_1.3.1_SRC/Framewave/domain/fwImage/src/formatConversion.cpp~ 2009-07-09 11:15:34.000000000 +0200 |
2 | +++ FRAMEWAVE_1.3.1_SRC/Framewave/domain/fwImage/src/formatConversion.cpp 2021-08-17 20:02:38.764534982 +0200 | |
3 | @@ -11,22 +11,23 @@ | |
4 | ||
5 | using namespace OPT_LEVEL; | |
6 | ||
7 | -#define CMC_CHECK_PARAMS if( pDst ==0 || pSrc ==0 ) return fwStsNullPtrErr; \ | |
8 | - if( dstStep<=0 || srcStep<=0 ) return fwStsStepErr; \ | |
9 | - if( roiSize.height<=0 || roiSize.width <=0 ) return fwStsSizeErr; | |
10 | ||
11 | FwStatus PREFIX_OPT( OPT_PREFIX, fwiYCbCr422_8u_C2P3R )( const Fw8u* pSrc, int srcStep, | |
12 | Fw8u* pDst[3], int dstStep[3], | |
13 | FwiSize roiSize ) | |
14 | { | |
15 | - CMC_CHECK_PARAMS; | |
16 | + if( pDst ==0 || pSrc ==0 ) return fwStsNullPtrErr; | |
17 | + if( srcStep<=0 ) return fwStsStepErr; | |
18 | + if( roiSize.height<=0 || roiSize.width <=0 ) return fwStsSizeErr; | |
19 | return CMC::ModelCP <CMC::CH_FC_C2P3 >::ConvertREF( pSrc, srcStep, pDst, dstStep, roiSize ); | |
20 | } | |
21 | ||
22 | FwStatus PREFIX_OPT( OPT_PREFIX, fwiYCbCr422_8u_P3C2R )( const Fw8u* const pSrc[3], int srcStep[3], | |
23 | Fw8u* pDst, int dstStep, FwiSize roiSize ) | |
24 | { | |
25 | - CMC_CHECK_PARAMS; | |
26 | + if( pDst ==0 || pSrc ==0 ) return fwStsNullPtrErr; | |
27 | + if( dstStep<=0 ) return fwStsStepErr; | |
28 | + if( roiSize.height<=0 || roiSize.width <=0 ) return fwStsSizeErr; | |
29 | return CMC::ModelPC< CMC::CH_FC_P3C2 >::ConvertREF( pSrc, srcStep, pDst, dstStep, roiSize ); | |
30 | } | |
31 |