Changeset 28745
- Timestamp:
- Jul 28, 2010, 2:26:17 PM (16 years ago)
- Location:
- tags/ipp-20100701/ippTools/src
- Files:
-
- 2 edited
-
bgtool.c (modified) (2 diffs, 1 prop)
-
bgtoolConfig.c (modified) (1 diff, 1 prop)
Legend:
- Unmodified
- Added
- Removed
-
tags/ipp-20100701/ippTools/src/bgtool.c
- Property svn:mergeinfo changed
/trunk/ippTools/src/bgtool.c merged: 28743
r28738 r28745 69 69 static const tableData warpTables[] = { 70 70 { "warpBackgroundRun", (void*)&warpBackgroundRunObjectFromMetadata, &warpBackgroundRunInsertObject }, 71 { "warpBackground Imfile", (void*)&warpBackgroundSkyfileObjectFromMetadata, &warpBackgroundSkyfileInsertObject },71 { "warpBackgroundSkyfile", (void*)&warpBackgroundSkyfileObjectFromMetadata, &warpBackgroundSkyfileInsertObject }, 72 72 { NULL, NULL, NULL } 73 73 }; … … 1260 1260 } 1261 1261 1262 psString query = psStringCopy("UPDATE warpBackgroundRun JOIN warpBackgroundSkyfile USING(warp_bg_id)");1262 psString query = psStringCopy("UPDATE warpBackgroundRun"); 1263 1263 bool result = pxUpdateRun(config, where, &query, "warpBackgroundRun", "warp_bg_id", 1264 1264 "warpBackgroundSkyfile", true); - Property svn:mergeinfo changed
-
tags/ipp-20100701/ippTools/src/bgtoolConfig.c
- Property svn:mergeinfo changed
/trunk/ippTools/src/bgtoolConfig.c merged: 28743
r28738 r28745 328 328 psMetadataAddStr(warpArgs, PS_LIST_TAIL, "-dist_group", PS_META_DUPLICATE_OK, "search by dist_group", NULL); 329 329 pxmagicAddArguments(warpArgs); 330 pxspaceAddArguments(warpArgs); 330 331 psMetadataAddBool(warpArgs, PS_LIST_TAIL, "-all", 0, "search without arguments", false); 331 332 psMetadataAddU64(warpArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); - Property svn:mergeinfo changed
Note:
See TracChangeset
for help on using the changeset viewer.
