summaryrefslogtreecommitdiff
path: root/src/asdcp-test.cpp
diff options
context:
space:
mode:
authorjhurst <jhurst@cinecert.com>2007-01-19 08:58:05 +0000
committerjhurst <>2007-01-19 08:58:05 +0000
commit984de376d405e0b68e77d61558d4f798fa1170a5 (patch)
tree9767cbae4ad744b88285c8671af60b22c54dfa5d /src/asdcp-test.cpp
parentf0476a3789369459fb91076af4a29372d86d7622 (diff)
updated TEST_NULL debug macros
fixed ReadFileIntoString buffer bug
Diffstat (limited to 'src/asdcp-test.cpp')
-rwxr-xr-xsrc/asdcp-test.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/asdcp-test.cpp b/src/asdcp-test.cpp
index 3d802e9..a2901da 100755
--- a/src/asdcp-test.cpp
+++ b/src/asdcp-test.cpp
@@ -330,7 +330,7 @@ public:
if ( length != KeyLen )
{
- fprintf(stderr, "Unexpected key length: %u, expecting %u characters.\n", KeyLen, length);
+ fprintf(stderr, "Unexpected key length: %u, expecting %u characters.\n", length, KeyLen);
return;
}
}
@@ -344,7 +344,7 @@ public:
if ( length != UUIDlen )
{
- fprintf(stderr, "Unexpected key ID length: %u, expecting %u characters.\n", UUIDlen, length);
+ fprintf(stderr, "Unexpected key ID length: %u, expecting %u characters.\n", length, UUIDlen);
return;
}
}
@@ -352,30 +352,30 @@ public:
case 'f':
TEST_EXTRA_ARG(i, 'f');
- start_frame = atoi(argv[i]); // TODO: test for negative value, should use strtol()
+ start_frame = abs(atoi(argv[i]));
break;
case 'd':
TEST_EXTRA_ARG(i, 'd');
duration_flag = true;
- duration = atoi(argv[i]); // TODO: test for negative value, should use strtol()
+ duration = abs(atoi(argv[i]));
break;
case 'p':
TEST_EXTRA_ARG(i, 'p');
- picture_rate = atoi(argv[i]);
+ picture_rate = abs(atoi(argv[i]));
break;
case 's':
TEST_EXTRA_ARG(i, 's');
- fb_dump_size = atoi(argv[i]);
+ fb_dump_size = abs(atoi(argv[i]));
break;
case 't': mode = MMT_DIGEST; break;
case 'b':
TEST_EXTRA_ARG(i, 'b');
- fb_size = atoi(argv[i]);
+ fb_size = abs(atoi(argv[i]));
if ( verbose_flag )
fprintf(stderr, "Frame Buffer size: %u bytes.\n", fb_size);