diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2007-09-26 20:20:52 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2007-09-26 20:20:52 +0000 |
| commit | 2087fc45bd38ac1dd3b90789c5bfb94f2dbbad94 (patch) | |
| tree | b062862164ab41e78b5efc436330db65cb2887f9 /converter/ppm/ppmtoarbtxt.c | |
| parent | 68256547a054109f09c55e2e913df2dfdd2144ff (diff) | |
| download | netpbm-mirror-2087fc45bd38ac1dd3b90789c5bfb94f2dbbad94.tar.gz netpbm-mirror-2087fc45bd38ac1dd3b90789c5bfb94f2dbbad94.tar.xz netpbm-mirror-2087fc45bd38ac1dd3b90789c5bfb94f2dbbad94.zip | |
Rebase 'advanced' to 10.40.00
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@416 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/ppm/ppmtoarbtxt.c')
| -rw-r--r-- | converter/ppm/ppmtoarbtxt.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/converter/ppm/ppmtoarbtxt.c b/converter/ppm/ppmtoarbtxt.c index 774a47c4..eaeff70f 100644 --- a/converter/ppm/ppmtoarbtxt.c +++ b/converter/ppm/ppmtoarbtxt.c @@ -294,20 +294,20 @@ SKL_OBJ **skl; sscanf (objstr,"%s",typstr); /* Check for integer colors */ - if (STREQ(typstr,"ired") ) otyp = IRED; - else if (STREQ(typstr,"igreen")) otyp = IGREEN; - else if (STREQ(typstr,"iblue") ) otyp = IBLUE; - else if (STREQ(typstr,"ilum") ) otyp = ILUM; + if (streq(typstr,"ired") ) otyp = IRED; + else if (streq(typstr,"igreen")) otyp = IGREEN; + else if (streq(typstr,"iblue") ) otyp = IBLUE; + else if (streq(typstr,"ilum") ) otyp = ILUM; /* Check for real colors */ - else if (STREQ(typstr,"fred") ) otyp = FRED; - else if (STREQ(typstr,"fgreen")) otyp = FGREEN; - else if (STREQ(typstr,"fblue") ) otyp = FBLUE; - else if (STREQ(typstr,"flum") ) otyp = FLUM; + else if (streq(typstr,"fred") ) otyp = FRED; + else if (streq(typstr,"fgreen")) otyp = FGREEN; + else if (streq(typstr,"fblue") ) otyp = FBLUE; + else if (streq(typstr,"flum") ) otyp = FLUM; /* Check for integer data */ - else if (STREQ(typstr,"width") ) otyp = WIDTH; - else if (STREQ(typstr,"height")) otyp = HEIGHT; - else if (STREQ(typstr,"posx") ) otyp = POSX; - else if (STREQ(typstr,"posy") ) otyp = POSY; + else if (streq(typstr,"width") ) otyp = WIDTH; + else if (streq(typstr,"height")) otyp = HEIGHT; + else if (streq(typstr,"posx") ) otyp = POSX; + else if (streq(typstr,"posy") ) otyp = POSY; else otyp = BDATA; if ((otyp == IRED) || (otyp == IGREEN) || (otyp == IBLUE) || (otyp == ILUM)) |