diff options
-rw-r--r-- | converter/other/giftopnm.c | 4 | ||||
-rw-r--r-- | converter/other/hdifftopam.c | 2 | ||||
-rw-r--r-- | converter/other/jpegtopnm.c | 8 | ||||
-rw-r--r-- | converter/other/pamtogif.c | 6 | ||||
-rw-r--r-- | converter/other/pamtouil.c | 6 | ||||
-rw-r--r-- | converter/other/pnmtopclxl.c | 2 | ||||
-rw-r--r-- | converter/other/pnmtopng.c | 6 | ||||
-rw-r--r-- | converter/other/pnmtops.c | 2 | ||||
-rw-r--r-- | converter/other/pnmtotiffcmyk.c | 2 | ||||
-rw-r--r-- | converter/other/pnmtoxwd.c | 2 | ||||
-rw-r--r-- | converter/other/pstopnm.c | 8 | ||||
-rw-r--r-- | converter/other/rletopnm.c | 4 | ||||
-rw-r--r-- | converter/other/tifftopnm.c | 4 | ||||
-rw-r--r-- | converter/other/xwdtopnm.c | 2 | ||||
-rw-r--r-- | converter/ppm/ppmtompeg/param.c | 4 |
15 files changed, 31 insertions, 31 deletions
diff --git a/converter/other/giftopnm.c b/converter/other/giftopnm.c index 0e261da4..a79a0bbe 100644 --- a/converter/other/giftopnm.c +++ b/converter/other/giftopnm.c @@ -1336,7 +1336,7 @@ readGifHeader(FILE * const gifFile, struct gifScreen * const gifScreenP) { if (verbose) pm_message("GIF format version is '%s'", version); - if ((!STREQ(version, "87a")) && (!STREQ(version, "89a"))) + if ((!streq(version, "87a")) && (!streq(version, "89a"))) pm_error("bad version number, not '87a' or '89a'" ); if (! ReadOK(gifFile,buf,7)) @@ -1658,7 +1658,7 @@ main(int argc, char **argv) { else alpha_file = pm_openw(cmdline.alpha_filename); - if (alpha_file && STREQ(cmdline.alpha_filename, "-")) + if (alpha_file && streq(cmdline.alpha_filename, "-")) imageout_file = NULL; else imageout_file = stdout; diff --git a/converter/other/hdifftopam.c b/converter/other/hdifftopam.c index 0f1a5ca3..48282526 100644 --- a/converter/other/hdifftopam.c +++ b/converter/other/hdifftopam.c @@ -106,7 +106,7 @@ main(int argc, char *argv[]) { if (diffpam.format != PAM_FORMAT) pm_error("Input must be a PAM file, not PNM"); - else if (!STREQ(diffpam.tuple_type, "hdiff")) + else if (!streq(diffpam.tuple_type, "hdiff")) pm_error("Input tuple type is '%s'. Must be 'hdiff'", diffpam.tuple_type); diff --git a/converter/other/jpegtopnm.c b/converter/other/jpegtopnm.c index 180ef3d4..4679d497 100644 --- a/converter/other/jpegtopnm.c +++ b/converter/other/jpegtopnm.c @@ -240,11 +240,11 @@ parseCommandLine(int const argc, if (!dctvalSpec) cmdlineP->dct_method = JDCT_DEFAULT; else { - if (STREQ(dctval, "int")) + if (streq(dctval, "int")) cmdlineP->dct_method = JDCT_ISLOW; - else if (STREQ(dctval, "fast")) + else if (streq(dctval, "fast")) cmdlineP->dct_method = JDCT_IFAST; - else if (STREQ(dctval, "float")) + else if (streq(dctval, "float")) cmdlineP->dct_method = JDCT_FLOAT; else pm_error("Invalid value for the --dct option: '%s'.", dctval); } @@ -952,7 +952,7 @@ main(int argc, char **argv) { parseCommandLine(argc, argv, &cmdline); - if (cmdline.exif_filespec && STREQ(cmdline.exif_filespec, "-")) + if (cmdline.exif_filespec && streq(cmdline.exif_filespec, "-")) /* He's got exif going to stdout, so there can be no image output */ ofP = NULL; else diff --git a/converter/other/pamtogif.c b/converter/other/pamtogif.c index 68a445c6..edaf0695 100644 --- a/converter/other/pamtogif.c +++ b/converter/other/pamtogif.c @@ -91,11 +91,11 @@ pamAlphaPlane(struct pam * const pamP) { unsigned int alphaPlane; - if (STREQ(pamP->tuple_type, "RGB_ALPHA")) + if (streq(pamP->tuple_type, "RGB_ALPHA")) alphaPlane = 3; - else if (STREQ(pamP->tuple_type, "GRAYSCALE_ALPHA")) + else if (streq(pamP->tuple_type, "GRAYSCALE_ALPHA")) alphaPlane = 2; - else if (STREQ(pamP->tuple_type, "BLACKANDWHITE_ALPHA")) + else if (streq(pamP->tuple_type, "BLACKANDWHITE_ALPHA")) alphaPlane = 2; else alphaPlane = 0; diff --git a/converter/other/pamtouil.c b/converter/other/pamtouil.c index b9ddc749..58f57eef 100644 --- a/converter/other/pamtouil.c +++ b/converter/other/pamtouil.c @@ -95,10 +95,10 @@ parseCommandLine(int argc, char ** argv, /* Remove trailing "_icon" */ barPos = strrchr(cmdlineP->outname, '_'); - if (STREQ(barPos, "_icon")) + if (streq(barPos, "_icon")) *barPos = '\0'; } else { - if (STREQ(cmdlineP->inputFilespec, "-")) + if (streq(cmdlineP->inputFilespec, "-")) cmdlineP->outname = strdup("noname"); else { char * dotPos; @@ -237,7 +237,7 @@ genCmap(struct pam * const pamP, nameAlreadyInCmap = FALSE; /* initial assumption */ for (j = 0; j < colorIndex; ++j) { if (cmap[j].rgbname != NULL && - STREQ(colorname, cmap[j].rgbname) && + streq(colorname, cmap[j].rgbname) && cmap[j].transparent == transparent) { nameAlreadyInCmap = TRUE; indexOfName = j; diff --git a/converter/other/pnmtopclxl.c b/converter/other/pnmtopclxl.c index fe4833d8..7ba64210 100644 --- a/converter/other/pnmtopclxl.c +++ b/converter/other/pnmtopclxl.c @@ -153,7 +153,7 @@ parseCommandLine(int argc, char ** argv, bool found; int i; for (i = 0, found=FALSE; xlPaperFormats[i].name && !found; ++i) { - if (STREQ(xlPaperFormats[i].name, formatOpt)) { + if (streq(xlPaperFormats[i].name, formatOpt)) { found = TRUE; cmdlineP->format = xlPaperFormats[i].xl_nr; } diff --git a/converter/other/pnmtopng.c b/converter/other/pnmtopng.c index 28ea7e08..b339a1fe 100644 --- a/converter/other/pnmtopng.c +++ b/converter/other/pnmtopng.c @@ -462,7 +462,7 @@ parseCommandLine(int argc, char ** argv, } if (cmdlineP->zlibCompression.methodSpec) { - if (STREQ(compMethod, "deflated")) + if (streq(compMethod, "deflated")) cmdlineP->zlibCompression.method = Z_DEFLATED; else pm_error("The only valid value for -method is 'deflated'. " @@ -470,9 +470,9 @@ parseCommandLine(int argc, char ** argv, } if (cmdlineP->zlibCompression.strategySpec) { - if (STREQ(compStrategy, "huffman_only")) + if (streq(compStrategy, "huffman_only")) cmdlineP->zlibCompression.strategy = Z_HUFFMAN_ONLY; - else if (STREQ(compStrategy, "filtered")) + else if (streq(compStrategy, "filtered")) cmdlineP->zlibCompression.strategy = Z_FILTERED; else pm_error("Valid values for -strategy are 'huffman_only' and " diff --git a/converter/other/pnmtops.c b/converter/other/pnmtops.c index 5b12cee9..410fa0b9 100644 --- a/converter/other/pnmtops.c +++ b/converter/other/pnmtops.c @@ -1295,7 +1295,7 @@ main(int argc, char * argv[]) { ifp = pm_openr(cmdline.inputFileName); - if (STREQ(cmdline.inputFileName, "-")) + if (streq(cmdline.inputFileName, "-")) name = strdup("noname"); else name = basebasename(cmdline.inputFileName); diff --git a/converter/other/pnmtotiffcmyk.c b/converter/other/pnmtotiffcmyk.c index 0fda6b08..9b5f25d4 100644 --- a/converter/other/pnmtotiffcmyk.c +++ b/converter/other/pnmtotiffcmyk.c @@ -794,7 +794,7 @@ standardOpt( Conv *conv, Root *r, int *argn, int argc, char **argv ) { } /* handle the special case of -1 (no removal) */ if ( oldn == *argn && pm_keymatch( argv[*argn], "-gammap", 7 ) && - *argn + 1 < argc && STREQ(argv[*argn + 1], "-1") ) { + *argn + 1 < argc && streq(argv[*argn + 1], "-1") ) { p->remove = 0 ; *argn = (*argn) + 2 ; } diff --git a/converter/other/pnmtoxwd.c b/converter/other/pnmtoxwd.c index 32fb8a7b..d0625b0b 100644 --- a/converter/other/pnmtoxwd.c +++ b/converter/other/pnmtoxwd.c @@ -471,7 +471,7 @@ main(int argc, char * argv[]) { } } - if (STREQ(cmdline.inputFilespec, "-")) + if (streq(cmdline.inputFilespec, "-")) dumpname = "stdin"; else { if (strlen(cmdline.inputFilespec) > XWDVAL_MAX - sizeof(h11) - 1) diff --git a/converter/other/pstopnm.c b/converter/other/pstopnm.c index a31c3f64..5798e340 100644 --- a/converter/other/pstopnm.c +++ b/converter/other/pstopnm.c @@ -361,7 +361,7 @@ language_declaration(const char input_filespec[], int const verbose) { -----------------------------------------------------------------------------*/ enum postscript_language language; - if (STREQ(input_filespec, "-")) + if (streq(input_filespec, "-")) /* Can't read stdin, because we need it to remain positioned for the Ghostscript interpreter to read it. */ @@ -410,7 +410,7 @@ compute_box_to_extract(struct box const cmdline_extract_box, */ struct box ps_bb; /* Box described by %%BoundingBox stmt in input */ - if (STREQ(input_filespec, "-")) + if (streq(input_filespec, "-")) /* Can't read stdin, because we need it to remain positioned for the Ghostscript interpreter to read it. */ @@ -576,7 +576,7 @@ compute_outfile_arg(const struct cmdlineInfo cmdline) { if (cmdline.goto_stdout) retval = strdup("-"); - else if (STREQ(cmdline.input_filespec, "-")) + else if (streq(cmdline.input_filespec, "-")) retval = strdup("-"); else { char * basename; @@ -584,7 +584,7 @@ compute_outfile_arg(const struct cmdlineInfo cmdline) { basename = strdup(cmdline.input_filespec); if (strlen(basename) > 3 && - STREQ(basename+strlen(basename)-3, ".ps")) + streq(basename+strlen(basename)-3, ".ps")) /* The input filespec ends in ".ps". Chop it off. */ basename[strlen(basename)-3] = '\0'; diff --git a/converter/other/rletopnm.c b/converter/other/rletopnm.c index aaa86388..f98ea8a8 100644 --- a/converter/other/rletopnm.c +++ b/converter/other/rletopnm.c @@ -124,7 +124,7 @@ parseCommandLine(int argc, char ** argv, if (argc - 1 == 0) cmdlineP->input_filename = NULL; /* he wants stdin */ else if (argc - 1 == 1) { - if (STREQ(argv[1], "-")) + if (streq(argv[1], "-")) cmdlineP->input_filename = NULL; /* he wants stdin */ else cmdlineP->input_filename = strdup(argv[1]); @@ -133,7 +133,7 @@ parseCommandLine(int argc, char ** argv, "is the input file specification"); if (cmdlineP->alpha_filename && - STREQ(cmdlineP->alpha_filename, "-")) + streq(cmdlineP->alpha_filename, "-")) cmdlineP->alpha_stdout = TRUE; else cmdlineP->alpha_stdout = FALSE; diff --git a/converter/other/tifftopnm.c b/converter/other/tifftopnm.c index 5969a49a..ce17b7e1 100644 --- a/converter/other/tifftopnm.c +++ b/converter/other/tifftopnm.c @@ -138,7 +138,7 @@ parseCommandLine(int argc, char ** argv, "is the input file name"); if (alphaSpec) { - if (STREQ(cmdlineP->alphaFilename, "-")) + if (streq(cmdlineP->alphaFilename, "-")) cmdlineP->alphaStdout = TRUE; else cmdlineP->alphaStdout = FALSE; @@ -1024,7 +1024,7 @@ main(int argc, char * argv[]) { parseCommandLine(argc, argv, &cmdline); - if (!STREQ(cmdline.inputFilename, "-")) { + if (!streq(cmdline.inputFilename, "-")) { tif = TIFFOpen(cmdline.inputFilename, "r"); if (tif == NULL) pm_error("error opening TIFF file %s", cmdline.inputFilename); diff --git a/converter/other/xwdtopnm.c b/converter/other/xwdtopnm.c index 357db323..59dab002 100644 --- a/converter/other/xwdtopnm.c +++ b/converter/other/xwdtopnm.c @@ -134,7 +134,7 @@ parseCommandLine(int argc, char ** argv, if (argc - 1 == 0) cmdlineP->inputFilename = NULL; /* he wants stdin */ else if (argc - 1 == 1) { - if (STREQ(argv[1], "-")) + if (streq(argv[1], "-")) cmdlineP->inputFilename = NULL; /* he wants stdin */ else cmdlineP->inputFilename = strdup(argv[1]); diff --git a/converter/ppm/ppmtompeg/param.c b/converter/ppm/ppmtompeg/param.c index 5ea69ab6..c465dce0 100644 --- a/converter/ppm/ppmtompeg/param.c +++ b/converter/ppm/ppmtompeg/param.c @@ -684,7 +684,7 @@ processParamLine(char const input[], } else if (STRNEQ(input, "BASE_FILE_FORMAT", 16)) { const char * arg = SkipSpacesTabs(&input[16]); SetFileFormat(arg); - if (STRNEQ(arg, "YUV", 3) || STREQ(arg, "Y")) + if (STRNEQ(arg, "YUV", 3) || streq(arg, "Y")) *yuvUsedP = TRUE; optionSeen[OPTION_BASE_FORMAT] = TRUE; } else if (STRNEQ(input, "BSEARCH_ALG", 11)) { @@ -774,7 +774,7 @@ processParamLine(char const input[], } else if (STRNEQ(input, "INPUT_CONVERT", 13)) { strcpy(inputConversion, SkipSpacesTabs(&input[13])); optionSeen[OPTION_INPUT_CONVERT] = TRUE; - } else if (STREQ(input, "INPUT")) { + } else if (streq(input, "INPUT")) { ReadInputFileNames(fpointer, "END_INPUT", inputSourceP->stdinUsed ? NULL : inputSourceP); |