From: Charles G. <cr...@us...> - 2002-07-31 15:17:32
|
Update of /cvsroot/ravl/Ravl/Image/Processing/Filters In directory usw-pr-cvs1:/tmp/cvs-serv10714 Modified Files: BilinearInterpolation.hh testConvolve.cc Log Message: Attempt to fix bi-linear interpolation for complex types. Index: BilinearInterpolation.hh =================================================================== RCS file: /cvsroot/ravl/Ravl/Image/Processing/Filters/BilinearInterpolation.hh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** BilinearInterpolation.hh 14 Jul 2002 15:06:24 -0000 1.6 --- BilinearInterpolation.hh 31 Jul 2002 15:17:27 -0000 1.7 *************** *** 85,90 **** } ! it.Data() = (OutT)(((1.0-t) * im[y4]) + ! ( t * im[y3]) ); } --- 85,90 ---- } ! it.Data() = (OutT)((im[y4] * (1.0-t)) + ! (im[y3] * t ) ); } *************** *** 106,111 **** break; } ! it.Data() = (OutT)(((1.0-u) * im[y4]) + ! ( u * im[y2])); } --- 106,111 ---- break; } ! it.Data() = (OutT)((im[y4] * (1.0-u)) + ! (im[y2] * u)); } *************** *** 138,146 **** y4.Col() = iMinC; ! it.Data() = (OutT)( ! ((1.0-t) * (1.0-u) * im[y4]) + ! (t*(1.0-u)*im[y3]) + ! ((1.0-t)*u*im[y2]) + ! (t*u*im[y1]) ); } while(it.Next()); // True while in same row. --- 138,145 ---- y4.Col() = iMinC; ! it.Data() = (OutT)((im[y4] * (1.0-t) * (1.0-u)) + ! (im[y3] * t * (1.0-u)) + ! (im[y2] * (1.0-t) * u ) + ! (im[y1] * t * u ) ); } while(it.Next()); // True while in same row. Index: testConvolve.cc =================================================================== RCS file: /cvsroot/ravl/Ravl/Image/Processing/Filters/testConvolve.cc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** testConvolve.cc 14 Jul 2002 15:06:24 -0000 1.7 --- testConvolve.cc 31 Jul 2002 15:17:28 -0000 1.8 *************** *** 16,19 **** --- 16,20 ---- #include "Ravl/Image/HistogramEqualise.hh" #include "Ravl/Image/Matching.hh" + #include "Ravl/Image/ByteRGBValue.hh" using namespace RavlImageN; *************** *** 30,33 **** --- 31,38 ---- int testHistogramEqualise(); int testMatching(); + + #ifndef __sgi__ + template BilinearInterpolationC<ByteRGBValueC,ByteRGBValueC>; + #endif int main() { |