Imageproc2.5 integration

#endif