IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 1883


Ignore:
Timestamp:
Sep 24, 2004, 12:33:17 PM (22 years ago)
Author:
gusciora
Message:

Fixed many compilation bugs.

Location:
trunk/psModules/src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/src/Makefile

    r1880 r1883  
    1 
    2 cc -c -O0 -g2 -Wall -Werror -std=c99 -D_GNU_SOURCE -pipe  -fpic -I. -I../sysUtils -I../collections -I.. -I../image -I.. -o makedir/psSubtractBias.o psSubtractBias.c
    3 
     1# Makefile.in generated by automake 1.7.8 from Makefile.am.
     2# src/Makefile.  Generated from Makefile.in by configure.
     3
     4# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
     5# Free Software Foundation, Inc.
     6# This Makefile.in is free software; the Free Software Foundation
     7# gives unlimited permission to copy and/or distribute it,
     8# with or without modifications, as long as this notice is preserved.
     9
     10# This program is distributed in the hope that it will be useful,
     11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
     12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
     13# PARTICULAR PURPOSE.
     14
     15
     16
     17srcdir = .
     18top_srcdir = ..
     19
     20pkgdatadir = $(datadir)/psModule
     21pkglibdir = $(libdir)/psModule
     22pkgincludedir = $(includedir)/psModule
     23top_builddir = ..
     24
     25am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
     26INSTALL = /usr/bin/install -c
     27install_sh_DATA = $(install_sh) -c -m 644
     28install_sh_PROGRAM = $(install_sh) -c
     29install_sh_SCRIPT = $(install_sh) -c
     30INSTALL_HEADER = $(INSTALL_DATA)
     31transform = $(program_transform_name)
     32NORMAL_INSTALL = :
     33PRE_INSTALL = :
     34POST_INSTALL = :
     35NORMAL_UNINSTALL = :
     36PRE_UNINSTALL = :
     37POST_UNINSTALL = :
     38host_triplet = i686-redhat-linux-gnu
     39ACLOCAL = ${SHELL} /home/gusciora/dragon/PAN/CVS/psModule/missing --run aclocal-1.7
     40AMDEP_FALSE = #
     41AMDEP_TRUE =
     42AMTAR = ${SHELL} /home/gusciora/dragon/PAN/CVS/psModule/missing --run tar
     43AR = ar
     44AUTOCONF = ${SHELL} /home/gusciora/dragon/PAN/CVS/psModule/missing --run autoconf
     45AUTOHEADER = ${SHELL} /home/gusciora/dragon/PAN/CVS/psModule/missing --run autoheader
     46AUTOMAKE = ${SHELL} /home/gusciora/dragon/PAN/CVS/psModule/missing --run automake-1.7
     47AWK = gawk
     48CC = gcc
     49CCDEPMODE = depmode=gcc3
     50CFLAGS = -g -O2 -g2 -Wall -std=c99 -D_GNU_SOURCE -I/home/gusciora/dragon/PAN/CVS/psLib//include -I/usr/local/include
     51CPP = gcc -E
     52CPPFLAGS =
     53CXX = g++
     54CXXCPP = g++ -E
     55CXXDEPMODE = depmode=gcc3
     56CXXFLAGS = -g -O2
     57CYGPATH_W = echo
     58DEFS = -DHAVE_CONFIG_H
     59DEPDIR = .deps
     60ECHO = echo
     61ECHO_C =
     62ECHO_N = -n
     63ECHO_T =
     64EGREP = grep -E
     65EXEEXT =
     66F77 = g77
     67FFLAGS = -g -O2
     68GSL_CONFIG = /usr/local/bin/gsl-config
     69INSTALL_DATA = ${INSTALL} -m 644
     70INSTALL_PROGRAM = ${INSTALL}
     71INSTALL_SCRIPT = ${INSTALL}
     72INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
     73LDFLAGS =  -L/home/gusciora/dragon/PAN/CVS/psLib//lib -L/usr/local/lib-L/usr/local/lib -lgsl -lgslcblas -lm
     74LIBOBJS =
     75LIBS = -lpslib -lgslcblas -lgsl -lfftw3f -lcfitsio -lsla
     76LIBTOOL = $(SHELL) $(top_builddir)/libtool
     77LN_S = ln -s
     78LTLIBOBJS =
     79MAKEINFO = ${SHELL} /home/gusciora/dragon/PAN/CVS/psModule/missing --run makeinfo
     80OBJEXT = o
     81PACKAGE = psModule
     82PACKAGE_BUGREPORT =
     83PACKAGE_NAME =
     84PACKAGE_STRING =
     85PACKAGE_TARNAME =
     86PACKAGE_VERSION =
     87PATH_SEPARATOR = :
     88RANLIB = ranlib
     89SET_MAKE =
     90SHELL = /bin/sh
     91STRIP = strip
     92VERSION = 0.1
     93ac_ct_AR = ar
     94ac_ct_CC = gcc
     95ac_ct_CXX = g++
     96ac_ct_F77 = g77
     97ac_ct_RANLIB = ranlib
     98ac_ct_STRIP = strip
     99am__fastdepCC_FALSE = #
     100am__fastdepCC_TRUE =
     101am__fastdepCXX_FALSE = #
     102am__fastdepCXX_TRUE =
     103am__include = include
     104am__leading_dot = .
     105am__quote =
     106bindir = ${exec_prefix}/bin
     107build = i686-redhat-linux-gnu
     108build_alias =
     109build_cpu = i686
     110build_os = linux-gnu
     111build_vendor = redhat
     112datadir = ${prefix}/share
     113exec_prefix = ${prefix}
     114host = i686-redhat-linux-gnu
     115host_alias =
     116host_cpu = i686
     117host_os = linux-gnu
     118host_vendor = redhat
     119includedir = ${prefix}/include
     120infodir = ${prefix}/info
     121install_sh = /home/gusciora/dragon/PAN/CVS/psModule/install-sh
     122libdir = ${exec_prefix}/lib
     123libexecdir = ${exec_prefix}/libexec
     124localstatedir = ${prefix}/var
     125mandir = ${prefix}/man
     126oldincludedir = /usr/include
     127prefix = /usr/local
     128program_transform_name = s,x,x,
     129sbindir = ${exec_prefix}/sbin
     130sharedstatedir = ${prefix}/com
     131sysconfdir = ${prefix}/etc
     132target_alias =
     133lib_LIBRARIES = libpsmodule.a
     134bin_PROGRAMS = tst_pmFlatField tst_pmMaskBadPixels
     135
     136libpsmodule_a_SOURCES = pmFlatField.c pmMaskBadPixels.c psTest.c
     137libpsmodule_a_HEADERS = pmFlatField.h pmMaskBadPixels.h psTest.h
     138libpsmodule_adir = .
     139
     140tst_pmFlatField_SOURCES = tst_pmFlatField.c
     141tst_pmFlatField_LDFLAGS = libpsmodule.a
     142
     143tst_pmMaskBadPixels_SOURCES = tst_pmMaskBadPixels.c
     144tst_pmMaskBadPixels_LDFLAGS = libpsmodule.a
     145subdir = src
     146ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     147mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
     148CONFIG_HEADER = config.h
     149CONFIG_CLEAN_FILES =
     150LIBRARIES = $(lib_LIBRARIES)
     151
     152libpsmodule_a_AR = $(AR) cru
     153libpsmodule_a_LIBADD =
     154am_libpsmodule_a_OBJECTS = pmFlatField.$(OBJEXT) \
     155        pmMaskBadPixels.$(OBJEXT) psTest.$(OBJEXT)
     156libpsmodule_a_OBJECTS = $(am_libpsmodule_a_OBJECTS)
     157bin_PROGRAMS = tst_pmFlatField$(EXEEXT) tst_pmMaskBadPixels$(EXEEXT)
     158PROGRAMS = $(bin_PROGRAMS)
     159
     160am_tst_pmFlatField_OBJECTS = tst_pmFlatField.$(OBJEXT)
     161tst_pmFlatField_OBJECTS = $(am_tst_pmFlatField_OBJECTS)
     162tst_pmFlatField_LDADD = $(LDADD)
     163tst_pmFlatField_DEPENDENCIES =
     164am_tst_pmMaskBadPixels_OBJECTS = tst_pmMaskBadPixels.$(OBJEXT)
     165tst_pmMaskBadPixels_OBJECTS = $(am_tst_pmMaskBadPixels_OBJECTS)
     166tst_pmMaskBadPixels_LDADD = $(LDADD)
     167tst_pmMaskBadPixels_DEPENDENCIES =
     168
     169DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
     170depcomp = $(SHELL) $(top_srcdir)/depcomp
     171am__depfiles_maybe = depfiles
     172DEP_FILES = ./$(DEPDIR)/pmFlatField.Po \
     173        ./$(DEPDIR)/pmMaskBadPixels.Po \
     174        ./$(DEPDIR)/psTest.Po \
     175        ./$(DEPDIR)/tst_pmFlatField.Po \
     176        ./$(DEPDIR)/tst_pmMaskBadPixels.Po
     177COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
     178        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
     179LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
     180        $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
     181CCLD = $(CC)
     182LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
     183        $(AM_LDFLAGS) $(LDFLAGS) -o $@
     184DIST_SOURCES = $(libpsmodule_a_SOURCES) $(tst_pmFlatField_SOURCES) \
     185        $(tst_pmMaskBadPixels_SOURCES)
     186HEADERS = $(libpsmodule_a_HEADERS)
     187
     188DIST_COMMON = $(libpsmodule_a_HEADERS) $(srcdir)/Makefile.in \
     189        Makefile.am config.h.in
     190SOURCES = $(libpsmodule_a_SOURCES) $(tst_pmFlatField_SOURCES) $(tst_pmMaskBadPixels_SOURCES)
     191
     192all: config.h
     193        $(MAKE) $(AM_MAKEFLAGS) all-am
     194
     195.SUFFIXES:
     196.SUFFIXES: .c .lo .o .obj
     197$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
     198        cd $(top_srcdir) && \
     199          $(AUTOMAKE) --gnu  src/Makefile
     200Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
     201        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
     202
     203config.h: stamp-h1
     204        @if test ! -f $@; then \
     205          rm -f stamp-h1; \
     206          $(MAKE) stamp-h1; \
     207        else :; fi
     208
     209stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
     210        @rm -f stamp-h1
     211        cd $(top_builddir) && $(SHELL) ./config.status src/config.h
     212
     213$(srcdir)/config.h.in:  $(top_srcdir)/configure.in $(ACLOCAL_M4)
     214        cd $(top_srcdir) && $(AUTOHEADER)
     215        touch $(srcdir)/config.h.in
     216
     217distclean-hdr:
     218        -rm -f config.h stamp-h1
     219libLIBRARIES_INSTALL = $(INSTALL_DATA)
     220install-libLIBRARIES: $(lib_LIBRARIES)
     221        @$(NORMAL_INSTALL)
     222        $(mkinstalldirs) $(DESTDIR)$(libdir)
     223        @list='$(lib_LIBRARIES)'; for p in $$list; do \
     224          if test -f $$p; then \
     225            f="`echo $$p | sed -e 's|^.*/||'`"; \
     226            echo " $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f"; \
     227            $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f; \
     228          else :; fi; \
     229        done
     230        @$(POST_INSTALL)
     231        @list='$(lib_LIBRARIES)'; for p in $$list; do \
     232          if test -f $$p; then \
     233            p="`echo $$p | sed -e 's|^.*/||'`"; \
     234            echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
     235            $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
     236          else :; fi; \
     237        done
     238
     239uninstall-libLIBRARIES:
     240        @$(NORMAL_UNINSTALL)
     241        @list='$(lib_LIBRARIES)'; for p in $$list; do \
     242          p="`echo $$p | sed -e 's|^.*/||'`"; \
     243          echo " rm -f $(DESTDIR)$(libdir)/$$p"; \
     244          rm -f $(DESTDIR)$(libdir)/$$p; \
     245        done
     246
     247clean-libLIBRARIES:
     248        -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
     249libpsmodule.a: $(libpsmodule_a_OBJECTS) $(libpsmodule_a_DEPENDENCIES)
     250        -rm -f libpsmodule.a
     251        $(libpsmodule_a_AR) libpsmodule.a $(libpsmodule_a_OBJECTS) $(libpsmodule_a_LIBADD)
     252        $(RANLIB) libpsmodule.a
     253binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
     254install-binPROGRAMS: $(bin_PROGRAMS)
     255        @$(NORMAL_INSTALL)
     256        $(mkinstalldirs) $(DESTDIR)$(bindir)
     257        @list='$(bin_PROGRAMS)'; for p in $$list; do \
     258          p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
     259          if test -f $$p \
     260             || test -f $$p1 \
     261          ; then \
     262            f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
     263           echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
     264           $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
     265          else :; fi; \
     266        done
     267
     268uninstall-binPROGRAMS:
     269        @$(NORMAL_UNINSTALL)
     270        @list='$(bin_PROGRAMS)'; for p in $$list; do \
     271          f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
     272          echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
     273          rm -f $(DESTDIR)$(bindir)/$$f; \
     274        done
     275
     276clean-binPROGRAMS:
     277        @list='$(bin_PROGRAMS)'; for p in $$list; do \
     278          f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
     279          echo " rm -f $$p $$f"; \
     280          rm -f $$p $$f ; \
     281        done
     282tst_pmFlatField$(EXEEXT): $(tst_pmFlatField_OBJECTS) $(tst_pmFlatField_DEPENDENCIES)
     283        @rm -f tst_pmFlatField$(EXEEXT)
     284        $(LINK) $(tst_pmFlatField_LDFLAGS) $(tst_pmFlatField_OBJECTS) $(tst_pmFlatField_LDADD) $(LIBS)
     285tst_pmMaskBadPixels$(EXEEXT): $(tst_pmMaskBadPixels_OBJECTS) $(tst_pmMaskBadPixels_DEPENDENCIES)
     286        @rm -f tst_pmMaskBadPixels$(EXEEXT)
     287        $(LINK) $(tst_pmMaskBadPixels_LDFLAGS) $(tst_pmMaskBadPixels_OBJECTS) $(tst_pmMaskBadPixels_LDADD) $(LIBS)
     288
     289mostlyclean-compile:
     290        -rm -f *.$(OBJEXT) core *.core
     291
     292distclean-compile:
     293        -rm -f *.tab.c
     294
     295include ./$(DEPDIR)/pmFlatField.Po
     296include ./$(DEPDIR)/pmMaskBadPixels.Po
     297include ./$(DEPDIR)/psTest.Po
     298include ./$(DEPDIR)/tst_pmFlatField.Po
     299include ./$(DEPDIR)/tst_pmMaskBadPixels.Po
     300
     301.c.o:
     302        if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
     303          -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
     304        then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
     305        else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
     306        fi
     307#       source='$<' object='$@' libtool=no \
     308#       depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
     309#       $(CCDEPMODE) $(depcomp) \
     310#       $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
     311
     312.c.obj:
     313        if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
     314          -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
     315        then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
     316        else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
     317        fi
     318#       source='$<' object='$@' libtool=no \
     319#       depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
     320#       $(CCDEPMODE) $(depcomp) \
     321#       $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
     322
     323.c.lo:
     324        if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
     325          -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
     326        then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
     327        else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
     328        fi
     329#       source='$<' object='$@' libtool=yes \
     330#       depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' \
     331#       $(CCDEPMODE) $(depcomp) \
     332#       $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
     333
     334mostlyclean-libtool:
     335        -rm -f *.lo
     336
     337clean-libtool:
     338        -rm -rf .libs _libs
     339
     340distclean-libtool:
     341        -rm -f libtool
     342uninstall-info-am:
     343libpsmodule_aHEADERS_INSTALL = $(INSTALL_HEADER)
     344install-libpsmodule_aHEADERS: $(libpsmodule_a_HEADERS)
     345        @$(NORMAL_INSTALL)
     346        $(mkinstalldirs) $(DESTDIR)$(libpsmodule_adir)
     347        @list='$(libpsmodule_a_HEADERS)'; for p in $$list; do \
     348          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
     349          f="`echo $$p | sed -e 's|^.*/||'`"; \
     350          echo " $(libpsmodule_aHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libpsmodule_adir)/$$f"; \
     351          $(libpsmodule_aHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libpsmodule_adir)/$$f; \
     352        done
     353
     354uninstall-libpsmodule_aHEADERS:
     355        @$(NORMAL_UNINSTALL)
     356        @list='$(libpsmodule_a_HEADERS)'; for p in $$list; do \
     357          f="`echo $$p | sed -e 's|^.*/||'`"; \
     358          echo " rm -f $(DESTDIR)$(libpsmodule_adir)/$$f"; \
     359          rm -f $(DESTDIR)$(libpsmodule_adir)/$$f; \
     360        done
     361
     362ETAGS = etags
     363ETAGSFLAGS =
     364
     365CTAGS = ctags
     366CTAGSFLAGS =
     367
     368tags: TAGS
     369
     370ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
     371        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
     372        unique=`for i in $$list; do \
     373            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
     374          done | \
     375          $(AWK) '    { files[$$0] = 1; } \
     376               END { for (i in files) print i; }'`; \
     377        mkid -fID $$unique
     378
     379TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
     380                $(TAGS_FILES) $(LISP)
     381        tags=; \
     382        here=`pwd`; \
     383        list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
     384        unique=`for i in $$list; do \
     385            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
     386          done | \
     387          $(AWK) '    { files[$$0] = 1; } \
     388               END { for (i in files) print i; }'`; \
     389        test -z "$(ETAGS_ARGS)$$tags$$unique" \
     390          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     391             $$tags $$unique
     392
     393ctags: CTAGS
     394CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
     395                $(TAGS_FILES) $(LISP)
     396        tags=; \
     397        here=`pwd`; \
     398        list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
     399        unique=`for i in $$list; do \
     400            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
     401          done | \
     402          $(AWK) '    { files[$$0] = 1; } \
     403               END { for (i in files) print i; }'`; \
     404        test -z "$(CTAGS_ARGS)$$tags$$unique" \
     405          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
     406             $$tags $$unique
     407
     408GTAGS:
     409        here=`$(am__cd) $(top_builddir) && pwd` \
     410          && cd $(top_srcdir) \
     411          && gtags -i $(GTAGS_ARGS) $$here
     412
     413distclean-tags:
     414        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
     415DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
     416
     417top_distdir = ..
     418distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
     419
     420distdir: $(DISTFILES)
     421        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
     422        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
     423        list='$(DISTFILES)'; for file in $$list; do \
     424          case $$file in \
     425            $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
     426            $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
     427          esac; \
     428          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
     429          dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
     430          if test "$$dir" != "$$file" && test "$$dir" != "."; then \
     431            dir="/$$dir"; \
     432            $(mkinstalldirs) "$(distdir)$$dir"; \
     433          else \
     434            dir=''; \
     435          fi; \
     436          if test -d $$d/$$file; then \
     437            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
     438              cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
     439            fi; \
     440            cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
     441          else \
     442            test -f $(distdir)/$$file \
     443            || cp -p $$d/$$file $(distdir)/$$file \
     444            || exit 1; \
     445          fi; \
     446        done
     447check-am: all-am
     448check: check-am
     449all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) config.h
     450
     451installdirs:
     452        $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(libpsmodule_adir)
     453install: install-am
     454install-exec: install-exec-am
     455install-data: install-data-am
     456uninstall: uninstall-am
     457
     458install-am: all-am
     459        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
     460
     461installcheck: installcheck-am
     462install-strip:
     463        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
     464          INSTALL_STRIP_FLAG=-s \
     465          `test -z '$(STRIP)' || \
     466            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
     467mostlyclean-generic:
     468
     469clean-generic:
     470
     471distclean-generic:
     472        -rm -f $(CONFIG_CLEAN_FILES)
     473
     474maintainer-clean-generic:
     475        @echo "This command is intended for maintainers to use"
     476        @echo "it deletes files that may require special tools to rebuild."
     477clean: clean-am
     478
     479clean-am: clean-binPROGRAMS clean-generic clean-libLIBRARIES \
     480        clean-libtool mostlyclean-am
     481
     482distclean: distclean-am
     483        -rm -rf ./$(DEPDIR)
     484        -rm -f Makefile
     485distclean-am: clean-am distclean-compile distclean-generic distclean-hdr \
     486        distclean-libtool distclean-tags
     487
     488dvi: dvi-am
     489
     490dvi-am:
     491
     492info: info-am
     493
     494info-am:
     495
     496install-data-am: install-libpsmodule_aHEADERS
     497
     498install-exec-am: install-binPROGRAMS install-libLIBRARIES
     499
     500install-info: install-info-am
     501
     502install-man:
     503
     504installcheck-am:
     505
     506maintainer-clean: maintainer-clean-am
     507        -rm -rf ./$(DEPDIR)
     508        -rm -f Makefile
     509maintainer-clean-am: distclean-am maintainer-clean-generic
     510
     511mostlyclean: mostlyclean-am
     512
     513mostlyclean-am: mostlyclean-compile mostlyclean-generic \
     514        mostlyclean-libtool
     515
     516pdf: pdf-am
     517
     518pdf-am:
     519
     520ps: ps-am
     521
     522ps-am:
     523
     524uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
     525        uninstall-libLIBRARIES uninstall-libpsmodule_aHEADERS
     526
     527.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
     528        clean-generic clean-libLIBRARIES clean-libtool ctags distclean \
     529        distclean-compile distclean-generic distclean-hdr \
     530        distclean-libtool distclean-tags distdir dvi dvi-am info \
     531        info-am install install-am install-binPROGRAMS install-data \
     532        install-data-am install-exec install-exec-am install-info \
     533        install-info-am install-libLIBRARIES \
     534        install-libpsmodule_aHEADERS install-man install-strip \
     535        installcheck installcheck-am installdirs maintainer-clean \
     536        maintainer-clean-generic mostlyclean mostlyclean-compile \
     537        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     538        tags uninstall uninstall-am uninstall-binPROGRAMS \
     539        uninstall-info-am uninstall-libLIBRARIES \
     540        uninstall-libpsmodule_aHEADERS
     541
     542# Tell versions [3.59,3.63) of GNU make to not export all variables.
     543# Otherwise a system limit (for SysV at least) may be exceeded.
     544.NOEXPORT:

  • trunk/psModules/src/pmSubtractBias.c

    r1880 r1883  
    88 *  @author George Gusciora, MHPCC
    99 *
    10  *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2004-09-24 21:05:00 $
     10 *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2004-09-24 22:33:17 $
    1212 *
    1313 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    2222#include<math.h>
    2323#include "pslib.h"
    24 
    25 
    26 //#include "pmSubtractBias.h"
    27 //    PM_OVERSCAN_NONE,                         ///< No overscan subtraction
    28 //    PM_OVERSCAN_ROWS,                         ///< Subtract rows
    29 //    PM_OVERSCAN_COLUMNS,                      ///< Subtract columns
    30 //    PM_OVERSCAN_ALL                           ///< Subtract the statistic of all pixels in overscan region
    31 //} pmOverScanAxis;
    32 //typedef enum {
    33 //    PM_FIT_NONE,                              ///< No fit
    34 //    PM_FIT_POLYNOMIAL,                        ///< Fit polynomial
    35 //    PM_FIT_SPLINE                             ///< Fit cubic splines
     24#include "pmSubtractBias.h"
    3625
    3726#define PM_SUBTRACT_BIAS_POLYNOMIAL_ORDER 2
    … …  
    7362// XXX: Is there already a function which does this?
    7463psImage *p_psImageSubtractScalar(psImage *image,
    75                                  float *scalar)
     64                                 float scalar)
    7665{
    7766    int i;
    … …  
    8069    for (i=0;i<image->numRows;i++) {
    8170        for (j=0;j<image->numCols;j++) {
    82             image->data.F32[i][j]-= scalar;
     71            (image->data.F32[i][j])-= scalar;
    8372        }
    8473    }
    … …  
    9584{
    9685    int numOptions = 0;
    97     psStatsOptions opt;
     86    psStatsOptions opt = 0;
    9887
    9988    if (stat->options & PS_STAT_SAMPLE_MEAN) {
    … …  
    137126    }
    138127
     128    if (numOptions == 0) {
     129        // XXX: psErrorMsg()
     130    }
    139131    if (numOptions != 1) {
    140 \\ XXX:
    141         Generate warning message.
    142     }
    143 
     132        // XXX:Generate warning message.
     133    }
    144134    return(opt);
    145135}
    146136
    147137// XXX: Must scale the overscan vector
    148 psVector *ScaleOverscanVector(overscanVector,
    149                               (in->image)->numCols,
     138
     139psVector *ScaleOverscanVector(psVector *overscanVector,
     140                              int n,
    150141                              pmFit fit)
    151142{
    152143    return(overscanVector);
    153144}
    154 
    155145
    156146psReadout *pmSubtractBias(psReadout *in,
    … …  
    158148                          const psList *overscans,
    159149                          pmOverscanAxis overScanAxis,
    160                           const psStats *stat,
     150                          psStats *stat,
    161151                          int nBin,
    162152                          pmFit fit,
    … …  
    165155    int i;
    166156    int j;
    167     int nBin;
    168     int numBins;
     157    int numBins = 0;
    169158    static psVector *overscanVector = NULL;
    170159    psVector *tmpRow = NULL;
    171160    psVector *tmpCol = NULL;
    172     psVector *tmpMask = NULL;
    173161    psVector *myBin = NULL;
    174162    psVector *binVec = NULL;
    175     psList *tmpOverscan = NULL;
     163    psListElem *tmpOverscan = NULL;
     164    double statValue;
     165    psImage *myOverscanImage = NULL;
     166    psPolynomial1D *myPoly;
     167    psSpline1D *mySpline;
    176168
    177169    if (in == NULL) {
    … …  
    208200    if (overScanAxis == PM_OVERSCAN_ALL) {
    209201        psImageStats(stat, in->image, in->mask, 0xffffffff);
    210         p_psImageSubtractScalar(in->image, stat->value);
     202        p_psGetStatValue(stat, &statValue);
     203        p_psImageSubtractScalar(in->image, statValue);
    211204        return(in);
    212205    }
    … …  
    215208    // having to copy every element in that vector?
    216209
    217     // XXX: If we get here, do we know that overScanAxis == PM_OVERSCAN_ROW
     210    // XXX: If we get here, do we know that overScanAxis == PM_OVERSCAN_ROWS
    218211    // or PM_OVERSCAN_COL?
    219212
    220213    // XXX: How to use multiple overscans?  Currently, only the first is used.
    221     if ((overScanAxis == PM_OVERSCAN_ROW) || (overScanAxis == PM_OVERSCAN_COL)) {
    222         myOverscanImage = (psImage *) overscans->data;
    223 
    224         if (overScanAxis == PM_OVERSCAN_ROW) {
    225             overscanVector = psVectorAlloc((myOverscanImage->image)->numCols, PS_TYPE_F32);
     214    if ((overScanAxis == PM_OVERSCAN_ROWS) || (overScanAxis == PM_OVERSCAN_COLUMNS)) {
     215        myOverscanImage = (psImage *) ((overscans->head)->data);
     216
     217        if (overScanAxis == PM_OVERSCAN_ROWS) {
     218            overscanVector = psVectorAlloc(myOverscanImage->numCols, PS_TYPE_F32);
    226219            for (i=0;i<overscanVector->n;i++) {
    227220                overscanVector->data.F32[i] = 0.0;
    228221            }
    229222            tmpRow = psVectorAlloc((in->image)->numCols, PS_TYPE_F32);
    230             tmpMask = psVectorAlloc((in->image)->numCols, PS_TYPE_U8);
    231 
    232             tmpOverscan = (psList *) overscans;
     223
     224            tmpOverscan = (psListElem *) overscans->head;
    233225            while (tmpOverscan) {
    234226                myOverscanImage = (psImage *) tmpOverscan->data;
    235                 for (i=0;i<(myOverscanImage->image)->numCols;i++) {
    236                     for (j=0;j<(myOverscanImage->image)->numRows;j++) {
    237                         tmpRow->data.F32[j] = (myOverscanImage->image)->data.F32[i][j];
    238                         tmpMask->data.U8[j] = (myOverscanImage->mask)->data.U8[i][j];
     227                for (i=0;i<myOverscanImage->numCols;i++) {
     228                    for (j=0;j<myOverscanImage->numRows;j++) {
     229                        tmpRow->data.F32[j] = myOverscanImage->data.F32[i][j];
    239230                    }
    240                     stat = psVectorStats(stat, tmpRow, tmpMask, 0xffffffff);
    241                     overscanVector->data.F32[i] = stat->value;
    242                 }
    243                 //                tmpOverscan = tmpOverscan->next;
    244 tmpOverscan = NULL:
    245                           }
    246 
    247                           psFree(tmpRow);
    248             psFree(tmpMask);
     231                    stat = psVectorStats(stat, tmpRow, NULL, 0xffffffff);
     232                    p_psGetStatValue(stat, &statValue);
     233                    overscanVector->data.F32[i] = statValue;
     234
     235                }
     236                // tmpOverscan = tmpOverscan->next;
     237                tmpOverscan = NULL;
     238            }
     239            psFree(tmpRow);
    249240            ScaleOverscanVector(overscanVector, (in->image)->numCols, fit);
    250241        }
    251         if (overScanAxis == PM_OVERSCAN_COL) {
    252             overscanVector = psVectorAlloc((myOverscanImage->image)->numRows, PS_TYPE_F32);
     242        if (overScanAxis == PM_OVERSCAN_COLUMNS) {
     243            overscanVector = psVectorAlloc(myOverscanImage->numRows, PS_TYPE_F32);
    253244            for (i=0;i<overscanVector->n;i++) {
    254245                overscanVector->data.F32[i] = 0.0;
    255246            }
    256             tmpcol = psVectorAlloc((in->image)->numRows, PS_TYPE_F32);
    257             tmpMask = psVectorAlloc((in->image)->nuRows, PS_TYPE_U8);
    258 
    259             tmpOverscan = (psList *) overscans;
     247            tmpCol = psVectorAlloc((in->image)->numRows, PS_TYPE_F32);
     248
     249            tmpOverscan = (psListElem *) overscans->head;
    260250            while (tmpOverscan) {
    261                 for (i=0;i<(myOverscanImage->image)->numRows;i++) {
    262                     for (j=0;j<(myOverscanImage->image)->numCols;j++) {
    263                         tmpRow->data.F32[j] = (myOverscanImage->image)->data.F32[i][j];
    264                         tmpMask->data.U8[j] = (myOverscanImage->mask)->data.U8[i][j];
     251                for (i=0;i<myOverscanImage->numRows;i++) {
     252                    for (j=0;j<myOverscanImage->numCols;j++) {
     253                        tmpRow->data.F32[j] = myOverscanImage->data.F32[i][j];
    265254                    }
    266                     stat = psVectorStats(stat, tmpRow, tmpMask, 0xffffffff);
    267                     overscanVector->data.F32[i] = stat->value;
     255                    stat = psVectorStats(stat, tmpRow, NULL, 0xffffffff);
     256                    p_psGetStatValue(stat, &statValue);
     257                    overscanVector->data.F32[i] = statValue;
    268258                }
    269259                //                tmpOverscan = tmpOverscan->next;
    270 tmpOverscan = NULL:
    271                           }
    272                           psFree(tmpCol);
    273             psFree(tmpMask);
     260                tmpOverscan = NULL;
     261            }
     262            psFree(tmpCol);
    274263            ScaleOverscanVector(overscanVector, (in->image)->numRows, fit);
    275264        }
    … …  
    277266        if ((nBin > 0) && (nBin < overscanVector->n)) {
    278267            numBins = 1+((overscanVector->n)/nBin);
    279             psVector *myBin = psVectorAlloc(numBins, PS_TYPE_F32);
     268            myBin = psVectorAlloc(numBins, PS_TYPE_F32);
    280269            binVec = psVectorAlloc(nBin, PS_TYPE_F32);
    281270
    … …  
    292281                }
    293282                stat = psVectorStats(stat, binVec, NULL, 0);
    294                 myBin->data.F32[i] = stat->value;
     283                p_psGetStatValue(stat, &statValue);
     284                myBin->data.F32[i] = statValue;
     285
    295286            }
    296287            // Change the effective size of overscanVector.
    … …  
    314305
    315306            } else if (fit == PM_FIT_SPLINE) {
    316                 mySpline = (psSPline1D *) fitSpec;
     307                mySpline = (psSpline1D *) fitSpec;
    317308                // XXX: What is the point of doing this?
    318309            }
    319310        }
    320311
    321         if (overScanAxis == PM_OVERSCAN_ROW) {
     312        if (overScanAxis == PM_OVERSCAN_ROWS) {
    322313            for (i=0;i<(in->image)->numCols;i++) {
    323314                for (j=0;j<(in->image)->numRows;j++) {
    … …  
    327318        }
    328319
    329         if (overScanAxis == PM_OVERSCAN_COLUMN) {
     320        if (overScanAxis == PM_OVERSCAN_COLUMNS) {
    330321            for (i=0;i<(in->image)->numRows;i++) {
    331322                for (j=0;j<(in->image)->numCols;j++) {
    … …  
    343334
    344335    // XXX: psErrorMsg(): Shouldn't get here?
    345 }
    346 
     336    return(in);
     337}
     338
     339

  • trunk/psModules/src/pmSubtractBias.h

    r1862 r1883  
    88 *  @author George Gusciora, MHPCC
    99 *
    10  *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2004-09-23 06:48:30 $
     10 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2004-09-24 22:33:17 $
    1212 *
    1313 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3131    PM_OVERSCAN_COLUMNS,                      ///< Subtract columns
    3232    PM_OVERSCAN_ALL                           ///< Subtract the statistic of all pixels in overscan region
    33 } pmOverScanAxis;
     33} pmOverscanAxis;
    3434
    3535typedef enum {
    … …  
    4343                          const psList *overscans,
    4444                          pmOverscanAxis overScanAxis,
    45                           const psStats *stat,
     45                          psStats *stat,
    4646                          int nBin,
    4747                          pmFit fit,
Note: See TracChangeset for help on using the changeset viewer.