Changeset 27517 for branches/eam_branches/20100225/ppSub/src/ppSub.h

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• ppSub/src (modified) (1 prop)
• ppSub/src/ppSub.h (modified) (1 diff)

branches/eam_branches/20100225/ppSub/src

@@ -13 +13 @@
 ppSubErrorCodes.c
 ppSubVersionDefinitions.h
+ppSubConvolve

@@ -13 +13 @@
 ppSubErrorCodes.c
 ppSubVersionDefinitions.h
+ppSubConvolve

branches/eam_branches/20100225/ppSub/src/ppSub.h

@@ -165 +165 @@
 bool ppSubCopyPSF (pmFPAfile *output, pmFPAfile *input, pmFPAview *view);
 
+/// Return appropriate exit code
+psExit ppSubExitCode(psExit exitValue   // Current exit value
+    );
+
 ///@}
 #endif

@@ -13 +13 @@
 ppSubErrorCodes.c
 ppSubVersionDefinitions.h
+ppSubConvolve