platform/upstream/qtimageformats.git
8 years agoBump package version to 5.5.90+alpha1 75/61175/1 accepted/tizen_3.0_common accepted/tizen_3.0_ivi accepted/tizen_common accepted/tizen_ivi accepted/tizen_mobile accepted/tizen_tv accepted/tizen_unified accepted/tizen_wearable tizen tizen_3.0 tizen_3.0.m2 accepted/tizen/3.0/common/20161114.111651 accepted/tizen/3.0/ivi/20161011.062348 accepted/tizen/common/20160307.154637 accepted/tizen/ivi/20160307.103616 accepted/tizen/mobile/20160307.111422 accepted/tizen/tv/20160307.111446 accepted/tizen/unified/20170309.040438 accepted/tizen/wearable/20160307.111510 submit/tizen/20160303.114700 submit/tizen/20160307.093400 submit/tizen_3.0.m2/20170104.093754 submit/tizen_3.0_common/20161104.104000 submit/tizen_3.0_ivi/20161010.000006 submit/tizen_unified/20170308.100416 tizen_4.0.m1_release
Tomasz Olszak [Tue, 10 Nov 2015 15:47:16 +0000 (16:47 +0100)]
Bump package version to 5.5.90+alpha1

Change-Id: Ib685813aa2c71217c70ab1f3ef5150050fbbbba0

8 years agoFix buildbreak for Tizen:Mobile aarch64 architecture. 74/61174/1
Tomasz Olszak [Fri, 4 Mar 2016 10:38:31 +0000 (11:38 +0100)]
Fix buildbreak for Tizen:Mobile aarch64 architecture.

Compiler were complaining with:

../../../3rdparty/libwebp/src/dsp/dec_neon.c -o
.obj/dec_neon.o
[  236s] gcc: error: unrecognized command line option '-mfpu=neon'

Seems like arm64 already contains neon so this patch just uses it
on arm.

Change-Id: I1a9b4b2555f09c7e18696bd908ae251ed7b9cd80

8 years agotvOS support
Mike Krus [Mon, 28 Dec 2015 21:02:35 +0000 (21:02 +0000)]
tvOS support

QT_ARCH for tvOS is arm64 (not arm, since it’s 64bits only)

Change-Id: Ia03d3ee07d2543a0e70ee7d77448aff9382d8fc8
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
8 years agoBump package version to 5.4.1
Tomasz Olszak [Fri, 27 Feb 2015 10:36:59 +0000 (11:36 +0100)]
Bump package version to 5.4.1

Change-Id: Ie547d81d1c8da69bfb25c44b6d3fa90dd6def40b
Bug-Tizen: TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
8 years agoBump package version to 5.4.0
Tomasz Olszak [Thu, 18 Dec 2014 20:21:54 +0000 (21:21 +0100)]
Bump package version to 5.4.0

Change-Id: I17ebb8b4dfedf531114fe955ef878c0f3647a7f7
Bug-Tizen: TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
8 years agoUpdated to Qt 5.3.99+beta1
Tomasz Olszak [Sat, 4 Oct 2014 15:08:25 +0000 (17:08 +0200)]
Updated to Qt 5.3.99+beta1

Change-Id: I16122288c87c7f15652813470fc9edc3323de3da
Bug-Tizen: TC-1008
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
8 years agoAdded .gbs.conf file to follow upstream tags format
Tomasz Olszak [Sat, 4 Oct 2014 15:11:19 +0000 (17:11 +0200)]
Added .gbs.conf file to follow upstream tags format

Change-Id: I6293bab8059d1d06789d6ad3359fef6a6cf1f9d1
Bug-Tizen: TC-1008
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
8 years agoChanged source package name in prep step to allow incremental builds.
Tomasz Olszak [Sat, 4 Oct 2014 15:07:35 +0000 (17:07 +0200)]
Changed source package name in prep step to allow incremental builds.

Change-Id: I30d0d306abc9312087f297fb2574d27c15edecb1
Bug-Tizen: TC-1008
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
8 years agoBump package version to 5.3.1
Tomasz Olszak [Fri, 4 Jul 2014 15:55:52 +0000 (17:55 +0200)]
Bump package version to 5.3.1

Change-Id: I53f36d7c344de872bfc11b6a525b8d0319afb575
Bug-Tizen: TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
8 years agopackaging: Added wearable adaptation
Tomasz Olszak [Wed, 25 Jun 2014 14:17:00 +0000 (16:17 +0200)]
packaging: Added wearable adaptation

