summaryrefslogtreecommitdiffstats
path: root/doc/man/man3/qimageio.3qt
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-05 22:04:08 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-05 22:04:08 -0600
commite02e31c8b9d854cd62cbe9799228f6e08e882773 (patch)
tree53303c981d0b20e03c5a2fc8e959fa74adcb90d1 /doc/man/man3/qimageio.3qt
parent143f194af098d44bf0dd1ebb29e59f30ce48d523 (diff)
downloadtqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.tar.gz
tqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.zip
Sync with latest script
Diffstat (limited to 'doc/man/man3/qimageio.3qt')
-rw-r--r--doc/man/man3/qimageio.3qt4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/man/man3/qimageio.3qt b/doc/man/man3/qimageio.3qt
index b448a6b59..746f934e7 100644
--- a/doc/man/man3/qimageio.3qt
+++ b/doc/man/man3/qimageio.3qt
@@ -117,7 +117,7 @@ For image files that contain sequences of images, only the first is read. See QM
.PP
PBM, PGM, and PPM format \fIoutput\fR is always in the more condensed raw format. PPM and PGM files with more than 256 levels of intensity are scaled down when reading.
.PP
-\fBWarning:\fR If you are in a country which recognizes software patents and in which Unisys holds a patent on LZW compression and/or decompression and you want to use GIF, Unisys may retquire you to license the technology. Such countries include Canada, Japan, the USA, France, Germany, Italy and the UK.
+\fBWarning:\fR If you are in a country which recognizes software patents and in which Unisys holds a patent on LZW compression and/or decompression and you want to use GIF, Unisys may require you to license the technology. Such countries include Canada, Japan, the USA, France, Germany, Italy and the UK.
.PP
GIF support may be removed completely in a future version of Qt. We recommend using the PNG format.
.PP
@@ -289,7 +289,7 @@ Sets the image to \fIimage\fR.
.PP
See also image().
.SH "void QImageIO::setParameters ( const char * parameters )"
-Sets the image's parameter string to \fIparameters\fR. This is for image handlers that retquire special parameters.
+Sets the image's parameter string to \fIparameters\fR. This is for image handlers that require special parameters.
.PP
Although the current image formats supported by Qt ignore the parameters string, it may be used in future extensions or by contributions (for example, JPEG).
.PP