1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00

Fixed compile warning from redefined macro.

This commit is contained in:
Marvin Smith
2015-01-17 20:37:51 -08:00
parent 91fbe00caa
commit 9a0e038a48
3 changed files with 21 additions and 7 deletions
+11 -2
View File
@@ -39,10 +39,16 @@
//
//M*/
#include "precomp.hpp"
#include "grfmt_gdal.hpp"
// GDAL Macros
#include "cvconfig.h"
#ifdef HAVE_GDAL
// Our Header
#include "grfmt_gdal.hpp"
/// C++ Standard Libraries
#include <iostream>
#include <stdexcept>
@@ -196,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 ){