Wearable doesn't have libtiff-devel package

Change-Id: Ic55c227958809454450bd53979e858b1a7d39148
Bug-Tizen: TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
8 years agoBump package version to 5.3.0
Tomasz Olszak [Fri, 23 May 2014 08:39:20 +0000 (10:39 +0200)]
Bump package version to 5.3.0

Change-Id: I852d35af15108157e20e1d2a4fa577edadc8b476
Bug-Tizen: TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
8 years agoBump package version to 5.2.96+rc2
Tomasz Olszak [Tue, 6 May 2014 22:32:58 +0000 (00:32 +0200)]
Bump package version to 5.2.96+rc2

Change-Id: Ie076b57a6152c3cb508617cf2ce05ac3a6334956
Bug-Tizen: TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
8 years agoBump package version to 5.2.95+rc1
Tomasz Olszak [Sun, 27 Apr 2014 08:31:28 +0000 (10:31 +0200)]
Bump package version to 5.2.95+rc1

Change-Id: I877f07d6599246ff29b3534f5eaa2486b11bb1c2
Bug-Tizen:TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
8 years agoAdded manifest file according to smack 3-domain model.
Tomasz Olszak [Fri, 25 Apr 2014 09:14:50 +0000 (11:14 +0200)]
Added manifest file according to smack 3-domain model.

Bug-Tizen:TIVI-2416

Change-Id: I02c09ac5e3f506c7c5aea23e0eb229382f39431a
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
8 years agoBump package version to 5.2.90+alpha
Tomasz Olszak [Tue, 11 Mar 2014 22:48:13 +0000 (23:48 +0100)]
Bump package version to 5.2.90+alpha

Bug-Tizen:TIVI-2416

Change-Id: I381f115bcab3e913b667dfc3b0cd813eec449090
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
8 years agoBump package version to 5.2.2
Tomasz Olszak [Wed, 29 Jan 2014 00:05:29 +0000 (01:05 +0100)]
Bump package version to 5.2.2

Tizen-Bug: TIVI-2416

Change-Id: If3b176110ecd3e0af06e5eee5811644b4a7a0420
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
8 years agoBump package version to 5.2.1
Tomasz Olszak [Mon, 16 Dec 2013 23:44:00 +0000 (00:44 +0100)]
Bump package version to 5.2.1

Change-Id: I6146c8339d27336abfabaa2c81d6fb67a5322782

8 years agospec adapted for Tizen
Tomasz Olszak [Sun, 8 Sep 2013 12:52:54 +0000 (14:52 +0200)]
spec adapted for Tizen

8 years agoImport from Mer
Tomasz Olszak [Sun, 8 Sep 2013 11:32:45 +0000 (13:32 +0200)]
Import from Mer

8 years agoMerge remote-tracking branch 'origin/5.5' into 5.6 upstream v5.5.90+alpha1
Liang Qi [Fri, 28 Aug 2015 08:30:41 +0000 (10:30 +0200)]
Merge remote-tracking branch 'origin/5.5' into 5.6

Change-Id: Id599e08b463989329ab369586bc01582eb64e445

8 years agoDoc: Fix few misses from last copyright headers update.
Julien Brianceau [Wed, 26 Aug 2015 20:15:57 +0000 (22:15 +0200)]
Doc: Fix few misses from last copyright headers update.

The documentation template with outdated copyright
information is removed, it's not used anymore.

Change-Id: Idc93bee04339739807c15f37c5bbbee1bbdd34c4
Reviewed-by: Julien Brianceau <jbriance@cisco.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
8 years agoMerge remote-tracking branch 'origin/5.4' into 5.5
Liang Qi [Wed, 19 Aug 2015 14:23:31 +0000 (16:23 +0200)]
Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
.qmake.conf

Change-Id: I539e7abf49a6b14c31bf1c8ca440afcdbfb5164e

8 years agoAdd the GPLv3 license text
Thiago Macieira [Wed, 8 Jul 2015 00:35:11 +0000 (17:35 -0700)]
Add the GPLv3 license text

LGPLv3 refers to it but does not include it in its body.

Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
8 years agoMerge remote-tracking branch 'origin/5.5' into dev
Frederik Gladhorn [Sun, 9 Aug 2015 13:27:05 +0000 (15:27 +0200)]
Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: Ief86005c1309fdd08f32513782ee75f7e9751bc1

8 years agoProspective fix for build on iOS
Simon Hausmann [Wed, 22 Jul 2015 08:21:47 +0000 (10:21 +0200)]
Prospective fix for build on iOS

