Changeset 25027 for branches/pap/ippTools/src/pxwarp.c

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/pxwarp.c (modified) (2 diffs)

branches/pap/ippTools/src

@@ -34 +34 @@
 disttool
 receivetool
+
+pubtool

@@ -34 +34 @@
 disttool
 receivetool
+
+pubtool

branches/pap/ippTools/src/pxwarp.c

@@ -126 +126 @@
 
 bool pxwarpQueueByFakeID(pxConfig *config,
-                    psS64 fake_id,
-                    char *workdir,
-                    char *label,
-                    char *dvodb,
-                    char *tess_id,
-                    char *end_stage)
+                         psS64 fake_id,
+                         const char *workdir,
+                         const char *label,
+                         const char *dvodb,
+                         const char *tess_id,
+                         const char *reduction,
+                         const char *end_stage)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -146 +147 @@
         dvodb,
         tess_id,
+                       reduction,
         end_stage,
         NULL,      // registered

@@ -34 +34 @@
 disttool
 receivetool
+
+pubtool