summaryrefslogtreecommitdiff
path: root/src/imageformats
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@petroules.com>2014-01-06 07:52:54 -0500
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-11 10:37:49 +0100
commit95b6cf26837dba0ac215db552ce47031f3abfc6e (patch)
tree1ed59372fc06dd9da780c84c0229e2cc99bf94b7 /src/imageformats
parent5c4036eeb2ecdfdac5a403ce43bdd1b0c9a53efb (diff)
downloadqtimageformats-95b6cf26837dba0ac215db552ce47031f3abfc6e.tar.gz
Add JPEG 2000 plugin.
It is moving from Qt Solutions. Change-Id: Ie0dc44d258597f871544fa43238528f42628b799 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src/imageformats')
-rw-r--r--src/imageformats/doc/qtimageformats-dita.qdocconf2
-rw-r--r--src/imageformats/doc/src/qtimageformats.qdoc1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/imageformats/doc/qtimageformats-dita.qdocconf b/src/imageformats/doc/qtimageformats-dita.qdocconf
index 82f9fdc..053e02a 100644
--- a/src/imageformats/doc/qtimageformats-dita.qdocconf
+++ b/src/imageformats/doc/qtimageformats-dita.qdocconf
@@ -15,7 +15,7 @@ exampledirs += ../examples
HTML.nobreadcrumbs = "true"
examples.fileextensions = "*.cpp *.h *.js *.svg *.xml *.ui *.qml"
-examples.imageextensions = "*.png *.jpeg *.jpg *.gif *.mng"
+examples.imageextensions = "*.png *.jp2 *.jpeg *.jpg *.gif *.mng"
headers.fileextensions = "*.h *.ch *.h++ *.hh *.hpp *.hxx"
sources.fileextensions = "*.cpp *.qdoc *.mm *.qml"
diff --git a/src/imageformats/doc/src/qtimageformats.qdoc b/src/imageformats/doc/src/qtimageformats.qdoc
index 2c9f8a3..86cdd53 100644
--- a/src/imageformats/doc/src/qtimageformats.qdoc
+++ b/src/imageformats/doc/src/qtimageformats.qdoc
@@ -54,6 +54,7 @@ libraries. If not found, it may fall back on using a bundled copy (in
\header \li Format \li Description \li Support \li 3rd party codec
\row \li DDS \li Direct Draw Surface \li Read/write \li No
\row \li ICNS \li Apple Icon Image \li Read/write \li No
+\row \li JP2 \li Joint Photographic Experts Group 2000 \li Read/write \li Yes (bundled)
\row \li MNG \li Multiple-image Network Graphics \li Read \li Yes (bundled)
\row \li TGA \li Truevision Graphics Adapter \li Read \li No
\row \li TIFF \li Tagged Image File Format \li Read/write \li Yes (bundled)