diff options
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | NEWS.old | 2 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | doc/README.MSW | 2 | ||||
| -rw-r--r-- | doc/README.html | 2 | ||||
| -rw-r--r-- | man/xpmcreatepixmap.man | 2 | ||||
| -rw-r--r-- | man/xpmread.man | 4 | ||||
| -rw-r--r-- | man/xpmwrite.man | 2 | ||||
| -rw-r--r-- | src/create.c | 2 | ||||
| -rw-r--r-- | src/hashtab.c | 2 | ||||
| -rw-r--r-- | src/parse.c | 6 | ||||
| -rw-r--r-- | src/rgbtab.h | 2 | ||||
| -rw-r--r-- | src/scan.c | 6 |
13 files changed, 18 insertions, 18 deletions
@@ -1,3 +1,3 @@ -Xpm was originally written by Groupe Bull, but maintainence has since passed +Xpm was originally written by Groupe Bull, but maintenance has since passed through the hands of XFree86, and to freedesktop.org; Daniel Stone is the current maintainer. @@ -443,7 +443,7 @@ -cp <color> <pixel> to override a color value with a given pixel, i.e. sxpm plaid.xpm -cp red 4 - also the '-s' adn '-p' options have been renamed to '-sc' and '-sp'. + also the '-s' and '-p' options have been renamed to '-sc' and '-sp'. - xpm.h defines XpmFormat, XpmVersion, and XpmRevision numbers. @@ -6,7 +6,7 @@ Xorg mailing list: https://lists.x.org/mailman/listinfo/xorg -The master development code repository can be found at: +The primary development code repository can be found at: https://gitlab.freedesktop.org/xorg/lib/libXpm diff --git a/doc/README.MSW b/doc/README.MSW index 6746bc8..d7cfaf6 100644 --- a/doc/README.MSW +++ b/doc/README.MSW @@ -81,7 +81,7 @@ Oct 24, 1996: * Please try not to disturb me on this, XPM is not my piece of cake. - * Hermann Dunkel has appearently moved in virtual space. + * Hermann Dunkel has apparently moved in virtual space. Changes: diff --git a/doc/README.html b/doc/README.html index c3175c1..401b51a 100644 --- a/doc/README.html +++ b/doc/README.html @@ -242,7 +242,7 @@ Error found line 3 near character 5 </pre> <p> It is pretty limited but at least, unlike sxpm, it gives you some hint on where -the error occured within the file. +the error occurred within the file. <h2><a name="sec7">7. Other Tools</a></h2> diff --git a/man/xpmcreatepixmap.man b/man/xpmcreatepixmap.man index e834dae..ba116b3 100644 --- a/man/xpmcreatepixmap.man +++ b/man/xpmcreatepixmap.man @@ -69,7 +69,7 @@ XpmCreatePixmapFromXpmImage creates X images calling XpmCreateImageFromXpmImage the given XpmImage and XpmAttributes, then it creates the related pixmaps which are returned topixmap_return and shapemask_return using XPutImage. Finally it destroys the X images with XDestroyImage. -When finished the caller must free the pixmaps using XFreePixmap, the colors using XFreeColors or the appication +When finished the caller must free the pixmaps using XFreePixmap, the colors using XFreeColors or the application equivalent function when the standard Xlib functions are not used, and possibly the data returned into the XpmAttributes using XpmFreeAttributes. diff --git a/man/xpmread.man b/man/xpmread.man index 5074d40..8b6f637 100644 --- a/man/xpmread.man +++ b/man/xpmread.man @@ -93,7 +93,7 @@ to the desired color, and uses that. If the alloc_close_colors attribute is set to False, the found close color is not allocated but it is used anyway. This is especially useful for applications which use a private colormap containing read/write cells and have complete control over the colormap. -On the other hand, since in such a case there is no garanty that the color pixel will not change any time, +On the other hand, since in such a case there is no guarantee that the color pixel will not change any time, this should be avoided when using the default colormap. If no color can be found that is within closeness of the Red, Green and Blue components of the desired color, it reverts to trying other default values as explained above. @@ -119,7 +119,7 @@ If required it stores into the XpmAttributes structure the list of the used pixe When the image depth is one, the image format is either as specified by the bitmap_format attribute if set or ZPixmap. When the depth is different from one the imagae format is always ZPixmap. When finished the caller must free the images using XDestroyImage, the allocated colors using -XFreeColors or the appication equivalent function when the standard Xlib functions are not used, +XFreeColors or the application equivalent function when the standard Xlib functions are not used, and possibly the data returned into the XpmAttributes using XpmFreeAttributes (page 25). In addition, on systems which support such features XpmReadFileToImage deals with compressed files by forking an uncompress orgzip process and reading from the piped result. It assumes that the specified file is diff --git a/man/xpmwrite.man b/man/xpmwrite.man index f40d8c7..b07f780 100644 --- a/man/xpmwrite.man +++ b/man/xpmwrite.man @@ -86,7 +86,7 @@ And if instead of a file name NULL is passed to XpmWriteFileFromImage, it writes To write out a Pixmap to an XPM file, use XpmWriteFileFromPixmap. If the passed XpmAttributes structure pointer is not NULL, -XpmWriteFileFromPixmap looks for the following atributes: XpmSize. +XpmWriteFileFromPixmap looks for the following attributes: XpmSize. If they are not defined it performs an XGetGeometry operation. Then it uses XGetImage to get from the given pixmaps the related X images which are passed to XpmWriteFileFromImage. Finally XpmWriteFileFromPixmap destroys the created images using XDestroyImage. diff --git a/src/create.c b/src/create.c index a750846..4a85c78 100644 --- a/src/create.c +++ b/src/create.c @@ -2231,7 +2231,7 @@ xpmParseDataAndCreate( } } /* - * store found informations in the XpmImage structure + * store found information in the XpmImage structure */ image->width = width; image->height = height; diff --git a/src/hashtab.c b/src/hashtab.c index 1bd4109..6950e16 100644 --- a/src/hashtab.c +++ b/src/hashtab.c @@ -29,7 +29,7 @@ * XPM library * * * * Developed by Arnaud Le Hors * -* this originaly comes from Colas Nahaboo as a part of Wool * +* this originally comes from Colas Nahaboo as a part of Wool * * * \*****************************************************************************/ diff --git a/src/parse.c b/src/parse.c index 613529e..037fc66 100644 --- a/src/parse.c +++ b/src/parse.c @@ -27,7 +27,7 @@ * parse.c: * * * * XPM library * -* Parse an XPM file or array and store the found informations * +* Parse an XPM file or array and store the found information * * in the given XpmImage structure. * * * * Developed by Arnaud Le Hors * @@ -717,7 +717,7 @@ do { \ } while(0) /* - * This function parses an Xpm file or data and store the found informations + * This function parses an Xpm file or data and store the found information * in an an XpmImage structure which is returned. */ int @@ -825,7 +825,7 @@ xpmParseData( } /* - * store found informations in the XpmImage structure + * store found information in the XpmImage structure */ image->width = width; image->height = height; diff --git a/src/rgbtab.h b/src/rgbtab.h index 3b75184..6d30f15 100644 --- a/src/rgbtab.h +++ b/src/rgbtab.h @@ -29,7 +29,7 @@ * A hard coded rgb.txt. To keep it short I removed all colornames with * * trailing numbers, Blue3 etc, except the GrayXX. Sorry Grey-lovers I prefer * * Gray ;-). But Grey is recognized on lookups, only on save Gray will be * -* used, maybe you want to do some substitue there too. * +* used, maybe you want to do some substitute there too. * * * * To save memory the RGBs are coded in one long value, as done by the RGB * * macro. * @@ -182,7 +182,7 @@ do { \ } while(0) /* - * This function scans the given image and stores the found informations in + * This function scans the given image and stores the found information in * the given XpmImage structure. */ int @@ -336,7 +336,7 @@ XpmCreateXpmImageFromImage( RETURN(ErrorStatus); /* - * store found informations in the XpmImage structure + * store found information in the XpmImage structure */ xpmimage->width = width; xpmimage->height = height; @@ -380,7 +380,7 @@ ScanTransparentColor( *s = printable[c = ((a - c) / MAXPRINTABLE) % MAXPRINTABLE]; *s = '\0'; - /* then retreive related info from the attributes if any */ + /* then retrieve related info from the attributes if any */ if (attributes && (attributes->valuemask & XpmColorTable /* 3.2 backward compatibility code */ || attributes->valuemask & XpmInfos) |