Attempt to fix a build problem (ambiguous PixelType error when compiled on Mac x86)

diff --git a/modules/highgui/src/grfmt_exr.cpp b/modules/highgui/src/grfmt_exr.cpp
index 70040e5..ac73b77 100644 (file)
--- a/modules/highgui/src/grfmt_exr.cpp
+++ b/modules/highgui/src/grfmt_exr.cpp
@@ -589,7 +589,7 @@ bool  ExrEncoder::write( const Mat& img, const vector<int>& )
     int step = img.step;
 
     Header header( width, height );
-    PixelType type;
+    Imf::PixelType type;
 
     if(depth == 8)
         type = HALF;

diff --git a/modules/highgui/src/grfmt_exr.hpp b/modules/highgui/src/grfmt_exr.hpp
index 642000b..9c8c609 100644 (file)
--- a/modules/highgui/src/grfmt_exr.hpp
+++ b/modules/highgui/src/grfmt_exr.hpp
@@ -81,7 +81,7 @@ protected:
     void  RGBToGray( float *in, float *out );
 
     InputFile      *m_file;
-    PixelType       m_type;
+    Imf::PixelType  m_type;
     Box2i           m_datawindow;
     bool            m_ischroma;
     const Channel  *m_red;