Changeset 36282

Timestamp:

Nov 11, 2013, 11:21:30 AM (13 years ago)

Author:

eugene

Message:

pass Nsigma as an argument to 2d cached image convolve

Location:

branches/eam_branches/ipp-20130904/psLib

Files:

• src/imageops/psImageConvolve.h (modified) (1 diff)
• src/imageops/psImageConvolve2dCache.c (modified) (2 diffs)
• test/imageops/tap_psImageConvolve2dCache.c (modified) (1 diff)

branches/eam_branches/ipp-20130904/psLib/src/imageops/psImageConvolve.h

@@ -326 +326 @@
 bool psImageConvolveGetThreads(void);
 
-psImageSmooth2dCacheData *psImageSmooth2dCacheAlloc (void);
+psImageSmooth2dCacheData *psImageSmooth2dCacheAlloc (float Nsigma);
 bool psImageSmooth2dCacheKernel_PS1_V1 (psImageSmooth2dCacheData *smdata, float sigma, float kappa);
 bool psImageSmooth2dCache_F32(psImage *image, psImageSmooth2dCacheData *smdata);

branches/eam_branches/ipp-20130904/psLib/src/imageops/psImageConvolve2dCache.c

@@ -83 +83 @@
 
 // allocate the psImageSmooth2dCache data structure, but do not define the kernel
-psImageSmooth2dCacheData *psImageSmooth2dCacheAlloc (void) {
+psImageSmooth2dCacheData *psImageSmooth2dCacheAlloc (float Nsigma) {
 
     psImageSmooth2dCacheData *smdata = psAlloc(sizeof(psImageSmooth2dCacheData));
@@ -89 +89 @@
 
     smdata->radflux = NULL;
-    smdata->Nsigma = 3;
+    smdata->Nsigma = Nsigma;
     smdata->Ns = -1;
 

branches/eam_branches/ipp-20130904/psLib/test/imageops/tap_psImageConvolve2dCache.c

@@ -60 +60 @@
     input->data.F32[Yo][Xo] = 1.0;
 
-    psImageSmooth2dCacheData *smdata = psImageSmooth2dCacheAlloc ();
+    psImageSmooth2dCacheData *smdata = psImageSmooth2dCacheAlloc (3.0);
     ok(smdata, "init smdata");
     ok(!smdata->radflux, "init radflux to NULL");