Fixed for latest opencv build