update by yuzhongqiang

Signed-off-by: yuzhongqiang <jy8yzq@163.com>
Merge branch 'master' of https://github.com/yuzhongqiang/machinevision

Conflicts:
	bmp.c