Changeset 11735

Timestamp:

Feb 9, 2007, 12:14:24 PM (19 years ago)

Author:

jhoblitt

Message:

p2/p3 version reorg

Location:

trunk/ippTools

Files:

• configure.ac (modified) (1 diff)
• src/camtool.c (modified) (2 diffs)
• src/chiptool.c (modified) (3 diffs)
• src/regtool.c (modified) (2 diffs)

trunk/ippTools/configure.ac

@@ -18 +18 @@
 PKG_CHECK_MODULES([PSLIB], [pslib >= 1.1.0])
 PKG_CHECK_MODULES([PSMODULES], [psmodules >= 1.1.0])
-PKG_CHECK_MODULES([IPPDB], [ippdb >= 1.1.3]) 
+PKG_CHECK_MODULES([IPPDB], [ippdb >= 1.1.4]) 
 
 PXTOOLS_CFLAGS="${PSLIB_CFLAGS=} ${PSMODULES_CFLAGS=} ${IPPDB_CFLAGS=}"

trunk/ippTools/src/camtool.c

@@ -396 +396 @@
     p3ProcessedExpRow *row = p3ProcessedExpRowAlloc(
         exp_tag,
+        pendingRow->p3_version,
+        pendingRow->p2_version,
+        pendingRow->label,
         uri,
         recipe,
@@ -408 +411 @@
         zp_mean,
         zp_stdev,
-        pendingRow->p2_version,
-        pendingRow->p3_version,
-        pendingRow->label,
         code
     );

trunk/ippTools/src/chiptool.c

@@ -859 +859 @@
     return p2ProcessedImfileRowAlloc(
         imfile->exp_tag,
+        imfile->p2_version,
+        imfile->p1_version,
         imfile->class_id,
+        recipe,
         uri,
-        recipe,
         bg,
         bg_stdev,
@@ -867 +869 @@
         b1_uri,
         b2_uri,
-        imfile->p1_version,
-        imfile->p2_version,
         code
     );
@@ -880 +880 @@
     return p2ProcessedExpRowAlloc(
         pendingExp->exp_tag,
+        pendingExp->p2_version,
         pendingExp->p1_version,
+        pendingExp->label
+    );
+}
+
+
+static p3PendingExpRow *p2PendingToP3PendingExp(pxConfig *config, p2PendingExpRow *pendingExp)
+{
+    PS_ASSERT_PTR_NON_NULL(pendingExp, NULL);
+
+    return p3PendingExpRowAlloc(
+        pendingExp->exp_tag,
+        0x0,        // p3 version
         pendingExp->p2_version,
         pendingExp->label
     );
 }
-
-
-static p3PendingExpRow *p2PendingToP3PendingExp(pxConfig *config, p2PendingExpRow *pendingExp)
-{
-    PS_ASSERT_PTR_NON_NULL(pendingExp, NULL);
-
-    return p3PendingExpRowAlloc(
-        pendingExp->exp_tag,
-        pendingExp->p1_version,
-        pendingExp->p2_version,
-        pendingExp->label
-    );
-}

trunk/ippTools/src/regtool.c

@@ -929 +929 @@
     p2PendingExpRow *p2Exp = p2PendingExpRowAlloc(
         exp->exp_tag,
-        "my recipe",
-        0xff,   // XXX calc version number
-        0xff,   // XXX calc version number
-        label 
+        0x0,          // p2 version XXX calc version number
+        0xdeadbeef,   // p1 version
+        label,
+        "my recipe"
     );
 
@@ -943 +943 @@
     return p2PendingImfileRowAlloc(
         rawImfile->exp_tag,
+        0x0,          // p2 version XXX calc version number
+        0xdeadbeef,   // p1 version
         rawImfile->class_id,
-        rawImfile->uri,
         "my recipe",
-        0xff, // XXX calc version number
-        0xff  // XXX calc version number
+        rawImfile->uri
     );
 }