Changeset 37068 for branches/eam_branches/ipp-ops-20130712/ppBackground/src

Timestamp:

Jul 17, 2014, 12:36:19 PM (12 years ago)

Author:

eugene

Message:

merge changes (from past YEAR) from trunk

Location:

branches/eam_branches/ipp-ops-20130712

Files:

• . (modified) (1 prop)
• ppBackground/src (modified) (1 prop)
• ppBackground/src/Makefile.am (modified) (3 diffs)
• ppBackground/src/ppBackground.c (modified) (1 diff)
• ppBackground/src/ppBackgroundStack.c (copied) (copied from trunk/ppBackground/src/ppBackgroundStack.c )
• ppBackground/src/ppBackgroundStack.h (copied) (copied from trunk/ppBackground/src/ppBackgroundStack.h )
• ppBackground/src/ppBackgroundStackArguments.c (copied) (copied from trunk/ppBackground/src/ppBackgroundStackArguments.c )
• ppBackground/src/ppBackgroundStackCamera.c (copied) (copied from trunk/ppBackground/src/ppBackgroundStackCamera.c )
• ppBackground/src/ppBackgroundStackData.c (copied) (copied from trunk/ppBackground/src/ppBackgroundStackData.c )
• ppBackground/src/ppBackgroundStackLoop.c (copied) (copied from trunk/ppBackground/src/ppBackgroundStackLoop.c )
• ppBackground/src/ppBackgroundStackMath.c (copied) (copied from trunk/ppBackground/src/ppBackgroundStackMath.c )

branches/eam_branches/ipp-ops-20130712/ppBackground/src

@@ -1 +1 @@
 ppBackground
+ppBackgroundStack
 Makefile.in
 config.h
@@ -9 +10 @@
 stamp-h1
 config.h.in
+

@@ -1 +1 @@
 ppBackground
+ppBackgroundStack
 Makefile.in
 config.h
@@ -9 +10 @@
 stamp-h1
 config.h.in
+

branches/eam_branches/ipp-ops-20130712/ppBackground/src/Makefile.am

@@ -1 @@
-bin_PROGRAMS = ppBackground
+bin_PROGRAMS = ppBackground ppBackgroundStack
 
 if HAVE_SVNVERSION
@@ -28 +28 @@
 ppBackground_LDFLAGS  = $(PSLIB_LIBS)   $(PSMODULE_LIBS)   $(PPSTATS_LIBS)   $(PSPHOT_LIBS)   $(PPBACKGROUND_LIBS)
 
+ppBackgroundStack_CPPFLAGS = $(ppBackground_CPPFLAGS)
+ppBackgroundStack_LDFLAGS = $(ppBackground_LDFLAGS)
+
 ppBackground_SOURCES =          \
         ppBackground.c          \
@@ -38 +41 @@
         ppBackgroundErrorCodes.c        \
         ppBackgroundExit.c
+
+ppBackgroundStack_SOURCES = \
+        ppBackgroundStack.c \
+        ppBackgroundStackArguments.c \
+        ppBackgroundStackCamera.c \
+        ppBackgroundStackData.c \
+        ppBackgroundStackLoop.c \
+        ppBackgroundStackMath.c \
+        ppBackgroundVersion.c \
+        ppBackgroundErrorCodes.c \
+        ppBackgroundExit.c
+
 
 noinst_HEADERS = \

branches/eam_branches/ipp-ops-20130712/ppBackground/src/ppBackground.c

@@ -18 +18 @@
     ppBackgroundErrorRegister();
 
+    printf("Initializing data\n");
     ppBackgroundData *data = ppBackgroundDataInit(&argc, argv);
     if (!data) {
         goto DIE;
     }
-
+    printf("Reading Arguments\n");
     if (!ppBackgroundArguments(data, argc, argv)) {
         goto DIE;
     }
-
+    printf("Setting up Camera\n");
     if (!ppBackgroundCamera(data)) {
         goto DIE;
     }
 
+    printf("Looping over data!\n");
     if (!ppBackgroundLoop(data)) {
         goto DIE;

@@ -1 +1 @@
 ppBackground
+ppBackgroundStack
 Makefile.in
 config.h
@@ -9 +10 @@
 stamp-h1
 config.h.in
+