diff options
author | Pedro Giffuni <pfg@apache.org> | 2012-09-19 22:31:29 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-29 20:43:45 +0100 |
commit | d5a3cf938907eb9ab61044810d984c73452eb200 (patch) | |
tree | 56e58c4871acb0d8126ad40026aad5016faa74ed /configmgr | |
parent | 520cab064ece64654d57d6414e4736a60542bd29 (diff) |
Updates to upstream Vigra
Vigra 1.6.0 (Newer versions use Cmake)
* Adds a lot of functionality and includes improvements
for 64 bit compilers.
* Add explicit cast (gcc 4.7 compatibility patch by Stephan Bergmann)
https://github.com/ukoethe/vigra/commit/e0dcd31c76bb13c98920e21544b309ca47bb3c5c
More information on the Vigra changes here:
http://hci.iwr.uni-heidelberg.de/vigra/doc/vigra/CreditsChangelog.html
(cherry picked from commit 0f94142a20861c18f60b5be6fc4163c7e8a69240)
Conflicts:
external_deps.lst
mdds/makefile.mk
mdds/prj/d.lst
vigra/makefile.mk
vigra/prj/d.lst
Change-Id: I05de88982b9dab7c851fab16811ca696207cd091
Vigra: add missing mathutil.hxx patch
(cherry picked from commit ba446263713f7ce1dcc47f78b97840280018af89)
Change-Id: I506f0c1c96cfaf278b4e72de34b24633a1e99431
fix vigra patch for BasicImage::resizeCopy()
"data_" is an actual data pointer but "data" is a member function
(since vigra-1.4). The method resizeCopy() seems to confuse data and data_
which the clang compiler was happy to point out. The OOo patch to vigra-1.4
already solved that problem but it was lost in the upgrade to vigra-1.6
(cherry picked from commit a71a282ae781b90c31e25eb631537f10fe842492)
Change-Id: Ifb031950c60efdda2d30e442990af95f557dd914
Build fix
(cherry picked from commit 6e6c057792a410dd36893674c59d452586733348)
Change-Id: Ide599665c78d377baf0b8f935274b41535749610
Diffstat (limited to 'configmgr')
0 files changed, 0 insertions, 0 deletions