Changeset 34700 for trunk

Timestamp:

Nov 27, 2012, 9:51:44 AM (14 years ago)

Author:

bills

Message:

source id must be less than 0x100

File:

• trunk/Ohana/src/addstar/src/psps_ids.c (modified) (2 diffs)

trunk/Ohana/src/addstar/src/psps_ids.c

@@ -21 +21 @@
 CreatePSPSStackDetectionID(int sourceID, int imageID, int detID)
 {
-  // sourceID : ID of database + table that tracked the image (< 0x100 = 256)
+  // sourceID : ID of database + table that tracked the image (< 0x100 = 127)
   // imageID : external ID of the image which provided the detections (< 0x1000.0000 ~ 2.7e8)
   // detID : detection sequence in image (< 0x1000.0000 ~ 2.7e8)
@@ -27 +27 @@
   assert (detID    < 0x10000000);
   assert (imageID  < 0x10000000);
-  assert (sourceID < 0x100);
+  assert (sourceID < 0x7f);
   
   uint64_t detectid = ((uint64_t)sourceID << 56) + ((uint64_t)imageID << 28) + (uint64_t)detID;