Ported back to opencv49 complete