(file) Return to finterpolate.c CVS log (file) (dir) Up to [Development] / JSOC / proj / libs / interpolate

Diff for /JSOC/proj/libs/interpolate/finterpolate.c between version 1.1 and 1.2

version 1.1, 2010/03/09 19:55:14 version 1.2, 2010/03/17 02:24:34
Line 319  int nyin,
Line 319  int nyin,
 int nleadin, int nleadin,
 int nx, int nx,
 int ny, int ny,
 int nlead    int nlead,
     float fillval
 ) )
  
 { {
Line 359  private(ixins,iyins,fxins,fyins,ixin1s,i
Line 360  private(ixins,iyins,fxins,fyins,ixin1s,i
 private (i,j,xinp,yinp,ixin,iyin,ixin1,iyin1,fxin1,fyin1,fxin2,fyin2,imp) \ private (i,j,xinp,yinp,ixin,iyin,ixin1,iyin1,fxin1,fyin1,fxin2,fyin2,imp) \
 private (xk1,xk2,yk1,yk2,sum,sum1,i1,j1,x,y,help) \ private (xk1,xk2,yk1,yk2,sum,sum1,i1,j1,x,y,help) \
 shared (pars,nlead,nx,ny,xin,yin,nleadin,nxin,nyin,image_in,image_out,order) \ shared (pars,nlead,nx,ny,xin,yin,nleadin,nxin,nyin,image_in,image_out,order) \
 shared (malign,order2,kersx,ixmax,iymax,xmax,ymax,shift0,edgemode,extrapolate)  shared (malign,order2,kersx,ixmax,iymax,xmax,ymax,shift0,edgemode,extrapolate,fillval)
 { // Needed to define parallel region { // Needed to define parallel region
     ixins=(float *)(MKL_malloc(nx*sizeof(int),malign));     ixins=(float *)(MKL_malloc(nx*sizeof(int),malign));
     iyins=(float *)(MKL_malloc(nx*sizeof(int),malign));     iyins=(float *)(MKL_malloc(nx*sizeof(int),malign));
Line 732  shared(malign,xmin,xmax,ymin,ymax)
Line 733  shared(malign,xmin,xmax,ymin,ymax)
             image_out[i+nlead*j]=fillval;             image_out[i+nlead*j]=fillval;
           }           }
         }         }
 // Ought to do something here.  
       } // i=       } // i=
     } //j=     } //j=
  
Line 762  float fillval
Line 762  float fillval
  
   switch (pars->method) {   switch (pars->method) {
   case fint_wiener:   case fint_wiener:
     status=winterpolate(pars,image_in,xin,yin,image_out,nxin,nyin,nleadin,nx,ny,nlead);      status=winterpolate(pars,image_in,xin,yin,image_out,nxin,nyin,nleadin,nx,ny,nlead,fillval);
     break;     break;
  
   case fint_linear:   case fint_linear:


Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2

Karen Tian
Powered by
ViewCVS 0.9.4