From 014ba699a3594cec0de0ff38cd5da27d12e8bfc7 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Fri, 19 Aug 2011 19:18:32 +0000 Subject: [PATCH] Attempt to fix a build problem (ambiguous PixelType error when compiled on Mac x86) --- modules/highgui/src/grfmt_exr.cpp | 2 +- modules/highgui/src/grfmt_exr.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/highgui/src/grfmt_exr.cpp b/modules/highgui/src/grfmt_exr.cpp index 70040e5358..ac73b7732f 100644 --- 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 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 642000b502..9c8c609d00 100644 --- 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;