Similar to commit 954fa54a88cff31a7fc869a49d17474ab1da8459 we also
need to include the header that provides the jas_eprintf function
declaration.

Change-Id: I5f1e2e44bccf960ac88a21847e796e4548fcc4be
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
8 years agoRe-enable WebP support on iOS
Mike Krus [Mon, 29 Jun 2015 09:31:17 +0000 (10:31 +0100)]
Re-enable WebP support on iOS

Previous work for Android appears to have fixed iOS related issues. Works fine for loading textures in Qt3d

Change-Id: I54dbc0b57035e2777bac9e05842a64d4283efbd8
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
8 years agoMerge remote-tracking branch 'origin/5.5' into dev
Liang Qi [Mon, 29 Jun 2015 18:08:33 +0000 (20:08 +0200)]
Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
.qmake.conf

Change-Id: Ic2de78608a0a236c8125eff7d6950089f1ca559b

8 years agoBump version
Oswald Buddenhagen [Mon, 29 Jun 2015 08:47:47 +0000 (10:47 +0200)]
Bump version

Change-Id: I1a0d7f96adb698c0012c1b41771e8bf16b1ddec9

8 years agoAdd changes file for 5.5.0 release
Eirik Aavitsland [Wed, 3 Jun 2015 12:16:54 +0000 (14:16 +0200)]
Add changes file for 5.5.0 release

Change-Id: I56eb43d6fe834d5fba90e78267290fd73290fd5b
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
8 years agoMerge remote-tracking branch 'origin/5.5' into dev
Liang Qi [Wed, 3 Jun 2015 08:58:45 +0000 (10:58 +0200)]
Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: Id8a59a58c7e5ca2f977c1e7408ff05033a9cc16b

8 years agoHandle Grayscale8 TIFFs
Allan Sandfeld Jensen [Tue, 21 Apr 2015 11:07:11 +0000 (13:07 +0200)]
Handle Grayscale8 TIFFs

Correctly read and write Grayscale8 image format.

Change-Id: I537c68f94077458c69ee1de08b5b37986b54aa26
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
9 years agoAndroid: Build webp plugin
Eskil Abrahamsen Blomfeldt [Tue, 17 Feb 2015 09:29:27 +0000 (10:29 +0100)]
Android: Build webp plugin

We need to include the cpufeatures module in the build for
Android, and we need to make sure the neon files are compiled
with neon flags turned on. Since these are .c files, we
cannot use the regular simd.prf approach, which only supports
.cpp, so the compiler is basically copy-pasted from simd.prf,
but using QMAKE_CC instead of QMAKE_CXX.

[ChangeLog][Android] Added support for webp image format.

Change-Id: Id702b8202bee963d23beb02a7dc163756c8ca712
Task-number: QTBUG-38715
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
9 years agoOptional application of orientation for TIFF
Allan Sandfeld Jensen [Wed, 29 Apr 2015 08:55:27 +0000 (10:55 +0200)]
Optional application of orientation for TIFF

Make the image orientation only optionally applied for TIFF images
to match the new image handler flags.
The default however remains to apply transformation, as opposed
to JPEGs.

The patch also adds the capability to write metadata orientation.

Change-Id: Ie24664516138641342ab6d7559d591f38b9f1e8a
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
9 years agoCorrectly interpret RGBA tiff images as premultiplied
Allan Sandfeld Jensen [Tue, 21 Apr 2015 11:49:50 +0000 (13:49 +0200)]
Correctly interpret RGBA tiff images as premultiplied

The TIFFReadRGBAImageOriented method turns out to return colors with
alpha premultiplied by default. The only reason we pass our own tests
is because we also save the colors incorrectly unpremultiplied.

The patch fixes the format type of the returned images, and explictily
writes the how alpha should be interpreted in the saved files.

Change-Id: Ie1c3881acfe07eae25ca735adf243c1636f656a0
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
9 years agoClean up reading TIFF headers
Allan Sandfeld Jensen [Mon, 20 Apr 2015 09:27:10 +0000 (11:27 +0200)]
Clean up reading TIFF headers

Split reading TIFF headers from the decoding to make it
possible to read correct metadata on undecoded images.

This fixes reading the image format from the QImageReader,
and is necessary for later patches.

Change-Id: Ida27e98252bf95459d87354586d4a5fba348efcb
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
9 years agoFixed calculation of normal maps in DDS
Ivan Komissarov [Thu, 23 Apr 2015 12:07:45 +0000 (15:07 +0300)]
Fixed calculation of normal maps in DDS

