Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
Qt
QtImageFormats
Commits
04bcc665
Commit
04bcc665
authored
10 years ago
by
Frederik Gladhorn
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.4.0' into 5.4
Change-Id: I9002ef6585513ebfb9e641e890f8b0e855c67a08
parents
c7155c05
954fa54a
dev
5.10
5.11
5.12
5.12.1
5.12.10
5.12.11
5.12.12
5.12.2
5.12.3
5.12.4
5.12.5
5.12.6
5.12.7
5.12.8
5.12.9
5.13
5.13.0
5.13.1
5.13.2
5.14
5.14.0
5.14.1
5.14.2
5.15
5.15.0
5.15.1
5.15.2
5.4
5.5
5.6
5.7
5.8
5.9
5.9.8
6.0
6.0.0
6.1
6.1.0
6.1.1
6.1.2
6.1.3
6.2
6.2.0
6.2.1
6.2.2
wip/cmake
v5.15.0-alpha1
v5.14.1
v5.14.0
v5.14.0-rc2
v5.14.0-rc1
v5.14.0-beta3
v5.14.0-beta2
v5.14.0-beta1
v5.14.0-alpha1
v5.13.2
v5.13.1
v5.13.0
v5.13.0-rc3
v5.13.0-rc2
v5.13.0-rc1
v5.13.0-beta4
v5.13.0-beta3
v5.13.0-beta2
v5.13.0-beta1
v5.13.0-alpha1
v5.12.7
v5.12.6
v5.12.5
v5.12.4
v5.12.3
v5.12.2
v5.12.1
v5.12.0
v5.12.0-rc2
v5.12.0-rc1
v5.12.0-beta4
v5.12.0-beta3
v5.12.0-beta2
v5.12.0-beta1
v5.12.0-alpha1
v5.11.3
v5.11.2
v5.11.1
v5.11.0
v5.11.0-rc2
v5.11.0-rc1
v5.11.0-beta4
v5.11.0-beta3
v5.11.0-beta2
v5.11.0-beta1
v5.11.0-alpha1
v5.10.1
v5.10.0
v5.10.0-rc3
v5.10.0-rc2
v5.10.0-rc1
v5.10.0-beta4
v5.10.0-beta3
v5.10.0-beta2
v5.10.0-beta1
v5.10.0-alpha1
v5.9.9
v5.9.8
v5.9.7
v5.9.6
v5.9.5
v5.9.4
v5.9.3
v5.9.2
v5.9.1
v5.9.0
v5.9.0-rc2
v5.9.0-rc1
v5.9.0-beta4
v5.9.0-beta3
v5.9.0-beta2
v5.9.0-beta1
v5.9.0-alpha1
v5.8.0
v5.8.0-rc1
v5.8.0-beta1
v5.8.0-alpha1
v5.7.1
v5.7.0
v5.7.0-rc1
v5.7.0-beta1
v5.7.0-alpha1
v5.6.3
v5.6.2
v5.6.1
v5.6.1-1
v5.6.0
v5.6.0-rc1
v5.6.0-beta1
v5.6.0-alpha1
v5.5.1
v5.5.0
v5.5.0-rc1
v5.5.0-beta1
v5.5.0-alpha1
v5.4.2
v5.4.1
No related merge requests found
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
src/3rdparty/jasper/src/libjasper/base/jas_getopt.c
+1
-0
src/3rdparty/jasper/src/libjasper/base/jas_getopt.c
src/3rdparty/jasper/src/libjasper/bmp/bmp_dec.c
+1
-0
src/3rdparty/jasper/src/libjasper/bmp/bmp_dec.c
src/3rdparty/jasper/src/libjasper/jpc/jpc_t1dec.c
+1
-0
src/3rdparty/jasper/src/libjasper/jpc/jpc_t1dec.c
src/3rdparty/jasper/src/libjasper/jpc/jpc_tsfb.c
+12
-12
src/3rdparty/jasper/src/libjasper/jpc/jpc_tsfb.c
src/3rdparty/jasper/src/libjasper/mif/mif_cod.c
+1
-0
src/3rdparty/jasper/src/libjasper/mif/mif_cod.c
src/3rdparty/jasper/src/libjasper/pnm/pnm_dec.c
+1
-0
src/3rdparty/jasper/src/libjasper/pnm/pnm_dec.c
src/plugins/imageformats/imageformats.pro
+1
-1
src/plugins/imageformats/imageformats.pro
with
18 additions
and
13 deletions
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets