Skip to content

O
opencv
Commit b8d40b4a authored by Vadim Pisarevsky's avatar Vadim Pisarevsky
Browse files
Options

Merge pull request #4002 from marvins:gdal-fix

parents a31b2930 ae933db5
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
cmake/OpenCVFindLibsGrfmt.cmake
View file @ b8d40b4a
...@@ -208,5 +208,6 @@ if(WITH_GDAL) ...@@ -208,5 +208,6 @@ if(WITH_GDAL)
set(HAVE_GDAL NO) set(HAVE_GDAL NO)
else() else()
set(HAVE_GDAL YES) set(HAVE_GDAL YES)
ocv_include_directories(${GDAL_INCLUDE_DIR})
endif() endif()
endif() endif()
modules/imgcodecs/src/grfmt_gdal.hpp
View file @ b8d40b4a
...@@ -52,9 +52,9 @@ ...@@ -52,9 +52,9 @@
#include <iostream> #include <iostream>
/// Geospatial Data Abstraction Library /// Geospatial Data Abstraction Library
#include <gdal/cpl_conv.h> #include <cpl_conv.h>
#include <gdal/gdal_priv.h> #include <gdal_priv.h>
#include <gdal/gdal.h> #include <gdal.h>
/// Start of CV Namespace /// Start of CV Namespace
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment