Merge pull request #4002 from marvins:gdal-fix

b8d40b4a · Vadim Pisarevsky · a31b2930 · ae933db5 · b8d40b4a · b8d40b4a
Commit b8d40b4a authored May 12, 2015 by Vadim Pisarevsky
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

OpenCVFindLibsGrfmt.cmake cmake/OpenCVFindLibsGrfmt.cmake +1 -0

grfmt_gdal.hpp modules/imgcodecs/src/grfmt_gdal.hpp +3 -3

No files found.
--- a/cmake/OpenCVFindLibsGrfmt.cmake
+++ b/cmake/OpenCVFindLibsGrfmt.cmake
@@ -208,5 +208,6 @@ if(WITH_GDAL)
        set(HAVE_GDAL NO)
    else()
        set(HAVE_GDAL YES)
+        ocv_include_directories(${GDAL_INCLUDE_DIR})
    endif()
 endif()
--- a/modules/imgcodecs/src/grfmt_gdal.hpp
+++ b/modules/imgcodecs/src/grfmt_gdal.hpp
@@ -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