This fix changes range of values for Z coordinate to 0..255
instead of 127.5..255 for ATI2 textures

Change-Id: I53e7243c913483043599442ce13e42b07ee22ce6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
9 years agoBump version
Oswald Buddenhagen [Mon, 20 Apr 2015 10:27:56 +0000 (12:27 +0200)]
Bump version

Change-Id: Id5669f0ab9cb3c27e57d9fc39fa1bd62d793b6db

9 years agoMerge remote-tracking branch 'origin/5.4' into 5.5
Liang Qi [Wed, 15 Apr 2015 07:10:02 +0000 (09:10 +0200)]
Merge remote-tracking branch 'origin/5.4' into 5.5

Change-Id: Ib6f1512a15f2714a712ff82df55a9d3de8e46ffd

9 years agoRemove more extraneous files from bundled libtiff
Eirik Aavitsland [Thu, 9 Apr 2015 14:41:15 +0000 (16:41 +0200)]
Remove more extraneous files from bundled libtiff

They are HOWTO-RELEASE, SConstruct, nmake.opt and html sub directory.

Change-Id: If7d3aad3a353caa14239b1faf0af8b9cd393bcf7
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
9 years agolibwebp: update patches to 0.4.3 for Qt usage
Liang Qi [Wed, 8 Apr 2015 08:11:01 +0000 (10:11 +0200)]
libwebp: update patches to 0.4.3 for Qt usage

Change-Id: I1b333671e778824cc29b9c2125121fc7f1889b4d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
9 years agolibwebp: update to 0.4.3
Liang Qi [Wed, 8 Apr 2015 08:10:02 +0000 (10:10 +0200)]
libwebp: update to 0.4.3

This commit imports libwebp 0.4.3, including AUTHORS, COPYING, ChangeLog,
NEWS, PATENTS, README and src directories. In src, only includes header
and source files.

The patches required to build it in Qt will follow in separate
commit(s).

Change-Id: I23ebfd69e47a468c91a9e9b109e9cb8ac63705d4
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
9 years agoFix MSVC warning C4005: 'JAS_WIN_MSVC_BUILD' : macro redefinition
Debao Zhang [Mon, 30 Mar 2015 05:22:13 +0000 (13:22 +0800)]
Fix MSVC warning C4005: 'JAS_WIN_MSVC_BUILD' : macro redefinition

This macro has been defined in the jasper.pri file:
msvc: DEFINES += JAS_WIN_MSVC_BUILD

Change-Id: I3ac06e4f373c59ded4e3c2ebfa6f50e40a3c83ae
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
9 years agoDDS: fix image format check
Maks Naumov [Sat, 20 Sep 2014 14:23:37 +0000 (17:23 +0300)]
DDS: fix image format check

Replace duplicated bBitMask check by the intended gBitMask check.

Change-Id: I6d1780a4112e88484de661f07a15f2121602b86c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
9 years agoReplace malloc'ed tables with QVarLengthArray
Allan Sandfeld Jensen [Mon, 16 Mar 2015 13:08:31 +0000 (14:08 +0100)]
Replace malloc'ed tables with QVarLengthArray

Basic cleanup using proper Qt classes instead of malloc.

Change-Id: I532b47aac7cfe15a5963371224288bec08135f25
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
9 years agoCorrect mask of A2B10G10R10
Allan Sandfeld Jensen [Mon, 16 Mar 2015 11:52:23 +0000 (12:52 +0100)]
Correct mask of A2B10G10R10

Green mask is missing an F.

Change-Id: I7387ef01ee414abc1a48efec71d71f46922c1bed
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
9 years agoMerge remote-tracking branch 'origin/5.5' into dev
Frederik Gladhorn [Tue, 3 Mar 2015 17:13:45 +0000 (18:13 +0100)]
Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: I8290a104654f86140ec32f4f51b474344b91a100

9 years agoFix compiler warnings.
Christian Kandeler [Tue, 24 Feb 2015 17:02:02 +0000 (18:02 +0100)]
Fix compiler warnings.

The jas_image_coord_t is typedef'ed to int_fast32_t, which can be
long.

Change-Id: I78ed4731d9adf3ea9bd63092edd3f96a185d9c79
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
9 years agoBump version
Oswald Buddenhagen [Tue, 24 Feb 2015 15:22:54 +0000 (16:22 +0100)]
Bump version

Change-Id: I0f12e18ad97550ea444e21aa1008e7ed6bc68fcc

