Commit d0e9415d authored by Mans Rullgard's avatar Mans Rullgard

fate: avoid freopen(NULL) in videogen/rotozoom

A number of systems do not implement freopen() with a NULL filename
correctly.  This changes these programs to output individual images
if opening a named output argument as a file fails, in this case
assuming it is a directory.
Signed-off-by: default avatarMans Rullgard <mans@mansr.com>
parent ecf79c4d
......@@ -16,10 +16,10 @@ tests/data/asynth-%.wav: tests/audiogen$(HOSTEXESUF) | tests/data
$(M)./$< $@ $(subst -, ,$*)
tests/data/vsynth1.yuv: tests/videogen$(HOSTEXESUF) | tests/data
$(M)$< >$@
$(M)$< $@
tests/data/vsynth2.yuv: tests/rotozoom$(HOSTEXESUF) | tests/data
$(M)$< $(SRC_PATH)/tests/lena.pnm >$@
$(M)$< $(SRC_PATH)/tests/lena.pnm $@
tests/data/asynth% tests/data/vsynth%.yuv tests/vsynth%/00.pgm: TAG = GEN
......
......@@ -158,15 +158,16 @@ int main(int argc, char **argv)
{
int w, h, i;
char buf[1024];
int isdir = 0;
if (argc > 3) {
printf("usage: %s image.pnm [directory/]\n"
if (argc != 3) {
printf("usage: %s image.pnm file|dir\n"
"generate a test video stream\n", argv[0]);
return 1;
}
if (argc < 3)
err_if(!freopen(NULL, "wb", stdout));
if (!freopen(argv[2], "wb", stdout))
isdir = 1;
w = DEFAULT_WIDTH;
h = DEFAULT_HEIGHT;
......@@ -181,7 +182,7 @@ int main(int argc, char **argv)
for (i = 0; i < DEFAULT_NB_PICT; i++) {
gen_image(i, w, h);
if (argc > 2) {
if (isdir) {
snprintf(buf, sizeof(buf), "%s%02d.pgm", argv[2], i);
pgmyuv_save(buf, w, h, rgb_tab);
} else {
......
......@@ -145,15 +145,16 @@ int main(int argc, char **argv)
{
int w, h, i;
char buf[1024];
int isdir = 0;
if (argc > 2) {
printf("usage: %s [file]\n"
if (argc != 2) {
printf("usage: %s file|dir\n"
"generate a test video stream\n", argv[0]);
exit(1);
}
if (argc < 2)
err_if(!freopen(NULL, "wb", stdout));
if (!freopen(argv[1], "wb", stdout))
isdir = 1;
w = DEFAULT_WIDTH;
h = DEFAULT_HEIGHT;
......@@ -165,7 +166,7 @@ int main(int argc, char **argv)
for (i = 0; i < DEFAULT_NB_PICT; i++) {
gen_image(i, w, h);
if (argc > 1) {
if (isdir) {
snprintf(buf, sizeof(buf), "%s%02d.pgm", argv[1], i);
pgmyuv_save(buf, w, h, rgb_tab);
} else {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment