Changeset 29945

Timestamp:

Dec 6, 2010, 9:55:36 AM (15 years ago)

Author:

heather

Message:

psvideophottool initial changes

Location:

branches/haf_branches/videophot2010/ippTools/src

Files:

• Makefile.am (modified) (5 diffs)
• pxtools.h (modified) (1 diff)
• pxvideophot.c (added)
• pxvideophot.h (added)
• videophottool.c (added)
• videophottool.h (added)
• videophottoolConfig.c (added)
• warptool.c (modified) (1 diff)

branches/haf_branches/videophot2010/ippTools/src/Makefile.am

@@ -28 +28 @@
         pubtool \
         diffphottool \
-        minidvodbtool
+        minidvodbtool \
+        videophottool
 
 pkginclude_HEADERS = \
@@ -47 +48 @@
         pxtoolsErrorCodes.h \
         pxtree.h \
+        pxvidephot.h \
         pxwarp.h
 
@@ -76 +78 @@
         pubtool.h \
         diffphottool.h \
-        minidvodbtool.h
+        minidvodbtool.h \
+        videophottool.h
 
 lib_LTLIBRARIES = libpxtools.la
@@ -100 +103 @@
         pxtoolsErrorCodes.c \
         pxtree.c \
+        pxvideophot.c \
         pxwarp.c
 
@@ -284 +288 @@
     diffphottoolConfig.c
 
+videophottool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
+videophottool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
+videophottool_SOURCES = \
+    videophottool.c \
+    videophottoolConfig.c
+
 minidvodbtool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
 minidvodbtool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la

branches/haf_branches/videophot2010/ippTools/src/pxtools.h

@@ -48 +48 @@
 #include "pxmagic.h"
 #include "pxspace.h"
+#include "pxvideophot.h"
 
 # define MAX_ROWS 10e9

branches/haf_branches/videophot2010/ippTools/src/warptool.c

@@ -994 +994 @@
         psString thisWhere = NULL;
         if (whereStr) {
-            psStringAppend(&thisWhere, whereStr);
+          psStringAppend(&thisWhere, "%s", whereStr);
         }
         psStringAppend(&thisWhere, "\nAND warpRun.label = '%s'", label);