9 years agoUse std math on doubles and include cmath
Sean Harmer [Wed, 18 Feb 2015 13:46:28 +0000 (13:46 +0000)]
Use std math on doubles and include cmath

Required to build on QNX 6.6.

Change-Id: If45aef4e3c0488f390187858e8ecafb18d7f5960
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
9 years agoRead grayscale JP2000 as grayscale
Allan Sandfeld Jensen [Mon, 16 Feb 2015 16:04:47 +0000 (17:04 +0100)]
Read grayscale JP2000 as grayscale

Return a real grayscale qimage instead of an 8-bit indexed qimage.

Change-Id: I6f47bfe4268a675f8ce54f9daed10e94feb9e309
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
9 years agoCleanup math include
Allan Sandfeld Jensen [Mon, 16 Feb 2015 16:02:22 +0000 (17:02 +0100)]
Cleanup math include

Use cmath methods

Change-Id: I8e2f76f78440b6db84174e3f56e734db35abad68
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
9 years agoUpdate copyright headers
Jani Heikkinen [Wed, 28 Jan 2015 11:42:13 +0000 (13:42 +0200)]
Update copyright headers

Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.

Change-Id: I6aafb5f38bfaf68a9f4eaca69a56006db5cd8843
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
9 years agoMerge remote-tracking branch 'origin/5.4' into dev
Frederik Gladhorn [Mon, 19 Jan 2015 12:55:27 +0000 (13:55 +0100)]
Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
.qmake.conf

Change-Id: I72c06814a05ac09cb498d4af89dc9e7d791e6cce

9 years agoBump version
Oswald Buddenhagen [Fri, 16 Jan 2015 20:06:30 +0000 (21:06 +0100)]
Bump version

Change-Id: If3598afc841e6109716921aea3b72a10d423f52e

9 years agoMerge remote-tracking branch 'origin/5.4' into dev
Frederik Gladhorn [Wed, 17 Dec 2014 15:53:07 +0000 (16:53 +0100)]
Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
.qmake.conf

Change-Id: I24c15b9824a6a2a68d1cb3d0aef0650e024164d6

9 years agoMerge remote-tracking branch 'origin/5.4.0' into 5.4 v5.4.1
Frederik Gladhorn [Wed, 17 Dec 2014 11:51:49 +0000 (12:51 +0100)]
Merge remote-tracking branch 'origin/5.4.0' into 5.4

Change-Id: Ifa04cb59a4b0985e6261678c0d0b62438a50e91c

9 years agoBump version
Oswald Buddenhagen [Fri, 12 Dec 2014 12:48:15 +0000 (13:48 +0100)]
Bump version

Change-Id: Idc22f4e16ba0977a48a1c29be380f999dc972f8d

9 years agoAdded changes file for 5.4.0 v5.4.0
aavit [Thu, 27 Nov 2014 09:16:04 +0000 (10:16 +0100)]
Added changes file for 5.4.0

Change-Id: Id9672b324af8aa96d79d534b616520049b6e77e3
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
9 years agoMerge remote-tracking branch 'origin/5.4' into dev
Frederik Gladhorn [Thu, 27 Nov 2014 17:28:46 +0000 (18:28 +0100)]
Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I8b76d2098cc2d8bca5a63798d53182144d6a4442

9 years agoDon't try to use incompatible system libwebp
aavit [Mon, 24 Nov 2014 14:07:42 +0000 (15:07 +0100)]
Don't try to use incompatible system libwebp

Make the config test check compatibility more thoroughly.

Task-number: QTBUG-42850
Change-Id: I0771ee633868ad9a7ef03eee2434504d40bc9ce4
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
9 years agoMerge remote-tracking branch 'origin/5.4' into dev
Frederik Gladhorn [Fri, 21 Nov 2014 15:12:41 +0000 (16:12 +0100)]
Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: Id484a6b43e3ee15e06e8291ae69f717b855a2fe5

9 years agoMerge remote-tracking branch 'origin/5.4.0' into 5.4
Frederik Gladhorn [Fri, 21 Nov 2014 12:45:12 +0000 (13:45 +0100)]
Merge remote-tracking branch 'origin/5.4.0' into 5.4

Change-Id: I9002ef6585513ebfb9e641e890f8b0e855c67a08

9 years agoAvoid implicit function declaration compile errors in libjasper
aavit [Fri, 14 Nov 2014 09:26:53 +0000 (10:26 +0100)]
Avoid implicit function declaration compile errors in libjasper

