diff --git a/software/raspberry/superviseur-robot/lib/camera.cpp b/software/raspberry/superviseur-robot/lib/camera.cpp index 20c912f..8f177b2 100644 --- a/software/raspberry/superviseur-robot/lib/camera.cpp +++ b/software/raspberry/superviseur-robot/lib/camera.cpp @@ -52,9 +52,9 @@ bool Camera::Open() { #ifdef __FOR_PC__ if (this->cap.open(0)) { - //this->cap.set(CV_CAP_PROP_FORMAT, CV_8UC3); - this->cap.set(CV_CAP_PROP_FRAME_WIDTH, width); - this->cap.set(CV_CAP_PROP_FRAME_HEIGHT, height); + //this->cap.set(CAP_PROP_FORMAT, CV_8UC3); + this->cap.set(CAP_PROP_FRAME_WIDTH, width); + this->cap.set(CAP_PROP_FRAME_HEIGHT, height); status = true; } diff --git a/software/raspberry/superviseur-robot/lib/img.cpp b/software/raspberry/superviseur-robot/lib/img.cpp index 3626886..4c8e13b 100644 --- a/software/raspberry/superviseur-robot/lib/img.cpp +++ b/software/raspberry/superviseur-robot/lib/img.cpp @@ -239,11 +239,11 @@ Arena Img::SearchArena() { std::vector hierarchy; ImageMat imageTrt; - cv::cvtColor(this->img, imageTrt, CV_RGB2GRAY); // conversion en niveau de gris - cv::threshold(imageTrt, imageTrt, 128, 255, CV_THRESH_BINARY); // Threshold les éléments les plus clair + cv::cvtColor(this->img, imageTrt, cv::COLOR_RGB2GRAY); // conversion en niveau de gris + cv::threshold(imageTrt, imageTrt, 128, 255, cv::THRESH_BINARY); // Threshold les éléments les plus clair cv::Canny(imageTrt, imageTrt, 100, 200, 3); // detection d'angle - findContours(imageTrt, contours, hierarchy, CV_RETR_TREE, CV_CHAIN_APPROX_SIMPLE, cv::Point(0, 0)); + findContours(imageTrt, contours, hierarchy, cv::RETR_TREE, cv::CHAIN_APPROX_SIMPLE, cv::Point(0, 0)); for (unsigned int i = 0; i < contours.size(); i++) { approxPolyDP(ImageMat(contours[i]), approx, cv::arcLength(ImageMat(contours[i]), true) * 0.1, true); if (approx.size() == 4 && fabs(cv::contourArea(contours[i])) > 100000) {