old
Merge branch 'master' of https://github.com/demonk/openjpeg

Conflicts:
	jpwl/encoder/jpwlenc/Debug/CL.read.1.tlog
	jpwl/encoder/jpwlenc/Debug/CL.write.1.tlog
	jpwl/encoder/jpwlenc/Debug/bscmake.read.1.tlog
	jpwl/encoder/jpwlenc/Debug/cl.command.1.tlog
	jpwl/encoder/jpwlenc/Debug/convert.obj
	jpwl/encoder/jpwlenc/Debug/dwt.obj
	jpwl/encoder/jpwlenc/Debug/image_to_j2k.bsc
	jpwl/encoder/jpwlenc/Debug/image_to_j2k.exe
	jpwl/encoder/jpwlenc/Debug/image_to_j2k.ilk
	jpwl/encoder/jpwlenc/Debug/image_to_j2k.log
	jpwl/encoder/jpwlenc/Debug/image_to_j2k.obj
	jpwl/encoder/jpwlenc/Debug/image_to_j2k.pdb
	jpwl/encoder/jpwlenc/Debug/j2k.obj
	jpwl/encoder/jpwlenc/Debug/jp2.obj
	jpwl/encoder/jpwlenc/Debug/jpt.obj
	jpwl/encoder/jpwlenc/Debug/jpw.obj
	jpwl/encoder/jpwlenc/Debug/pi.obj
	jpwl/encoder/jpwlenc/Debug/t1.obj
	jpwl/encoder/jpwlenc/Debug/t2.obj
	jpwl/encoder/jpwlenc/Debug/tcd.obj
	jpwl/encoder/jpwlenc/Debug/vc100.idb
	jpwl/encoder/jpwlenc/Debug/vc100.pdb
	jpwl/encoder/jpwlenc/image_to_j2k.sdf
	jpwl/encoder/jpwlenc/image_to_j2k.suo
	jpwl/encoder/libopenjpeg/tcd.c
8:22