Merge with v2 branch
authorMathieu Malaterre <mathieu.malaterre@gmail.com>
Tue, 22 Jun 2010 17:32:19 +0000 (17:32 +0000)
committerMathieu Malaterre <mathieu.malaterre@gmail.com>
Tue, 22 Jun 2010 17:32:19 +0000 (17:32 +0000)
commitda0d29e4ab5b828300e549ad21d8d30476047197
tree6e65f3a6fede7c78247cc6a7e37eb1dd92cd66fd
parentf30f4c744e4242898c77962bbf691a43728ad421
Merge with v2 branch
codec/convert.c
codec/image_to_j2k.c