add id parameter to digram funtions
Merge branch 'master' of github.com:lutianming/camera