IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Sep 11, 2005, 12:25:39 PM (21 years ago)
Author:
gusciora
Message:

....

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/src/pmImageSubtract.c

    r4579 r4992  
    77 *  @author GLG, MHPCC
    88 *
    9  *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-07-19 01:44:48 $
     9 *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-09-11 22:25:39 $
    1111 *
    1212 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    124124    tmp->subIndex = 0;
    125125    tmp->preCalc = NULL;
    126     tmp->p_size = size;
    127     tmp->p_spatialOrder = spatialOrder;
     126    tmp->size = size;
     127    tmp->spatialOrder = spatialOrder;
    128128
    129129    //
    … …  
    220220    tmp->yOrder = psVectorAlloc(nBF, PS_TYPE_F32);
    221221    tmp->subIndex = 0;
    222     tmp->p_size = size;
    223     tmp->p_spatialOrder = spatialOrder;
     222    tmp->size = size;
     223    tmp->spatialOrder = spatialOrder;
    224224    tmp->preCalc = psArrayAlloc(nBF);
    225225
    … …  
    499499    psTrace("ImageSubtract.IsisKernelConvolve", 4,
    500500            "Calling IsisKernelConvolve(%d, %d, %d)\n", kernelID, col, row);
    501     psS32 spatialOrder = kernels->p_spatialOrder;
    502     psS32 kernelSize = kernels->p_size;
     501    psS32 spatialOrder = kernels->spatialOrder;
     502    psS32 kernelSize = kernels->size;
    503503    psS32 xOrder = (psS32) kernels->xOrder->data.F32[kernelID];
    504504    psS32 yOrder = (psS32) kernels->yOrder->data.F32[kernelID];
    … …  
    557557    psF32 numRowsHalf = 0.5 * (psF32) input->numRows;
    558558    psF32 background = solution->data.F64[solution->n-1];
    559     psS32 spatialOrder = kernels->p_spatialOrder;
     559    psS32 spatialOrder = kernels->spatialOrder;
    560560    psF32 conv = background; // Initial convolved value
    561561
    … …  
    671671    psS32 numCols = input->numCols;
    672672    psS32 numRows = input->numRows;
    673     psS32 kernelSize = kernels->p_size;
     673    psS32 kernelSize = kernels->size;
    674674
    675675    psImage *convolved = psImageAlloc(numCols, numRows, PS_TYPE_F32);
    … …  
    746746        PS_ASSERT_VECTORS_SIZE_EQUAL(kernels->u, kernels->preCalc, false);
    747747    }
    748     psS32 kernelSize = kernels->p_size;
     748    psS32 kernelSize = kernels->size;
    749749    PS_ASSERT_INT_NONNEGATIVE(footprint, false);
    750750    //
    … …  
    777777    psS32 numHalfRows = reference->numRows;
    778778    psS32 numHalfCols = reference->numCols;
    779     psS32 spatialOrder = kernels->p_spatialOrder;
     779    psS32 spatialOrder = kernels->spatialOrder;
    780780
    781781    //
    … …  
    11631163    PS_ASSERT_VECTOR_SIZE(solution, nBF+1, NULL);
    11641164
    1165     psS32 kernelSize = kernels->p_size;
     1165    psS32 kernelSize = kernels->size;
    11661166    int xSize = footprint + kernelSize;
    11671167    int ySize = footprint + kernelSize;
    … …  
    13321332
    13331333    psS32 nBF = kernels->u->n;
    1334     psS32 spatialOrder = kernels->p_spatialOrder;
    1335     psS32 kernelSize = kernels->p_size;
     1334    psS32 spatialOrder = kernels->spatialOrder;
     1335    psS32 kernelSize = kernels->size;
    13361336
    13371337    if (out != NULL) {
Note: See TracChangeset for help on using the changeset viewer.