Merge branch 'master' into issue-254
authormayeut <mayeut@users.noreply.github.com>
Fri, 5 Jun 2015 18:42:57 +0000 (20:42 +0200)
committermayeut <mayeut@users.noreply.github.com>
Fri, 5 Jun 2015 18:42:57 +0000 (20:42 +0200)
commitc7535d084e1619f957f23bd18284dc3f3214165f
tree5bda64598694437239f52381c83a2b56d1854736
parentd1a941ea50bbae66a566771d408555bdc5134348
parentc0d7afe15c0e88886582a357a4e2fb797ac8a820
Merge branch 'master' into issue-254
src/lib/openjp2/j2k.c
src/lib/openjp2/j2k.h