Changes for rgbdemo 0.7.0 and pcl-1.7.1 including opencv-2.4.6.1