Compilation for macx-ios-clang_OSX_10.9 would fail since the
jas_eprintf function was used undeclared. Fix by #including
jas_debug.h before4 use of that function.

Also restructure some code in jpc_tsfb.c to prevent the same
issue for jpc_tsfb_synthesize2 and jpc_tsfb_analyze2.

Change-Id: Ib5b444873af6aa756d1c77145acdd863eaca0bd2
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
9 years agoDisable webp also for ios
aavit [Mon, 17 Nov 2014 09:01:57 +0000 (10:01 +0100)]
Disable webp also for ios

Already disabled for android and winrt; seems that libwebp's use of
neon does not compile.

Change-Id: Ia119244da1ae3c92f69dfe5ed91d20e665102958
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
9 years agoQMngHandler: Avoid endless loop
aavit [Tue, 4 Nov 2014 12:04:57 +0000 (13:04 +0100)]
QMngHandler: Avoid endless loop

In case the animation only has one frame, like Waves1.mng in the bug
report.

Task-number: QTBUG-42321
Change-Id: Id6616f4f51c1b6f06f7e4677cbd9e56135d2a52b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
9 years agoQMngHandler: Prevent division by zero.
Friedemann Kleint [Mon, 3 Nov 2014 15:43:14 +0000 (16:43 +0100)]
QMngHandler: Prevent division by zero.

Task-number: QTBUG-42321
Change-Id: I1d0762782e71fb13f96d0f42c4661b708e02051d
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
9 years agoMerge remote-tracking branch 'origin/5.4' into dev
Frederik Gladhorn [Mon, 20 Oct 2014 17:13:08 +0000 (19:13 +0200)]
Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: Ie20395da30acdbf0ac42089208046f0526fd5fb7

9 years agoMerge remote-tracking branch 'origin/5.3' into 5.4
Frederik Gladhorn [Tue, 14 Oct 2014 12:04:59 +0000 (14:04 +0200)]
Merge remote-tracking branch 'origin/5.3' into 5.4

Change-Id: I96f7e13e5a6f65dae1a9f7717e30021f81cf1e81

9 years agoMerge remote-tracking branch 'origin/5.4' into dev
Frederik Gladhorn [Thu, 9 Oct 2014 16:04:40 +0000 (18:04 +0200)]
Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I7672ca8c233430d2e5e0627f55c782ea123d93fa

9 years agoFix libmng test. v5.3.99+beta1
Lisandro Damián Nicanor Pérez Meyer [Wed, 17 Sep 2014 22:04:06 +0000 (19:04 -0300)]
Fix libmng test.

libmng pulls in libjpeg. In turn libjpeg requires that code that uses it should
include stdio.h [0].

[0] <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=461602#10>

So adding the corresponding include before libmng solves the issue.

Change-Id: I7cfbda727ed5b71b668d6597358a5e9c7d8918bb
Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
9 years agoMerge remote-tracking branch 'origin/5.3.2' into 5.3
Frederik Gladhorn [Wed, 17 Sep 2014 18:58:22 +0000 (20:58 +0200)]
Merge remote-tracking branch 'origin/5.3.2' into 5.3

Change-Id: Ief8c794e676fae84b5de6ad241646a43d898c023

9 years agoMerge remote-tracking branch 'origin/5.3' into 5.4
Frederik Gladhorn [Tue, 16 Sep 2014 13:26:19 +0000 (15:26 +0200)]
Merge remote-tracking branch 'origin/5.3' into 5.4

Conflicts:
.qmake.conf

Change-Id: I4453973e64dc6488fce35b2eccf98ead5d1006e8

9 years agoRemove some material with questionable copyright
Lars Knoll [Wed, 3 Sep 2014 06:25:23 +0000 (08:25 +0200)]
Remove some material with questionable copyright

Change-Id: I81bc4d678f717ccc73b0199d3dd0ba0d73be716d
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
9 years agoSilence warning about unused parameter
Thiago Macieira [Tue, 2 Sep 2014 23:58:33 +0000 (16:58 -0700)]
Silence warning about unused parameter

It's only used in debug mode.

qjp2handler.cpp:1183:55: warning: unused parameter 'image' [-Wunused-parameter]

Change-Id: I0260f21dbee2105f297af0224e25f14a88ee4557
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
9 years agoBump version
Frederik Gladhorn [Fri, 29 Aug 2014 09:33:34 +0000 (11:33 +0200)]
Bump version

Change-Id: Idd9e1d79ccde1c4fe4d5bda0007f6a4c357e5840

