From 95a66834f2c7775836e8d66f3b1da176438cf94b Mon Sep 17 00:00:00 2001 From: giraffedata Date: Tue, 9 Feb 2010 03:41:07 +0000 Subject: Remove output file argument git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1120 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- converter/other/avstopam.c | 9 +-------- converter/other/pamtoavs.c | 10 ++++------ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/converter/other/avstopam.c b/converter/other/avstopam.c index a35fdcea..8d32008c 100644 --- a/converter/other/avstopam.c +++ b/converter/other/avstopam.c @@ -63,27 +63,22 @@ main(int argc, const char *argv[]) { struct pam outPam; const char * inputFilename; - const char * outputFilename; FILE * inFileP; - FILE * outFileP; long width; long height; pm_proginit(&argc, argv); inputFilename = (argc > 1) ? argv[1] : "-"; - outputFilename = (argc > 2) ? argv[2] : "-"; inFileP = pm_openr(inputFilename); pm_readbiglong(inFileP, &width); pm_readbiglong(inFileP, &height); - outFileP = pm_openw(outputFilename); - outPam.size = sizeof(struct pam); outPam.len = PAM_STRUCT_SIZE(comment_p); - outPam.file = outFileP; + outPam.file = stdout; outPam.format = PAM_FORMAT; outPam.plainformat = 0; outPam.width = width; @@ -102,9 +97,7 @@ main(int argc, const char *argv[]) { producePam(inFileP, &outPam); - pm_closew(outFileP); pm_closer(inFileP); return 0; } - diff --git a/converter/other/pamtoavs.c b/converter/other/pamtoavs.c index 740042e6..4764c9e8 100644 --- a/converter/other/pamtoavs.c +++ b/converter/other/pamtoavs.c @@ -131,20 +131,18 @@ int main(int argc, const char *argv[]) { struct pam inPam; const char * inputFilename; - const char * outputFilename; FILE * inFileP; - FILE * outFileP; pm_proginit(&argc, argv); + inputFilename = (argc > 1) ? argv[1] : "-"; - outputFilename = (argc > 2) ? argv[2] : "-"; + inFileP = pm_openr(inputFilename); + pnm_readpaminit(inFileP, &inPam, PAM_STRUCT_SIZE(tuple_type)); - outFileP = pm_openw(outputFilename); - produceAvs(&inPam, outFileP); + produceAvs(&inPam, stdout); - pm_closew(outFileP); pm_closer(inFileP); return 0; -- cgit 1.4.1