Changeset 7263
- Timestamp:
- Jun 1, 2006, 10:24:19 AM (20 years ago)
- Location:
- trunk/ppMerge/src
- Files:
-
- 4 edited
-
Makefile.am (modified) (2 diffs)
-
ppMerge.c (modified) (1 diff)
-
ppMergeScaleZero.c (modified) (1 diff)
-
ppMergeScaleZero.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ppMerge/src/Makefile.am
r7260 r7263 1 1 bin_PROGRAMS = ppMerge 2 2 3 ppMerge_CFLAGS += -g$(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)3 ppMerge_CFLAGS += $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) 4 4 ppMerge_LDFLAGS = $(PSMODULE_LIBS) $(PSLIB_LIBS) 5 5 ### For profiling: … … 9 9 ppMerge_SOURCES = \ 10 10 ppMerge.c \ 11 ppMergeBackground.c \12 11 ppMergeCheckInputs.c \ 13 12 ppMergeCombine.c \ 14 13 ppMergeConfig.c \ 15 14 ppMergeData.c \ 16 ppMergeOptions.c 15 ppMergeOptions.c \ 16 ppMergeScaleZero.c 17 17 18 18 19 19 noinst_HEADERS = \ 20 20 ppMerge.h \ 21 ppMergeBackground.h \22 21 ppMergeCheckInputs.h \ 23 22 ppMergeCombine.h \ 24 23 ppMergeConfig.h \ 25 24 ppMergeData.h \ 26 ppMergeOptions.h 25 ppMergeOptions.h \ 26 ppMergeScaleZero.h 27 27 28 28 CLEANFILES = *~ -
trunk/ppMerge/src/ppMerge.c
r7260 r7263 8 8 #include "ppMergeOptions.h" 9 9 #include "ppMergeCheckInputs.h" 10 #include "ppMergeBackground.h"11 10 #include "ppMergeCombine.h" 11 #include "ppMergeScaleZero.h" 12 12 13 13 //#include "ppMem.h" -
trunk/ppMerge/src/ppMergeScaleZero.c
r7261 r7263 5 5 6 6 #include "ppMerge.h" 7 #include "ppMerge Background.h"7 #include "ppMergeScaleZero.h" 8 8 9 9 #define MAX_ITER 10 // Maximum number of iterations for pmFlatNormalize -
trunk/ppMerge/src/ppMergeScaleZero.h
r7261 r7263 1 #ifndef PP_MERGE_ BACKGROUND_H2 #define PP_MERGE_ BACKGROUND_H1 #ifndef PP_MERGE_SCALE_ZERO_H 2 #define PP_MERGE_SCALE_ZERO_H 3 3 4 4 #include <pslib.h>
Note:
See TracChangeset
for help on using the changeset viewer.
