Start merging change from svn trunk
authorMathieu Malaterre <mathieu.malaterre@gmail.com>
Tue, 22 Jun 2010 17:29:21 +0000 (17:29 +0000)
committerMathieu Malaterre <mathieu.malaterre@gmail.com>
Tue, 22 Jun 2010 17:29:21 +0000 (17:29 +0000)
commit5badc82fa9380a7bcfe12369c7ed4f3738ede167
tree3374bcdae28caa91ce21724b57d4fff3a2c6819d
parentecd70f033cbc0cc1663004522277ebed4c9d9a3d
Start merging change from svn trunk
codec/CMakeLists.txt
codec/convert.c
codec/image_to_j2k.c