Skip to content

opencv4 support #2619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
georgercarder wants to merge 2 commits into
base: master
Choose a base branch
from
Open

opencv4 support #2619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f85fd94
opencv4 support
georgercarder Aug 26, 2023
ed04374
del comments
georgercarder Aug 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
GPU=0
CUDNN=0
OPENCV=0
OPENCV=1
OPENMP=0
DEBUG=0

ARCH= -gencode arch=compute_30,code=sm_30 \
-gencode arch=compute_35,code=sm_35 \
-gencode arch=compute_75,code=sm_75 \
-gencode arch=compute_50,code=[sm_50,compute_50] \
-gencode arch=compute_52,code=[sm_52,compute_52]

# -gencode arch=compute_20,code=[sm_20,sm_21] \ This one is deprecated?

# This is what I use, uncomment if you know your arch and want to specify
Expand All @@ -19,13 +21,13 @@ ALIB=libdarknet.a
EXEC=darknet
OBJDIR=./obj/

CC=gcc
CPP=g++
CC=gcc-12
CPP=g++-12
NVCC=nvcc
AR=ar
ARFLAGS=rcs
OPTS=-Ofast
LDFLAGS= -lm -pthread
LDFLAGS= -lm -pthread
COMMON= -Iinclude/ -Isrc/
CFLAGS=-Wall -Wno-unused-result -Wno-unknown-pragmas -Wfatal-errors -fPIC

Expand All @@ -42,8 +44,8 @@ CFLAGS+=$(OPTS)
ifeq ($(OPENCV), 1)
COMMON+= -DOPENCV
CFLAGS+= -DOPENCV
LDFLAGS+= `pkg-config --libs opencv` -lstdc++
COMMON+= `pkg-config --cflags opencv`
LDFLAGS+= `pkg-config --libs opencv4` -lstdc++
COMMON+= `pkg-config --cflags opencv4`
endif

ifeq ($(GPU), 1)
Expand Down
10 changes: 8 additions & 2 deletions src/image_opencv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@

#include "stdio.h"
#include "stdlib.h"
#include "opencv2/opencv.hpp"

#include "opencv4/opencv2/opencv.hpp"
#include "opencv4/opencv2/core/types_c.h"
#include "opencv4/opencv2/core/core_c.h"
#include "opencv4/opencv2/videoio/legacy/constants_c.h"
#include "opencv4/opencv2/highgui/highgui_c.h"

#include "image.h"

using namespace cv;
Expand Down Expand Up @@ -60,7 +66,7 @@ Mat image_to_mat(image im)

image mat_to_image(Mat m)
{
IplImage ipl = m;
IplImage ipl = cvIplImage(m);
image im = ipl_to_image(&ipl);
rgbgr_image(im);
return im;
Expand Down