IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 1041


Ignore:
Timestamp:
Jun 14, 2004, 4:45:43 PM (22 years ago)
Author:
desonia
Message:

Fixes for Mac use.

Location:
trunk/psLib
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/Makefile.Globals

    r1008 r1041  
    55##  Assumptions:    Variable "prefix" already defined
    66##
    7 ##  $Revision: 1.10 $  $Name: not supported by cvs2svn $
    8 ##  $Date: 2004-06-12 01:33:16 $
     7##  $Revision: 1.11 $  $Name: not supported by cvs2svn $
     8##  $Date: 2004-06-15 02:45:42 $
    99##
    1010##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    4646# Set initial value for LDFLAGS which will include all OS common flags for GCC and required libraries.
    4747
    48 LDFLAGS := -g2 -pipe -lcfitsio -lgsl -lgslcblas -lfftw3f
     48EXTLIBS := -lcfitsio -lgsl -lgslcblas -lfftw3f
     49LDFLAGS := -g2 -pipe $(EXTLIBS)
    4950
    5051# Define or refine variables for the Linux OS
    … …  
    6465    CFLAGS += -Wno-long-double -DDARWIN
    6566    CFLAGS_RELOC := $(CFLAGS)
     67    LDFLAGS := $(LDFLAGS) -lmx
    6668    LDFLAGS_SO := $(LDFLAGS) -bundle -flat_namespace -undefined suppress
    6769    LDFLAGS_DLL := $(LDFLAGS) -dynamiclib
    … …  
    7072    DOCS =
    7173    BUILD_DYNAMIC1 = libtool -dynamic
    72     BUILD_DYNAMIC2 = -lm -lgcc -o
     74    BUILD_DYNAMIC2 = -lm -lmx -lgcc $(EXTLIBS) -o
    7375endif
    7476

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

    r965 r1041  
    1010 *  @author Ross Harman, MHPCC
    1111 *
    12  *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2004-06-10 00:29:09 $
     12 *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2004-06-15 02:45:43 $
    1414 *
    1515 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    222222    int i = 0;
    223223    int numBits = inBitSet->n*8;
    224     char* outString = psAlloc((size_t)numBits);
     224    char* outString = psAlloc((size_t)numBits+1);
    225225    for(i=0; i<numBits; i++) {
    226226        outString[numBits-i-1] = (psBitSetTest(inBitSet, i) == 1)?'1':'0';
    227227    }
    228228
     229    outString[numBits] = 0;
     230
    229231    return outString;
    230232}

  • trunk/psLib/src/sysUtils/psHash.d

    r986 r1041  
    11psHash.o psHash.d : psHash.c psHash.h ../collections/psList.h \
    22  ../collections/psVector.h ../collections/psType.h \
    3   ../sysUtils/psMemory.h psMemory.h psString.h psTrace.h psAbort.h
     3  ../sysUtils/psMemory.h psString.h psTrace.h psAbort.h

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

    r965 r1041  
    1010 *  @author Ross Harman, MHPCC
    1111 *
    12  *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2004-06-10 00:29:09 $
     12 *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2004-06-15 02:45:43 $
    1414 *
    1515 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    222222    int i = 0;
    223223    int numBits = inBitSet->n*8;
    224     char* outString = psAlloc((size_t)numBits);
     224    char* outString = psAlloc((size_t)numBits+1);
    225225    for(i=0; i<numBits; i++) {
    226226        outString[numBits-i-1] = (psBitSetTest(inBitSet, i) == 1)?'1':'0';
    227227    }
    228228
     229    outString[numBits] = 0;
     230
    229231    return outString;
    230232}

  • trunk/psLib/test/Makefile

    r1021 r1041  
    33##  Makefile:   test
    44##
    5 ##  $Revision: 1.5 $  $Name: not supported by cvs2svn $
    6 ##  $Date: 2004-06-14 19:38:06 $
     5##  $Revision: 1.6 $  $Name: not supported by cvs2svn $
     6##  $Date: 2004-06-15 02:45:43 $
    77##
    88##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    4747
    4848libpstest.$(DLL): $(SRC_OBJS)
    49         $(CC) $(LDFLAGS_DLL) $(SRC_OBJS) -o $@ 
     49        $(CC) $(LDFLAGS_DLL) -L../lib -lpslib $(SRC_OBJS) -o $@ 
    5050
    5151# Define PHONY target "install" which will install necessary files

  • trunk/psLib/test/collections/verified/tst_psBitSet_01.stdout

    r1034 r1041  
    66
    77Creating psBitSet with 24 bits...
    8 000000000000000000000000Þ
     8000000000000000000000000
    99
    1010
    … …  
    2020Setting third bit...
    2121Setting last bit...
    22 100000000000000000000101Þ
     22100000000000000000000101
    2323
    2424

  • trunk/psLib/test/collections/verified/tst_psBitSet_02.stdout

    r1034 r1041  
    55\**********************************************************************************/
    66
    7 000000000000000000000000Þ
    8 000000000000000000000000Þ
     7000000000000000000000000
     8000000000000000000000000
    99
    1010Setting all bits true...
    11 111111111111111111111111Þ
    12 111111111111111111111111Þ
     11111111111111111111111111
     12111111111111111111111111
    1313
    1414
    … …  
    2222
    2323Result:
    24 111111111111111111111111Þ
     24111111111111111111111111
    2525
    2626---> TESTPOINT PASSED (psBitSet{Perform binary AND with psBitSets} | tst_psBitSet_02.c)

  • trunk/psLib/test/collections/verified/tst_psBitSet_03.stdout

    r1034 r1041  
    55\**********************************************************************************/
    66
    7 000000000000000000000000Þ
    8 000000000000000000000000Þ
     7000000000000000000000000
     8000000000000000000000000
    99
    1010Setting all bits true...
    11 111111111111111111111111Þ
    12 111111111111111111111111Þ
     11111111111111111111111111
     12111111111111111111111111
    1313
    1414
    … …  
    2222
    2323Result:
    24 111111111111111111111111Þ
     24111111111111111111111111
    2525
    2626---> TESTPOINT PASSED (psBitSet{Perform binary OR with psBitSets} | tst_psBitSet_03.c)

  • trunk/psLib/test/collections/verified/tst_psBitSet_04.stdout

    r1034 r1041  
    55\**********************************************************************************/
    66
    7 000000000000000000000000Þ
    8 000000000000000000000000Þ
     7000000000000000000000000
     8000000000000000000000000
    99
    1010Setting all bits true...
    11 111111111111111111111111Þ
    12 111111111111111111111111Þ
     11111111111111111111111111
     12111111111111111111111111
    1313
    1414
    … …  
    2222
    2323Result:
    24 000000000000000000000000Þ
     24000000000000000000000000
    2525
    2626---> TESTPOINT PASSED (psBitSet{Perform binary XOR with psBitSets} | tst_psBitSet_04.c)

  • trunk/psLib/test/collections/verified/tst_psBitSet_05.stdout

    r1034 r1041  
    55\**********************************************************************************/
    66
    7 000000000000000000000000Þ
    8 0000000000000000000000000000000000000000Þ
     7000000000000000000000000
     80000000000000000000000000000000000000000
    99
    1010

  • trunk/psLib/test/collections/verified/tst_psBitSet_06.stdout

    r1034 r1041  
    55\**********************************************************************************/
    66
    7 000000000000000000000000Þ
    8 000000000000000000000000Þ
     7000000000000000000000000
     8000000000000000000000000
    99
    1010

  • trunk/psLib/test/dataManip/Makefile

    r1011 r1041  
    33##  Makefile:   test/sysUtils
    44##
    5 ##  $Revision: 1.14 $  $Name: not supported by cvs2svn $
    6 ##  $Date: 2004-06-12 02:17:42 $
     5##  $Revision: 1.15 $  $Name: not supported by cvs2svn $
     6##  $Date: 2004-06-15 02:45:43 $
    77##
    88##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    6666
    6767%   : builddir/%.o
    68         $(CC) -o $@ $< -L$(PSLIB_LIB_DIR) -lpslib -lpstest -lgsl -lgslcblas $(LDFLAGS)
     68        $(CC) -o $@ $< -L$(PSLIB_LIB_DIR) -lpslib -lpstest $(LDFLAGS)
    6969
    7070distclean: clean

  • trunk/psLib/test/image/tst_psImageStats00.c

    r904 r1041  
    6565        for (i=0;i<tmpImage->numRows;i++) {
    6666            for (j=0;j<tmpImage->numCols;j++) {
    67                 tmpImage->data.F32[i][j] = (float) (i + j);
     67                tmpImage->data.F32[i][j] = (float) (i + j + 0.1);
    6868            }
    6969        }
Note: See TracChangeset for help on using the changeset viewer.