IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4815


Ignore:
Timestamp:
Aug 18, 2005, 11:44:40 AM (21 years ago)
Author:
drobbin
Message:

folded in code from bug 481. Tests still to be written.

Location:
trunk/psLib
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/imageops/psImageConvolve.c

    r4544 r4815  
    55 *  @author Robert DeSonia, MHPCC
    66 *
    7  *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2005-07-12 19:33:49 $
     7 *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2005-08-18 21:44:40 $
    99 *
    1010 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    1212
    1313#include <string.h>
    14 
     14#include <math.h>
    1515#include "psImageConvolve.h"
    1616#include "psImageFFT.h"
    … …  
    279279}
    280280
    281 psImage* psImageConvolve(psImage* out, const psImage* in, const psKernel* kernel, bool direct)
     281psImage* psImageConvolve(psImage* out,
     282                         const psImage* in,
     283                         const psKernel* kernel,
     284                         bool direct)
    282285{
    283286    if (in == NULL) {
    … …  
    476479    return out;
    477480}
     481
     482void psImageSmooth (psImage *image,
     483                    float sigma,
     484                    float Nsigma)
     485{
     486
     487    int Nx, Ny, Npixel, Nrange;
     488    float factor, g, s;
     489    psVector *temp;
     490
     491    // relevant terms
     492    Nrange = sigma*Nsigma + 0.5;
     493    Npixel = 2*Nrange + 1;
     494    factor = -0.5/(sigma*sigma);
     495
     496    Nx = image->numCols;
     497    Ny = image->numRows;
     498
     499    // generate gaussian
     500    psVector *gaussnorm = psVectorAlloc (Npixel, PS_TYPE_F32);
     501    for (int i = -Nrange; i < Nrange + 1; i++) {
     502        gaussnorm->data.F32[i+Nrange] = exp (factor*i*i);
     503    }
     504    psF32 *gauss = &gaussnorm->data.F32[Nrange];
     505
     506    // smooth in X direction
     507    temp = psVectorAlloc (Nx, PS_TYPE_F32);
     508    for (int j = 0; j < Ny; j++) {
     509        psF32 *vi = image->data.F32[j];
     510        psF32 *vo = temp->data.F32;
     511        for (int i = 0; i < Nx; i++) {
     512            g = s = 0;
     513            for (int n = -Nrange; n < Nrange + 1; n++) {
     514                if (i+n < 0)
     515                    continue;
     516                if (i+n >= Nx)
     517                    continue;
     518                s += gauss[n]*vi[i+n];
     519                g += gauss[n];
     520            }
     521            vo[i] = s / g;
     522        }
     523        memcpy (image->data.F32[j], temp->data.F32, Nx*sizeof(psF32));
     524    }
     525    psFree (temp);
     526
     527    // smooth in Y direction
     528    temp = psVectorAlloc (image->numRows, PS_TYPE_F32);
     529    for (int i = 0; i < Nx; i++) {
     530        psF32  *vo = temp->data.F32;
     531        psF32 **vi = image->data.F32;
     532        for (int j = 0; j < Ny; j++) {
     533            g = s = 0;
     534            for (int n = -Nrange; n < Nrange + 1; n++) {
     535                if (j+n < 0)
     536                    continue;
     537                if (j+n >= Ny)
     538                    continue;
     539                s += gauss[n]*vi[j+n][i];
     540                g += gauss[n];
     541            }
     542            vo[j] = s / g;
     543        }
     544        // replace temp in image
     545        for (int j = 0; j < Ny; j++) {
     546            vi[j][i] = vo[j];
     547        }
     548    }
     549    psFree (temp);
     550    psFree (gaussnorm);
     551}
     552

  • trunk/psLib/src/imageops/psImageConvolve.h

    r4540 r4815  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-07-12 19:12:01 $
     9 *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-08-18 21:44:40 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    126126);
    127127
     128/** Smooths an image by parts using 1D Gaussian independently in x and y.
     129 *
     130 *  Applies a circularly symmetric Gaussian smoothing first in x and then in y
     131 *  directions with just a vector.  This process is 2N faster than 2D convolutions (in general).
     132 */
     133void psImageSmooth(
     134    psImage *image,                    ///< the image to be smoothed
     135    float sigma,                       ///< the width of the smoothing kernel in pixels
     136    float Nsigma                       ///< the size of the smoothing box in sigmas
     137);
     138
     139
    128140#endif // #ifndef PS_IMAGE_CONVOLVE_H

  • trunk/psLib/src/imageops/psImagePixelManip.c

    r4589 r4815  
    1010 *  @author Ross Harman, MHPCC
    1111 *
    12  *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2005-07-21 01:40:10 $
     12 *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2005-08-18 21:44:40 $
    1414 *
    1515 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    396396}
    397397
     398// mask the area contained by the region
     399// the region is defined wrt the parent image
     400void psImageMaskRegion(psImage *image,
     401                       psRegion *region,
     402                       bool logical_and,
     403                       int maskValue)
     404{
     405
     406    for (int iy = 0; iy < image->numRows; iy++) {
     407        for (int ix = 0; ix < image->numCols; ix++) {
     408            if (ix + image->col0 <  region->x0)
     409                continue;
     410            if (ix + image->col0 >= region->x1)
     411                continue;
     412            if (iy + image->row0 <  region->y0)
     413                continue;
     414            if (iy + image->row0 >= region->y1)
     415                continue;
     416            if (logical_and) {
     417                image->data.U8[iy][ix] &= maskValue;
     418            } else {
     419                image->data.U8[iy][ix] |= maskValue;
     420            }
     421        }
     422    }
     423}
     424
     425// mask the area not contained by the region
     426// the region is defined wrt the parent image
     427void psImageKeepRegion(psImage *image,
     428                       psRegion *region,
     429                       bool logical_and,
     430                       int maskValue)
     431{
     432
     433    for (int iy = 0; iy < image->numRows; iy++) {
     434        for (int ix = 0; ix < image->numCols; ix++) {
     435            if (ix + image->col0 <  region->x0)
     436                goto maskit;
     437            if (ix + image->col0 >= region->x1)
     438                goto maskit;
     439            if (iy + image->row0 <  region->y0)
     440                goto maskit;
     441            if (iy + image->row0 >= region->y1)
     442                goto maskit;
     443            continue;
     444maskit:
     445            if (logical_and) {
     446                image->data.U8[iy][ix] &= maskValue;
     447            } else {
     448                image->data.U8[iy][ix] |= maskValue;
     449            }
     450        }
     451    }
     452}
     453
     454// mask the area contained by the region
     455// the region is defined wrt the parent image
     456void psImageMaskCircle(psImage *image,
     457                       double x,
     458                       double y,
     459                       double radius,
     460                       bool logical_and,
     461                       int maskValue)
     462{
     463
     464    double dx, dy, r2, R2;
     465
     466    R2 = PS_SQR(radius);
     467
     468    for (int iy = 0; iy < image->numRows; iy++) {
     469        for (int ix = 0; ix < image->numCols; ix++) {
     470            dx = ix + image->col0 - x;
     471            dy = iy + image->row0 - y;
     472            r2 = PS_SQR(dx) + PS_SQR(dy);
     473            if (r2 > R2)
     474                continue;
     475            if (logical_and) {
     476                image->data.U8[iy][ix] &= maskValue;
     477            } else {
     478                image->data.U8[iy][ix] |= maskValue;
     479            }
     480        }
     481    }
     482}
     483
     484// mask the area contained by the region
     485// the region is defined wrt the parent image
     486void psImageKeepCircle(psImage *image,
     487                       double x,
     488                       double y,
     489                       double radius,
     490                       bool logical_and,
     491                       int maskValue)
     492{
     493
     494    double dx, dy, r2, R2;
     495
     496    R2 = PS_SQR(radius);
     497
     498    for (int iy = 0; iy < image->numRows; iy++) {
     499        for (int ix = 0; ix < image->numCols; ix++) {
     500            dx = ix + image->col0 - x;
     501            dy = iy + image->row0 - y;
     502            r2 = PS_SQR(dx) + PS_SQR(dy);
     503            if (r2 < R2)
     504                continue;
     505            if (logical_and) {
     506                image->data.U8[iy][ix] &= maskValue;
     507            } else {
     508                image->data.U8[iy][ix] |= maskValue;
     509            }
     510        }
     511    }
     512}
     513

  • trunk/psLib/src/imageops/psImagePixelManip.h

    r4589 r4815  
    88 *  @author Robert DeSonia, MHPCC
    99 *
    10  *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2005-07-21 01:40:10 $
     10 *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2005-08-18 21:44:40 $
    1212 *
    1313 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    8787    const char *op                     ///< the operation to perform for overlay
    8888);
     89/** Sets the bits inside the region, ignoring pixels outside.
     90 *
     91 *  The pixels are set by combining the existing pixel value and the given maskValue
     92 *  with a logical operation.  The allowed operations are =, AND, OR, and XOR.
     93 */
     94void psImageMaskRegion(
     95    psImage *image,                    ///< the image to set
     96    psRegion *region,                  ///< the specified region
     97    bool logical_and,                  ///< the logical operation
     98    int maskValue                      ///< the specified bits
     99);
     100
     101/** Sets the bits outside the region, ignoring pixels inside.
     102 *
     103 *  The pixels are set by combining the existing pixel value and the given maskValue
     104 *  with a logical operation.  The allowed operations are =, AND, OR, and XOR.
     105 */
     106void psImageKeepRegion(
     107    psImage *image,                    ///< the image to set
     108    psRegion *region,                  ///< the specified region
     109    bool logical_and,                  ///< the logical operation
     110    int maskValue                      ///< the specified bits
     111);
     112
     113/** Sets the bits inside the circle, ignoring the pixels outside.
     114 *
     115 *  The pixel values are set by combining the existing pixel value and the given maskValue
     116 *  with a logical operation.  The allowed operations are =, AND, OR, and XOR.
     117 */
     118void psImageMaskCircle(
     119    psImage *image,                    ///< the image to set
     120    double x,                          ///< the x coordinate of the circle's center
     121    double y,                          ///< the y coordinate of the circle's center
     122    double radius,                     ///< the radius of the specified circle
     123    bool logical_and,                  ///< the logical operation
     124    int maskValue                      ///< the specified bits
     125);
     126
     127/** Sets the bits outside the circle, ignoring the pixels inside.
     128 *
     129 *  The pixel values are set by combining the existing pixel value and the given maskValue
     130 *  with a logical operation.  The allowed operations are =, AND, OR, and XOR.
     131 */
     132void psImageKeepCircle(
     133    psImage *image,                    ///< the image to set
     134    double x,                          ///< the x coordinate of the circle's center
     135    double y,                          ///< the y coordinate of the circle's center
     136    double radius,                     ///< the radius of the specified circle
     137    bool logical_and,                  ///< the logical operation
     138    int maskValue                      ///< the specified bits
     139);
    89140
    90141#endif // #ifndef PS_IMAGE_PIXEL_MANIP_H

  • trunk/psLib/src/mathtypes/psImage.c

    r4545 r4815  
    99 *  @author Ross Harman, MHPCC
    1010 *
    11  *  @version $Revision: 1.74 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2005-07-12 19:35:15 $
     11 *  @version $Revision: 1.75 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2005-08-18 21:44:40 $
    1313 *
    1414 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    147147    return psStringCopy(tmpText);
    148148}
     149
     150
     151// set actual region based on image parameters:
     152// compensate for negative upper limits
     153// XXX this is inconsistent: the coordindates should always be in the parent
     154//     frame, which means the negative values should subtract from Nx,Ny of
     155//     the parent, not the child.  but, we don't carry the dimensions of the
     156//     parent in the psImage container.  for now, us the child Nx,Ny
     157// force range to be on this subimage
     158// XXX EAM : this needs to be changes to use psRegion rather than psRegion*
     159psRegion psRegionForImage(psImage *image,
     160                          psRegion *in)
     161{
     162
     163    // x0,y0, x1,y1 are in *parent* units
     164    //    PS_ASSERT_PTR_NON_NULL(in, NULL);
     165    if( in == NULL ) {
     166        psError(PS_ERR_BAD_PARAMETER_NULL, true, "Unallowable operation.  psRegion *in is NULL.");
     167        return *in;
     168    }
     169    /*    if (out == NULL) {
     170    //    out = psRegionAlloc(in->x0, in->x1, in->y0, in->y1);
     171        *out = psRegionSet(in->x0, in->x1, in->y0, in->y1);
     172        } else {
     173        *out = *in;
     174        }
     175    */    // XXX these are probably wrong (see above)
     176    if (in->x1 <= 0) {
     177        in->x1 = image->col0 + image->numCols + in->x1;
     178    }
     179    if (in->y1 <= 0) {
     180        in->y1 = image->row0 + image->numRows + in->y1;
     181    }
     182
     183    // force the lower-limits to be on the child
     184    in->x0 = PS_MAX(image->col0, in->x0);
     185    in->y0 = PS_MAX(image->row0, in->y0);
     186
     187    // force the upper-limits to be on the child
     188    in->x1 = PS_MIN(image->col0 + image->numCols, in->x1);
     189    in->y1 = PS_MIN(image->row0 + image->numRows, in->y1);
     190    return (*in);
     191}
     192
     193// define a square region centered on the given coordinate
     194psRegion psRegionForSquare(float x,
     195                           float y,
     196                           float radius)
     197{
     198    psRegion region;
     199    region = psRegionSet (x - radius, x + radius + 1,
     200                          y - radius, y + radius + 1);
     201    return (region);
     202}
     203
     204bool psImageInit (psImage *image,...)
     205{
     206
     207    va_list argp;
     208    psU8  vU8;
     209    psF32 vF32;
     210    psF64 vF64;
     211
     212    if (image == NULL)
     213        return (false);
     214
     215    va_start (argp, image);
     216
     217    switch (image->type.type) {
     218    case PS_TYPE_U8:
     219        vU8 = va_arg (argp, psU32);
     220
     221        for (int iy = 0; iy < image->numRows; iy++) {
     222            for (int ix = 0; ix < image->numCols; ix++) {
     223                image->data.U8[iy][ix] = vU8;
     224            }
     225        }
     226        break;
     227
     228    case PS_TYPE_F32:
     229        vF32 = va_arg (argp, psF64);
     230
     231        for (int iy = 0; iy < image->numRows; iy++) {
     232            for (int ix = 0; ix < image->numCols; ix++) {
     233                image->data.F32[iy][ix] = vF32;
     234            }
     235        }
     236        return (true);
     237
     238    case PS_TYPE_F64:
     239        vF64 = va_arg (argp, psF64);
     240
     241        for (int iy = 0; iy < image->numRows; iy++) {
     242            for (int ix = 0; ix < image->numCols; ix++) {
     243                image->data.F64[iy][ix] = vF64;
     244            }
     245        }
     246        return (true);
     247
     248    default:
     249        psError (PS_ERR_BAD_PARAMETER_TYPE, true, "datatype %d not defined in psImageInit\n", image->type);
     250        return (false);
     251    }
     252    return (false);
     253}
     254
    149255
    150256psImage* psImageRecycle(psImage* old,

  • trunk/psLib/src/mathtypes/psImage.h

    r4590 r4815  
    1111 *  @author Ross Harman, MHPCC
    1212 *
    13  *  @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-07-21 02:39:57 $
     13 *  @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-08-18 21:44:40 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2323#include "psType.h"
    2424#include "psArray.h"
     25#include "psConstants.h"
    2526
    2627/// @addtogroup Image
    … …  
    112113/** Create a psRegion with the specified attributes.
    113114 *
    114  * @return psRegion : a cooresponding psRegion.
     115 *  @return psRegion : a cooresponding psRegion.
    115116 */
    116117psRegion psRegionSet(
    … …  
    141142);
    142143
     144/** Sets an actual region based on image parameters.
     145 *
     146 *  An image region defined with negative upper limits may be rationalized for the bounds of a
     147 *  specific image with psRegionForImage.  The output of this function is a region with negative
     148 *  upper limits replaced by their corrected value appropriate to the given image.  In addition,
     149 *  the lower and upper limits are foced to lie within the bounds of the image.  If the lower-
     150 *  limit coordinates are lewss than the lower bound of the image, they are limited to the lower
     151 *  bound of the image.  Conversely, if the upper-limit coordinates are greater than the upper
     152 *  bound of the image, they are truncated to define only valid pixels.  If the lower-limit
     153 *  coordinates are greater than the upper bounds of the image, or the upper-limit coordinates
     154 *  are less than the lower bounds of the image, the coordinates should saturate on those limits.
     155 *
     156 *  @return psRegion:       A region with negative upper limits replaced by the corrected
     157 */
     158psRegion psRegionForImage(
     159    psImage *image,                    ///< the image for which the region is to be set
     160    psRegion *in                       ///< the image region limits
     161);
     162
     163/** Defines a region corresponding to the square with center at coordinate x,y
     164 *  and with coderadius.  The width of the square is 2radius + 1.
     165 *
     166 *  @return psRegion:       the newly defined psRegion.
     167 */
     168psRegion psRegionForSquare(
     169    float x,                           ///< x coordinate at square-center
     170    float y,                           ///< y coordinate at square-center
     171    float radius                       ///< radius of square
     172);
     173
     174/** Initializes the image with the given value.
     175 *
     176 *  The input data is cast to match the image datatype.
     177 *
     178 *  @return bool:       True on success, otherwise false.
     179 */
     180bool psImageInit(
     181    psImage *image,                    ///< the image to be initialized
     182    ...                                ///< Variable argument list for initialization
     183);
     184
    143185/** Resize a given image to the given size/type.
    144186 *
    145187 *  @return psImage* Resized psImage.
    146  *
    147188 */
    148189psImage* psImageRecycle(
    … …  
    166207 *
    167208 *  @return int      Number of children freed.
    168  *
    169209 */
    170210int psImageFreeChildren(

  • trunk/psLib/src/xml/psXML.h

    r4786 r4815  
    1010 *  @author David Robbins, MHPCC
    1111 *
    12  *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2005-08-16 20:13:20 $
     12 *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2005-08-18 21:44:40 $
    1414 *
    1515 *  Copyright 2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    1919#define PS_XML_H
    2020
    21 //#include <libxml/parser.h>
    22 #include <libxml/tree.h>
     21#include <libxml/parser.h>
     22//#include <libxml/tree.h>
    2323#include <string.h>
    2424#include <ctype.h>

  • trunk/psLib/test/types/verified/tst_psMetadata_07.stdout

    r4547 r4815  
    88---> TESTPOINT PASSED (psMetadata{Test A - Read an XML config file} | tst_psMetadata_07.c)
    99
    10 /***************************** TESTPOINT ******************************************\
    11 *             TestFile: tst_psMetadata_07.c                                        *
    12 *            TestPoint: psMetadata{Test B - Free data}                             *
    13 *             TestType: Positive                                                   *
    14 \**********************************************************************************/
    15 
    16 
    17 ---> TESTPOINT PASSED (psMetadata{Test B - Free data} | tst_psMetadata_07.c)
    18 

  • trunk/psLib/test/xml/Makefile

    r4790 r4815  
    6969CTAGS = ctags
    7070DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    71 ACLOCAL = ${SHELL} /home/drobbin/panstarrs/new/psLib/missing --run aclocal-1.9
     71ACLOCAL = ${SHELL} /home/drobbin/panstarrs/temp/psLib/missing --run aclocal-1.9
    7272AMDEP_FALSE = #
    7373AMDEP_TRUE =
    74 AMTAR = ${SHELL} /home/drobbin/panstarrs/new/psLib/missing --run tar
     74AMTAR = ${SHELL} /home/drobbin/panstarrs/temp/psLib/missing --run tar
    7575AR = ar
    76 AUTOCONF = ${SHELL} /home/drobbin/panstarrs/new/psLib/missing --run autoconf
    77 AUTOHEADER = ${SHELL} /home/drobbin/panstarrs/new/psLib/missing --run autoheader
    78 AUTOMAKE = ${SHELL} /home/drobbin/panstarrs/new/psLib/missing --run automake-1.9
     76AUTOCONF = ${SHELL} /home/drobbin/panstarrs/temp/psLib/missing --run autoconf
     77AUTOHEADER = ${SHELL} /home/drobbin/panstarrs/temp/psLib/missing --run autoheader
     78AUTOMAKE = ${SHELL} /home/drobbin/panstarrs/temp/psLib/missing --run automake-1.9
    7979AWK = gawk
    8080CC = gcc
    8181CCDEPMODE = depmode=gcc3
    82 CFLAGS =  -I/home/drobbin/panstarrs/new/psLib/src -I/home/drobbin/panstarrs/new/psLib/src/sys -I/home/drobbin/panstarrs/new/psLib/src/astro -I/home/drobbin/panstarrs/new/psLib/src/db -I/home/drobbin/panstarrs/new/psLib/src/fft -I/home/drobbin/panstarrs/new/psLib/src/fits -I/home/drobbin/panstarrs/new/psLib/src/imageops -I/home/drobbin/panstarrs/new/psLib/src/math -I/home/drobbin/panstarrs/new/psLib/src/mathtypes -I/home/drobbin/panstarrs/new/psLib/src/types -I/home/drobbin/panstarrs/new/psLib/src/xml -O0 -g -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200112L -std=c99 -I/usr/include/mysql -g -pipe   -I/usr/local/include -I/usr/include/libxml2 -Wall -Werror
     82CFLAGS =  -I/home/drobbin/panstarrs/temp/psLib/src -I/home/drobbin/panstarrs/temp/psLib/src/sys -I/home/drobbin/panstarrs/temp/psLib/src/astro -I/home/drobbin/panstarrs/temp/psLib/src/db -I/home/drobbin/panstarrs/temp/psLib/src/fft -I/home/drobbin/panstarrs/temp/psLib/src/fits -I/home/drobbin/panstarrs/temp/psLib/src/imageops -I/home/drobbin/panstarrs/temp/psLib/src/math -I/home/drobbin/panstarrs/temp/psLib/src/mathtypes -I/home/drobbin/panstarrs/temp/psLib/src/types -I/home/drobbin/panstarrs/temp/psLib/src/xml -O0 -g -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200112L -std=c99 -I/usr/include/mysql -g -pipe   -I/usr/local/include -I/usr/include/libxml2 -Wall -Werror
    8383CPP = gcc -E
    8484CPPFLAGS =
    … …  
    112112MAINTAINER_MODE_FALSE =
    113113MAINTAINER_MODE_TRUE = #
    114 MAKEINFO = ${SHELL} /home/drobbin/panstarrs/new/psLib/missing --run makeinfo
     114MAKEINFO = ${SHELL} /home/drobbin/panstarrs/temp/psLib/missing --run makeinfo
    115115OBJEXT = o
    116116PACKAGE = pslib
    … …  
    123123PERL = /usr/bin/perl
    124124PERL_INSTALLSYTLE = installstyle='lib64/perl5';
    125 PERL_PREFIX = /home/drobbin/panstarrs/new/psLib
     125PERL_PREFIX = /home/drobbin/panstarrs/temp/psLib
    126126POW_LIB =
    127127PSLIB_CFLAGS = -I${prefix}/include
    … …  
    133133SHELL = /bin/sh
    134134SRCDIRS = sys astro db fft fits imageops math mathtypes types xml
    135 SRCINC = -I/home/drobbin/panstarrs/new/psLib/src/sys -I/home/drobbin/panstarrs/new/psLib/src/astro -I/home/drobbin/panstarrs/new/psLib/src/db -I/home/drobbin/panstarrs/new/psLib/src/fft -I/home/drobbin/panstarrs/new/psLib/src/fits -I/home/drobbin/panstarrs/new/psLib/src/imageops -I/home/drobbin/panstarrs/new/psLib/src/math -I/home/drobbin/panstarrs/new/psLib/src/mathtypes -I/home/drobbin/panstarrs/new/psLib/src/types -I/home/drobbin/panstarrs/new/psLib/src/xml
     135SRCINC = -I/home/drobbin/panstarrs/temp/psLib/src/sys -I/home/drobbin/panstarrs/temp/psLib/src/astro -I/home/drobbin/panstarrs/temp/psLib/src/db -I/home/drobbin/panstarrs/temp/psLib/src/fft -I/home/drobbin/panstarrs/temp/psLib/src/fits -I/home/drobbin/panstarrs/temp/psLib/src/imageops -I/home/drobbin/panstarrs/temp/psLib/src/math -I/home/drobbin/panstarrs/temp/psLib/src/mathtypes -I/home/drobbin/panstarrs/temp/psLib/src/types -I/home/drobbin/panstarrs/temp/psLib/src/xml
    136136SRCSUBLIBS = sys/libpslibsys.la astro/libpslibastro.la db/libpslibdb.la fft/libpslibfft.la fits/libpslibfits.la imageops/libpslibimageops.la math/libpslibmath.la mathtypes/libpslibmathtypes.la types/libpslibtypes.la xml/libpslibxml.la
    137137STRIP = strip
    … …  
    170170includedir = ${prefix}/include
    171171infodir = ${prefix}/info
    172 install_sh = /home/drobbin/panstarrs/new/psLib/install-sh
     172install_sh = /home/drobbin/panstarrs/temp/psLib/install-sh
    173173libdir = ${exec_prefix}/lib
    174174libexecdir = ${exec_prefix}/libexec
    … …  
    177177mkdir_p = mkdir -p --
    178178oldincludedir = /usr/include
    179 prefix = /home/drobbin/panstarrs/new/psLib
     179prefix = /home/drobbin/panstarrs/temp/psLib
    180180program_transform_name = s,x,x,
    181181sbindir = ${exec_prefix}/sbin
Note: See TracChangeset for help on using the changeset viewer.