Changeset 34034
- Timestamp:
- Jun 18, 2012, 8:51:06 PM (14 years ago)
- Location:
- branches/eam_branches/ipp-20120601/ippTools/src
- Files:
-
- 6 edited
-
addtool.c (modified) (4 diffs)
-
bgtool.c (modified) (6 diffs)
-
camtool.c (modified) (1 diff)
-
chiptool.c (modified) (5 diffs)
-
difftool.c (modified) (3 diffs)
-
pxerrors.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/eam_branches/ipp-20120601/ippTools/src/addtool.c
r33779 r34034 724 724 725 725 // required 726 PXOPT_LOOKUP_S64(add_id, config->args, "-add_id", true, false);726 // PXOPT_LOOKUP_S64(add_id, config->args, "-add_id", true, false); 727 727 728 728 // optional … … 733 733 PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false); 734 734 PXOPT_LOOKUP_S64(stage_extra1, config->args, "-stage_extra1", false, false); 735 735 736 // generate restrictions 736 737 psMetadata *where = psMetadataAlloc(); … … 1536 1537 1537 1538 // required 1538 PXOPT_LOOKUP_U64(minidvodb_id, config->args, "-minidvodb_id", true, false);1539 // PXOPT_LOOKUP_U64(minidvodb_id, config->args, "-minidvodb_id", true, false); 1539 1540 PXOPT_LOOKUP_STR(minidvodb_group, config->args, "-minidvodb_group", true, false); 1540 1541 … … 1791 1792 psMetadata *where = psMetadataAlloc(); 1792 1793 1793 PXOPT_LOOKUP_U64(minidvodb_id, config->args, "-minidvodb_id", true, false);1794 // PXOPT_LOOKUP_U64(minidvodb_id, config->args, "-minidvodb_id", true, false); 1794 1795 PXOPT_LOOKUP_S16(fault, config->args, "-set_fault", false, false); 1795 1796 PXOPT_LOOKUP_F32(dtime_relphot, config->args, "-set_dtime_relphot", false, false); -
branches/eam_branches/ipp-20120601/ippTools/src/bgtool.c
r30729 r34034 935 935 936 936 // chip_bg_id is required 937 PXOPT_LOOKUP_S64(chip_bg_id, config->args, "-chip_bg_id", true, false);937 // PXOPT_LOOKUP_S64(chip_bg_id, config->args, "-chip_bg_id", true, false); 938 938 939 939 PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); … … 1052 1052 PS_ASSERT_PTR_NON_NULL(config, NULL); 1053 1053 1054 PXOPT_LOOKUP_S64(chip_bg_id, config->args, "-chip_bg_id", true, false);1054 // PXOPT_LOOKUP_S64(chip_bg_id, config->args, "-chip_bg_id", true, false); 1055 1055 PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); 1056 1056 PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); … … 1169 1169 1170 1170 // required 1171 PXOPT_LOOKUP_S64(chip_bg_id, config->args, "-chip_bg_id", true, false);1171 // PXOPT_LOOKUP_S64(chip_bg_id, config->args, "-chip_bg_id", true, false); 1172 1172 PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false); 1173 1173 … … 1222 1222 PS_ASSERT_PTR_NON_NULL(config, false); 1223 1223 1224 PXOPT_LOOKUP_S64(chip_bg_id, config->args, "-chip_bg_id", true, false);1224 // PXOPT_LOOKUP_S64(chip_bg_id, config->args, "-chip_bg_id", true, false); 1225 1225 PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true, false); 1226 1226 PXOPT_LOOKUP_BOOL(clean, config->args, "-clean", false); … … 2017 2017 PS_ASSERT_PTR_NON_NULL(config, NULL); 2018 2018 2019 PXOPT_LOOKUP_S64(warp_bg_id, config->args, "-warp_bg_id", true, false);2019 // PXOPT_LOOKUP_S64(warp_bg_id, config->args, "-warp_bg_id", true, false); 2020 2020 PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); 2021 2021 PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); … … 2133 2133 PS_ASSERT_PTR_NON_NULL(config, false); 2134 2134 2135 PXOPT_LOOKUP_S64(warp_bg_id, config->args, "-warp_bg_id", true, false);2135 // PXOPT_LOOKUP_S64(warp_bg_id, config->args, "-warp_bg_id", true, false); 2136 2136 PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true, false); 2137 2137 PXOPT_LOOKUP_BOOL(clean, config->args, "-clean", false); -
branches/eam_branches/ipp-20120601/ippTools/src/camtool.c
r33332 r34034 1270 1270 PS_ASSERT_PTR_NON_NULL(config, NULL); 1271 1271 1272 PXOPT_LOOKUP_S64(det_id, config->args, "-cam_id", true, false);1272 // PXOPT_LOOKUP_S64(det_id, config->args, "-cam_id", true, false); 1273 1273 PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true, false); 1274 1274 PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); -
branches/eam_branches/ipp-20120601/ippTools/src/chiptool.c
r33617 r34034 254 254 PS_ASSERT_PTR_NON_NULL(config, NULL); 255 255 256 PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", false, false);256 // PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", false, false); 257 257 258 258 psMetadata *where = psMetadataAlloc(); … … 346 346 PS_ASSERT_PTR_NON_NULL(config, NULL); 347 347 348 PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", false, false);348 // PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", false, false); 349 349 350 350 psMetadata *where = psMetadataAlloc(); … … 1017 1017 PXOPT_COPY_S64(config->args, where, "-cam_id", "cam_id", "=="); 1018 1018 1019 PXOPT_LOOKUP_S64(cam_id, config->args, "-cam_id", false, false);1019 // PXOPT_LOOKUP_S64(cam_id, config->args, "-cam_id", false, false); 1020 1020 // if cam_id is not supplied chip_id is required 1021 PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", cam_id ? false : true, false);1022 PXOPT_LOOKUP_S64(class_id, config->args, "-class_id", true, false);1021 // PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", cam_id ? false : true, false); 1022 // PXOPT_LOOKUP_S64(class_id, config->args, "-class_id", true, false); 1023 1023 PXOPT_LOOKUP_S16(quality, config->args, "-set_quality", true, false); 1024 1024 … … 1774 1774 PS_ASSERT_PTR_NON_NULL(config, NULL); 1775 1775 1776 PXOPT_LOOKUP_S64(dummy, config->args, "-chip_id", true, false);1776 // PXOPT_LOOKUP_S64(dummy, config->args, "-chip_id", true, false); 1777 1777 PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true, false); 1778 1778 PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); … … 1937 1937 1938 1938 // PXOPT_LOOKUP_BOOL(all, config->args, "-all", false); 1939 PXOPT_LOOKUP_BOOL(no_magic, config->args, "-no_magic", false);1939 // PXOPT_LOOKUP_BOOL(no_magic, config->args, "-no_magic", false); 1940 1940 1941 1941 PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); -
branches/eam_branches/ipp-20120601/ippTools/src/difftool.c
r33109 r34034 1075 1075 1076 1076 // default 1077 PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);1077 // PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); 1078 1078 PXOPT_LOOKUP_TIME(registered, config->args, "-registered", false, false); 1079 1079 … … 2059 2059 PXOPT_LOOKUP_BOOL(newTemplates,config->args,"-new-templates", false); 2060 2060 2061 PXOPT_LOOKUP_BOOL(available, config->args, "-available", false);2061 // PXOPT_LOOKUP_BOOL(available, config->args, "-available", false); 2062 2062 PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false); 2063 2063 … … 2849 2849 PS_ASSERT_PTR_NON_NULL(config, NULL); 2850 2850 2851 PXOPT_LOOKUP_S64(det_id, config->args, "-diff_id", true, false);2851 // PXOPT_LOOKUP_S64(det_id, config->args, "-diff_id", true, false); 2852 2852 PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true, false); 2853 2853 PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); -
branches/eam_branches/ipp-20120601/ippTools/src/pxerrors.c
r26981 r34034 26 26 psExit pxerrorGetExitStatus(void) { 27 27 28 psErrorCode err = psErrorCodeLast (); 28 // psErrorCodeLast returns a psErrorCode, but we are being a bit sleezy and defining a set 29 // of enum values that have non-overlapping-ranges (not enforced by the compiler) 30 31 int err = psErrorCodeLast (); 29 32 switch (err) { 30 33 case PXTOOLS_ERR_SYS:
Note:
See TracChangeset
for help on using the changeset viewer.
