generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4002 from marvins:gdal-fix

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-05-12 14:33:06 +00:00
commit b8d40b4ad5
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/OpenCVFindLibsGrfmt.cmake
View File

@ -208,5 +208,6 @@ if(WITH_GDAL)
set(HAVE_GDAL NO)
else()
set(HAVE_GDAL YES)
ocv_include_directories(${GDAL_INCLUDE_DIR})
endif()
endif()

6
modules/imgcodecs/src/grfmt_gdal.hpp
View File

@ -52,9 +52,9 @@
#include <iostream>
/// Geospatial Data Abstraction Library
#include <gdal/cpl_conv.h>
#include <gdal/gdal_priv.h>
#include <gdal/gdal.h>
#include <cpl_conv.h>
#include <gdal_priv.h>
#include <gdal.h>
/// Start of CV Namespace