9 years agoMerge remote-tracking branch 'origin/5.4' into dev
Frederik Gladhorn [Thu, 28 Aug 2014 15:49:48 +0000 (17:49 +0200)]
Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I1167df7c6dd3fb394011cd98edaa84f868d41eaf

9 years agoUpdate license headers and add new licenses
Jani Heikkinen [Fri, 22 Aug 2014 07:47:43 +0000 (10:47 +0300)]
Update license headers and add new licenses

- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3 & LICENSE.GPLv2
- Removed LICENSE.GPL

Change-Id: I803e1abdc6f126d5251746422e16fff7463f2dff
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
9 years agoBump version
Oswald Buddenhagen [Sat, 9 Aug 2014 19:30:28 +0000 (21:30 +0200)]
Bump version

Change-Id: I628c7b8a6082a6e738f348da7d6b28b31288fd14

9 years agoAdd support for SubType and SupportedSubTypes options in DDS handler
Ivan Komissarov [Tue, 7 Jan 2014 12:09:11 +0000 (16:09 +0400)]
Add support for SubType and SupportedSubTypes options in DDS handler

Change-Id: I2fa563bf023871e9e99ed32829f978577eaf2a68
Reviewed-by: Alex Char <prevedtest@gmail.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
9 years agoRenamed A8R8G8B8_2.dds to A8R8G8B8.2.dds.
Ivan Komissarov [Tue, 5 Aug 2014 09:05:09 +0000 (13:05 +0400)]
Renamed A8R8G8B8_2.dds to A8R8G8B8.2.dds.

This fix is needed for further patch to be able to get image format
(subtype) from filename.

Change-Id: I0de72be6c8d1942e6ad63c4d131bd380379a5417
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
9 years agoMerge remote-tracking branch 'origin/5.3' into dev
Frederik Gladhorn [Tue, 29 Jul 2014 10:50:26 +0000 (12:50 +0200)]
Merge remote-tracking branch 'origin/5.3' into dev

Change-Id: I15c1f7d4fd700c04f3f27720fc79abd3827eeeed

9 years agoDoc: Removing url variable from qdocconf file.
Jerome Pasion [Fri, 4 Jul 2014 12:45:09 +0000 (14:45 +0200)]
Doc: Removing url variable from qdocconf file.

-url inherited from the url variable set in qtbase/doc/global

Change-Id: I9d7f513b1e47c5ebd3d0bd0bf0f7647c175d096e
Reviewed-by: Martin Smith <martin.smith@digia.com>
9 years agoSave opaque images as opaque TIFF files
Allan Sandfeld Jensen [Mon, 3 Feb 2014 11:30:38 +0000 (12:30 +0100)]
Save opaque images as opaque TIFF files

We currently save all non-indexed images as RGBA TIFF files. We should
save them without an alpha channel, to save space and maintain the
information that they are opaque.

Task-number: QTBUG-18475
Change-Id: Id656f4078ea0a1b88235fb04add99a4680422354
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
9 years agoFix DDS image writing
aavit [Tue, 1 Jul 2014 09:06:01 +0000 (11:06 +0200)]
Fix DDS image writing

The code did not correctly do the 90-degree rotation needed for DDS,
and would fail on non-square images.

Task-number: QTBUG-39899
Change-Id: I1599e3fe44ff7895db8aa6e325fa8fdba2106694
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
9 years agoMerge remote-tracking branch 'origin/5.3' into dev
Frederik Gladhorn [Thu, 26 Jun 2014 15:24:24 +0000 (17:24 +0200)]
Merge remote-tracking branch 'origin/5.3' into dev

Conflicts:
.qmake.conf

Change-Id: Ia2ad5d124b5ade98463e2304a96458d5d9fb9a59

9 years agoSuppress "sequential device" warning for other files.
Alex [Tue, 24 Jun 2014 18:07:48 +0000 (22:07 +0400)]
Suppress "sequential device" warning for other files.

Hides "sequential device" warning for non-icns data.

Task-number: QTBUG-39838
Change-Id: Ib09f519de04a53e9d685b14412c40ee0077fb3d9
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
9 years agoBump version
Oswald Buddenhagen [Tue, 17 Jun 2014 22:36:02 +0000 (00:36 +0200)]
Bump version

Change-Id: I76c25993967a23329da5983a13a6198662566c58

9 years agoMerge remote-tracking branch 'origin/5.3' into dev
Sergio Ahumada [Sat, 14 Jun 2014 20:00:17 +0000 (22:00 +0200)]
Merge remote-tracking branch 'origin/5.3' into dev

