IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 3684 for trunk/psLib/src


Ignore:
Timestamp:
Apr 8, 2005, 7:58:58 AM (21 years ago)
Author:
desonia
Message:

changed name of fileUtils to dataIO to better coorespond to the latest
SDRS.

Location:
trunk/psLib/src
Files:
28 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/Makefile.am

    r3682 r3684  
    1 SUBDIRS = astronomy collections dataManip fileUtils image sysUtils
     1SUBDIRS = astronomy collections dataManip dataIO image sysUtils
    22
    33INCLUDES = \
    … …  
    55        -I$(top_srcdir)/src/collections \
    66        -I$(top_srcdir)/src/dataManip \
    7         -I$(top_srcdir)/src/fileUtils \
     7        -I$(top_srcdir)/src/dataIO \
    88        -I$(top_srcdir)/src/image \
    99        -I$(top_srcdir)/src/sysUtils \
    … …  
    1616        $(top_builddir)/src/collections/libpslibcollections.la \
    1717        $(top_builddir)/src/dataManip/libpslibdataManip.la \
    18         $(top_builddir)/src/fileUtils/libpslibfileUtils.la \
     18        $(top_builddir)/src/dataIO/libpslibdataIO.la \
    1919        $(top_builddir)/src/image/libpslibimage.la \
    2020        $(top_builddir)/src/sysUtils/libpslibsysUtils.la

  • trunk/psLib/src/astronomy/Makefile.am

    r3411 r3684  
    66        -I$(top_srcdir)/src/collections \
    77        -I$(top_srcdir)/src/dataManip \
    8         -I$(top_srcdir)/src/fileUtils \
     8        -I$(top_srcdir)/src/dataIO \
    99        -I$(top_srcdir)/src/image \
    1010        -I$(top_srcdir)/src/sysUtils \

  • trunk/psLib/src/astronomy/psMetadata.h

    r3671 r3684  
    1111*  @author Ross Harman, MHPCC
    1212*
    13 *  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
    14 *  @date $Date: 2005-04-06 01:12:58 $
     13*  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
     14*  @date $Date: 2005-04-08 17:58:57 $
    1515*
    1616*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    317317                            const char* comment, psPtr value);
    318318
    319 
    320319/** Remove an item from metadata collection.
    321320 *

  • trunk/psLib/src/collections/Makefile.am

    r3127 r3684  
    44        -I$(top_srcdir)/src/astronomy \
    55        -I$(top_srcdir)/src/dataManip \
    6         -I$(top_srcdir)/src/fileUtils \
     6        -I$(top_srcdir)/src/dataIO \
    77        -I$(top_srcdir)/src/image \
    88        -I$(top_srcdir)/src/sysUtils \

  • trunk/psLib/src/collections/psMetadata.h

    r3671 r3684  
    1111*  @author Ross Harman, MHPCC
    1212*
    13 *  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
    14 *  @date $Date: 2005-04-06 01:12:58 $
     13*  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
     14*  @date $Date: 2005-04-08 17:58:57 $
    1515*
    1616*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    317317                            const char* comment, psPtr value);
    318318
    319 
    320319/** Remove an item from metadata collection.
    321320 *

  • trunk/psLib/src/collections/psVector.c

    r3682 r3684  
    99*  @author Robert DeSonia, MHPCC
    1010*
    11 *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
    12 *  @date $Date: 2005-04-07 20:27:41 $
     11*  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
     12*  @date $Date: 2005-04-08 17:58:57 $
    1313*
    1414*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    5555    psVec->type.dimen = PS_DIMEN_VECTOR;
    5656    psVec->type.type = elemType;
    57     psVec->nalloc = nalloc;
     57    *(int*)&psVec->nalloc = nalloc;
    5858    psVec->n = nalloc;
    5959
    … …  
    8181        // Realloc after decrementation to avoid accessing freed array elements
    8282        in->data.U8 = psRealloc(in->data.U8, nalloc * elementSize);
    83         in->nalloc = nalloc;
     83        *(int*)&in->nalloc = nalloc;
    8484    }
    8585
    … …  
    108108    if (byteSize > in->nalloc*PSELEMTYPE_SIZEOF(in->type.type)) {
    109109        in->data.U8 = psRealloc(in->data.U8, byteSize);
    110         in->nalloc = n;
     110        *(int*)&in->nalloc = n;
    111111    }
    112112

  • trunk/psLib/src/collections/psVector.h

    r3476 r3684  
    1111 *  @author Ross Harman, MHPCC
    1212 *
    13  *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-03-22 21:52:49 $
     13 *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-04-08 17:58:57 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3333{
    3434    psType type;                ///< Type of data.
    35     psU32 nalloc;        ///< Total number of elements available.
    36     psU32 n;             ///< Number of elements in use.
     35    int n;                      ///< Number of elements in use.
     36    const int nalloc;           ///< Total number of elements available.
    3737
    3838    union {

  • trunk/psLib/src/dataIO/Makefile.am

    r3127 r3684  
    1 #Makefile for fileUtils functions of psLib
     1#Makefile for dataIO functions of psLib
    22#
    33INCLUDES = \
    … …  
    99        $(all_includes)
    1010
    11 noinst_LTLIBRARIES = libpslibfileUtils.la
     11noinst_LTLIBRARIES = libpslibdataIO.la
    1212
    13 libpslibfileUtils_la_SOURCES = \
     13libpslibdataIO_la_SOURCES = \
    1414        psLookupTable.c \
    1515        psFits.c
    1616
    1717BUILT_SOURCES = psFileUtilsErrors.h
    18 EXTRA_DIST = psFileUtilsErrors.dat psFileUtilsErrors.h fileUtils.i
     18EXTRA_DIST = psFileUtilsErrors.dat psFileUtilsErrors.h dataIO.i
    1919
    2020psFileUtilsErrors.h: psFileUtilsErrors.dat

  • trunk/psLib/src/dataIO/dataIO.i

    r3115 r3684  
    1 /* fileUtils headers */
     1/* dataIO headers */
    22%include "psFileUtilsErrors.h"
    33%include "psFits.h"

  • trunk/psLib/src/dataIO/psFileUtilsErrors.h

    r3271 r3684  
    11/** @file  psFileUtilsErrors.h
    22 *
    3  *  @brief Contains the error text for the fileUtils functions
     3 *  @brief Contains the error text for the dataIO functions
    44 *
    55 *  @ingroup ErrorHandling
    … …  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-02-17 21:54:09 $
     9 *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-04-08 17:58:57 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii

  • trunk/psLib/src/dataIO/psLookupTable.c

    r3682 r3684  
    33*  @brief This file defines the structure and functions for table lookups.
    44*
    5 *  @ingroup fileUtils
     5*  @ingroup dataIO
    66*
    77*  @author Ross Harman, MHPCC
    88*
    9 *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
    10 *  @date $Date: 2005-04-07 20:27:41 $
     9*  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
     10*  @date $Date: 2005-04-08 17:58:57 $
    1111*
    1212*  Copyright 2004-5 Maui High Performance Computing Center, University of Hawaii

  • trunk/psLib/src/dataIO/psLookupTable.h

    r3271 r3684  
    33*  @brief This file defines the structure and functions for table lookups.
    44*
    5 *  @ingroup fileUtils
     5*  @ingroup dataIO
    66*
    77*  @author Ross Harman, MHPCC
    88*
    9 *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
    10 *  @date $Date: 2005-02-17 21:54:09 $
     9*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
     10*  @date $Date: 2005-04-08 17:58:57 $
    1111*
    1212*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii

  • trunk/psLib/src/dataManip/Makefile.am

    r3182 r3684  
    44        -I$(top_srcdir)/src/astronomy \
    55        -I$(top_srcdir)/src/collections \
    6         -I$(top_srcdir)/src/fileUtils \
     6        -I$(top_srcdir)/src/dataIO \
    77        -I$(top_srcdir)/src/image \
    88        -I$(top_srcdir)/src/sysUtils \

  • trunk/psLib/src/fileUtils/Makefile.am

    r3127 r3684  
    1 #Makefile for fileUtils functions of psLib
     1#Makefile for dataIO functions of psLib
    22#
    33INCLUDES = \
    … …  
    99        $(all_includes)
    1010
    11 noinst_LTLIBRARIES = libpslibfileUtils.la
     11noinst_LTLIBRARIES = libpslibdataIO.la
    1212
    13 libpslibfileUtils_la_SOURCES = \
     13libpslibdataIO_la_SOURCES = \
    1414        psLookupTable.c \
    1515        psFits.c
    1616
    1717BUILT_SOURCES = psFileUtilsErrors.h
    18 EXTRA_DIST = psFileUtilsErrors.dat psFileUtilsErrors.h fileUtils.i
     18EXTRA_DIST = psFileUtilsErrors.dat psFileUtilsErrors.h dataIO.i
    1919
    2020psFileUtilsErrors.h: psFileUtilsErrors.dat

  • trunk/psLib/src/fileUtils/fileUtils.i

    r3115 r3684  
    1 /* fileUtils headers */
     1/* dataIO headers */
    22%include "psFileUtilsErrors.h"
    33%include "psFits.h"

  • trunk/psLib/src/fileUtils/psFileUtilsErrors.h

    r3271 r3684  
    11/** @file  psFileUtilsErrors.h
    22 *
    3  *  @brief Contains the error text for the fileUtils functions
     3 *  @brief Contains the error text for the dataIO functions
    44 *
    55 *  @ingroup ErrorHandling
    … …  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-02-17 21:54:09 $
     9 *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-04-08 17:58:57 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii

  • trunk/psLib/src/fileUtils/psLookupTable.c

    r3682 r3684  
    33*  @brief This file defines the structure and functions for table lookups.
    44*
    5 *  @ingroup fileUtils
     5*  @ingroup dataIO
    66*
    77*  @author Ross Harman, MHPCC
    88*
    9 *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
    10 *  @date $Date: 2005-04-07 20:27:41 $
     9*  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
     10*  @date $Date: 2005-04-08 17:58:57 $
    1111*
    1212*  Copyright 2004-5 Maui High Performance Computing Center, University of Hawaii

  • trunk/psLib/src/fileUtils/psLookupTable.h

    r3271 r3684  
    33*  @brief This file defines the structure and functions for table lookups.
    44*
    5 *  @ingroup fileUtils
     5*  @ingroup dataIO
    66*
    77*  @author Ross Harman, MHPCC
    88*
    9 *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
    10 *  @date $Date: 2005-02-17 21:54:09 $
     9*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
     10*  @date $Date: 2005-04-08 17:58:57 $
    1111*
    1212*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii

  • trunk/psLib/src/image/Makefile.am

    r3127 r3684  
    55        -I$(top_srcdir)/src/collections \
    66        -I$(top_srcdir)/src/dataManip \
    7         -I$(top_srcdir)/src/fileUtils \
     7        -I$(top_srcdir)/src/dataIO \
    88        -I$(top_srcdir)/src/sysUtils \
    99        $(all_includes)

  • trunk/psLib/src/image/psImageExtraction.c

    r3682 r3684  
    99 *  @author Robert DeSonia, MHPCC
    1010 *
    11  *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2005-04-07 20:27:41 $
     11 *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2005-04-08 17:58:57 $
    1313 *
    1414 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    428428        imgVec = psAlloc(sizeof(psVector));
    429429        imgVec->type = in->type;
    430         imgVec->n = imgVec->nalloc = numCols;
     430        imgVec->n = *(int*)&imgVec->nalloc = numCols;
    431431        if (mask != NULL) {
    432432            maskVec = psAlloc(sizeof(psVector));
    433433            maskVec->type = mask->type;
    434             maskVec->n = maskVec->nalloc = numCols;
     434            maskVec->n = *(int*)&maskVec->nalloc = numCols;
    435435        }
    436436        // recycle output to make a proper sized/type output structure

  • trunk/psLib/src/image/psImageStats.c

    r3493 r3684  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2005-03-24 19:39:53 $
     11 *  @version $Revision: 1.71 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2005-04-08 17:58:57 $
    1313 *
    1414 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    6161        junkData = (psVector *) psAlloc(sizeof(psVector));
    6262        junkData->type = in->type;
    63         junkData->nalloc = in->numRows * in->numCols;
     63        *(int*)&junkData->nalloc = in->numRows * in->numCols;
    6464        junkData->n = junkData->nalloc;
    6565        junkData->data.U8 = in->data.V[0];      // since psImage data is contiguous...
    … …  
    8585            junkMask = psAlloc(sizeof(psVector));
    8686            junkMask->type = mask->type;
    87             junkMask->nalloc = mask->numRows * mask->numCols;
     87            *(int*)&junkMask->nalloc = mask->numRows * mask->numCols;
    8888            junkMask->n = junkMask->nalloc;
    8989            junkMask->data.U8 = mask->data.V[0];
    … …  
    134134        junkData = (psVector *) psAlloc(sizeof(psVector));
    135135        junkData->type = in->type;
    136         junkData->nalloc = in->numRows * in->numCols;
     136        *(int*)&junkData->nalloc = in->numRows * in->numCols;
    137137        junkData->n = junkData->nalloc;
    138138        junkData->data.U8 = in->data.V[0];      // since psImage data is contiguous...
    … …  
    158158            junkMask = psAlloc(sizeof(psVector));
    159159            junkMask->type = mask->type;
    160             junkMask->nalloc = mask->numRows * mask->numCols;
     160            *(int*)&junkMask->nalloc = mask->numRows * mask->numCols;
    161161            junkMask->n = junkMask->nalloc;
    162162            junkMask->data.U8 = mask->data.V[0];

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

    r3493 r3684  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2005-03-24 19:39:53 $
     11 *  @version $Revision: 1.71 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2005-04-08 17:58:57 $
    1313 *
    1414 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    6161        junkData = (psVector *) psAlloc(sizeof(psVector));
    6262        junkData->type = in->type;
    63         junkData->nalloc = in->numRows * in->numCols;
     63        *(int*)&junkData->nalloc = in->numRows * in->numCols;
    6464        junkData->n = junkData->nalloc;
    6565        junkData->data.U8 = in->data.V[0];      // since psImage data is contiguous...
    … …  
    8585            junkMask = psAlloc(sizeof(psVector));
    8686            junkMask->type = mask->type;
    87             junkMask->nalloc = mask->numRows * mask->numCols;
     87            *(int*)&junkMask->nalloc = mask->numRows * mask->numCols;
    8888            junkMask->n = junkMask->nalloc;
    8989            junkMask->data.U8 = mask->data.V[0];
    … …  
    134134        junkData = (psVector *) psAlloc(sizeof(psVector));
    135135        junkData->type = in->type;
    136         junkData->nalloc = in->numRows * in->numCols;
     136        *(int*)&junkData->nalloc = in->numRows * in->numCols;
    137137        junkData->n = junkData->nalloc;
    138138        junkData->data.U8 = in->data.V[0];      // since psImage data is contiguous...
    … …  
    158158            junkMask = psAlloc(sizeof(psVector));
    159159            junkMask->type = mask->type;
    160             junkMask->nalloc = mask->numRows * mask->numCols;
     160            *(int*)&junkMask->nalloc = mask->numRows * mask->numCols;
    161161            junkMask->n = junkMask->nalloc;
    162162            junkMask->data.U8 = mask->data.V[0];

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

    r3682 r3684  
    99*  @author Robert DeSonia, MHPCC
    1010*
    11 *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
    12 *  @date $Date: 2005-04-07 20:27:41 $
     11*  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
     12*  @date $Date: 2005-04-08 17:58:57 $
    1313*
    1414*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    5555    psVec->type.dimen = PS_DIMEN_VECTOR;
    5656    psVec->type.type = elemType;
    57     psVec->nalloc = nalloc;
     57    *(int*)&psVec->nalloc = nalloc;
    5858    psVec->n = nalloc;
    5959
    … …  
    8181        // Realloc after decrementation to avoid accessing freed array elements
    8282        in->data.U8 = psRealloc(in->data.U8, nalloc * elementSize);
    83         in->nalloc = nalloc;
     83        *(int*)&in->nalloc = nalloc;
    8484    }
    8585
    … …  
    108108    if (byteSize > in->nalloc*PSELEMTYPE_SIZEOF(in->type.type)) {
    109109        in->data.U8 = psRealloc(in->data.U8, byteSize);
    110         in->nalloc = n;
     110        *(int*)&in->nalloc = n;
    111111    }
    112112

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

    r3476 r3684  
    1111 *  @author Ross Harman, MHPCC
    1212 *
    13  *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-03-22 21:52:49 $
     13 *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-04-08 17:58:57 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3333{
    3434    psType type;                ///< Type of data.
    35     psU32 nalloc;        ///< Total number of elements available.
    36     psU32 n;             ///< Number of elements in use.
     35    int n;                      ///< Number of elements in use.
     36    const int nalloc;           ///< Total number of elements available.
    3737
    3838    union {

  • trunk/psLib/src/sysUtils/Makefile.am

    r3127 r3684  
    55        -I$(top_srcdir)/src/collections \
    66        -I$(top_srcdir)/src/dataManip \
    7         -I$(top_srcdir)/src/fileUtils \
     7        -I$(top_srcdir)/src/dataIO \
    88        -I$(top_srcdir)/src/image \
    99        $(all_includes)

  • trunk/psLib/src/types/psLookupTable.c

    r3682 r3684  
    33*  @brief This file defines the structure and functions for table lookups.
    44*
    5 *  @ingroup fileUtils
     5*  @ingroup dataIO
    66*
    77*  @author Ross Harman, MHPCC
    88*
    9 *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
    10 *  @date $Date: 2005-04-07 20:27:41 $
     9*  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
     10*  @date $Date: 2005-04-08 17:58:57 $
    1111*
    1212*  Copyright 2004-5 Maui High Performance Computing Center, University of Hawaii

  • trunk/psLib/src/types/psLookupTable.h

    r3271 r3684  
    33*  @brief This file defines the structure and functions for table lookups.
    44*
    5 *  @ingroup fileUtils
     5*  @ingroup dataIO
    66*
    77*  @author Ross Harman, MHPCC
    88*
    9 *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
    10 *  @date $Date: 2005-02-17 21:54:09 $
     9*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
     10*  @date $Date: 2005-04-08 17:58:57 $
    1111*
    1212*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii

  • trunk/psLib/src/types/psMetadata.h

    r3671 r3684  
    1111*  @author Ross Harman, MHPCC
    1212*
    13 *  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
    14 *  @date $Date: 2005-04-06 01:12:58 $
     13*  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
     14*  @date $Date: 2005-04-08 17:58:57 $
    1515*
    1616*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    317317                            const char* comment, psPtr value);
    318318
    319 
    320319/** Remove an item from metadata collection.
    321320 *
Note: See TracChangeset for help on using the changeset viewer.