Merge pull request #3616 from marvins:gdal-fixes

modules/imgcodecs/include/opencv2/imgcodecs.hpp

@@ -90,6 +90,8 @@ enum { IMWRITE_PNG_STRATEGY_DEFAULT      = 0,
 
 /** @brief Loads an image from a file.
 
+@anchor imread
+
 @param filename Name of file to be loaded.
 @param flags Flags specifying the color type of a loaded image:
 -   CV_LOAD_IMAGE_ANYDEPTH - If set, return 16-bit/32-bit image when the input has the

modules/imgcodecs/src/grfmt_gdal.cpp

@@ -38,10 +38,17 @@
 // the use of this software, even if advised of the possibility of such damage.
 //
 //M*/
-#include "grfmt_gdal.hpp"
+#include "precomp.hpp"
+
+// GDAL Macros
+#include "cvconfig.h"
 
 #ifdef HAVE_GDAL
 
+// Our Header
+#include "grfmt_gdal.hpp"
+
+
 /// C++ Standard Libraries
 #include <iostream>
 #include <stdexcept>
@@ -195,7 +202,10 @@ GdalDecoder::~GdalDecoder(){
 /**
  * Convert data range
 */
-double range_cast( const GDALDataType& gdalType, const int& cvDepth, const double& value ){
+double range_cast( const GDALDataType& gdalType,
+                   const int& cvDepth,
+                   const double& value )
+{
 
     // uint8 -> uint8
     if( gdalType == GDT_Byte && cvDepth == CV_8U ){

modules/imgcodecs/src/grfmt_gdal.hpp

@@ -42,16 +42,15 @@
 #ifndef __GRFMT_GDAL_HPP__
 #define __GRFMT_GDAL_HPP__
 
+/// OpenCV FMT Base Type
+#include "grfmt_base.hpp"
+
 /// Macro to make sure we specified GDAL in CMake
 #ifdef HAVE_GDAL
 
 /// C++ Libraries
 #include <iostream>
 
-/// OpenCV Libraries
-#include "grfmt_base.hpp"
-#include "precomp.hpp"
-
 /// Geospatial Data Abstraction Library
 #include <gdal/cpl_conv.h>
 #include <gdal/gdal_priv.h>
@@ -61,6 +60,13 @@
 /// Start of CV Namespace
 namespace cv {
 
+/**
+ * Convert GDAL Pixel Range to OpenCV Pixel Range
+*/
+double range_cast( const GDALDataType& gdalType,
+                   const int& cvDepth,
+                   const double& value );
+
 /**
  * Convert GDAL Palette Interpretation to OpenCV Pixel Type
 */