Conflicts:
.qmake.conf

Change-Id: Iea93fd02ca221e7b36328245f593cbe48cd2771c

9 years agoMake QWebpHandler::write() work on big endian systems upstream/5.3.1
Dmitry Shachnev [Thu, 29 May 2014 06:58:33 +0000 (10:58 +0400)]
Make QWebpHandler::write() work on big endian systems

Currently, we convert image to Format_ARGB32. This means that on big
endian systems the order of bytes will be (0xAA, 0xRR, 0xGG, 0xBB).
However, in WebP library there is no function to import bytes in
ARGB format.

This commit makes us use Format_RGBA8888 and WebPPictureImportRGBA
on big endian systems, which will make the function work correctly.

Change-Id: I5f347f3ec66f0a57df0d40d4900b1573f9400506
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
Reviewed-by: aavit <eirik.aavitsland@digia.com>
10 years agoBump MODULE_VERSION to 5.3.1 upstream/5.2.95+rc1 upstream/5.2.96+rc2 upstream/5.3.0
Sergio Ahumada [Thu, 17 Apr 2014 15:21:21 +0000 (17:21 +0200)]
Bump MODULE_VERSION to 5.3.1

Change-Id: If8c86e33a045ea50d957a2a68c204a8de2fad65c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
10 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Mon, 24 Mar 2014 15:06:33 +0000 (16:06 +0100)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I6a7d0055183a4bf7f850667d11a7dd0f477f4aa9

10 years agoRemove unused and unlinked qdocconf file from the project.
Jędrzej Nowacki [Fri, 7 Mar 2014 11:46:53 +0000 (12:46 +0100)]
Remove unused and unlinked qdocconf file from the project.

Change-Id: I2d0b60c47d92ba82e04a0d90877bda6b287f5a85
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
10 years agoMerge remote-tracking branch 'origin/stable' into dev
Sergio Ahumada [Mon, 10 Mar 2014 16:37:25 +0000 (17:37 +0100)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I7a67d831d24b298dbf48a6cac2c5f7e519a4616a

10 years agoAdd support for reading icon variants in ICNS plugin
Alex [Wed, 15 Jan 2014 15:36:44 +0000 (19:36 +0400)]
Add support for reading icon variants in ICNS plugin

Change-Id: I68395ac4e9604d852405643710aa79585974b3e3
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
10 years agoAdded webp information in doc and changelog upstream/5.2.90+alpha
Liang Qi [Thu, 20 Feb 2014 12:58:59 +0000 (13:58 +0100)]
Added webp information in doc and changelog

Change-Id: I1287608e914598c58acff70a47f71cc0bf36f094
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoBump module version to 5.4.0
Thiago Macieira [Wed, 19 Feb 2014 20:20:48 +0000 (12:20 -0800)]
Bump module version to 5.4.0

Change-Id: I99032534d75746d28f68bba80bcbda63eac7cb11
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoAdded webp image format plugin
Steven Yao [Thu, 25 Apr 2013 07:26:53 +0000 (09:26 +0200)]
Added webp image format plugin

Also added auto test and config test.

This plugin was disabled on winrt and android.

[ChangeLog] Added webp image format plugin.

Task-number: QTBUG-14205

Done-with: Liang Qi <liang.qi@digia.com>
Change-Id: I9409e894d7fc1aef9dce4ffdff8bdf483d689774
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoAdding libwebp: Patches to libwebp 0.4.0 for Qt usage
Liang Qi [Thu, 25 Apr 2013 07:25:07 +0000 (09:25 +0200)]
Adding libwebp: Patches to libwebp 0.4.0 for Qt usage

Task-number: QTBUG-14205
Change-Id: Id7c3f4d9398b613a18033d8f3f624448f31ce33d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoAdding libwebp: Adding clean copy of libwebp 0.4.0
Liang Qi [Thu, 23 Jan 2014 10:21:03 +0000 (11:21 +0100)]
Adding libwebp: Adding clean copy of libwebp 0.4.0

This commit imports libwebp 0.4.0, including AUTHORS, COPYING, ChangeLog,
NEWS, PATENTS, README and src directories. In src, only includes header
and source files.

The patches required to build it in Qt will follow in separate
commit(s).

Task-number: QTBUG-14205
Change-Id: I747918fe2a07716f66cffb795129f7aa5e067759
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoAdd JPEG 2000 plugin.
Jake Petroules [Mon, 6 Jan 2014 12:52:54 +0000 (07:52 -0500)]
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>