Commit 23c02563 authored by Alexander Alekhin's avatar Alexander Alekhin Committed by GitHub

Merge pull request #1119 from StevenPuttemans:master

fixing matlab wrapping
parents 40f1ac51 a960912b
...@@ -95,7 +95,7 @@ typedef cv::Ptr<TonemapDrago> Ptr_TonemapDrago; ...@@ -95,7 +95,7 @@ typedef cv::Ptr<TonemapDrago> Ptr_TonemapDrago;
typedef cv::Ptr<TonemapDurand> Ptr_TonemapDurand; typedef cv::Ptr<TonemapDurand> Ptr_TonemapDurand;
typedef cv::Ptr<TonemapMantiuk> Ptr_TonemapMantiuk; typedef cv::Ptr<TonemapMantiuk> Ptr_TonemapMantiuk;
typedef cv::Ptr<TonemapReinhard> Ptr_TonemapReinhard; typedef cv::Ptr<TonemapReinhard> Ptr_TonemapReinhard;
typedef cv::Ptr<float> Ptr_float;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// PREDECLARATIONS // PREDECLARATIONS
...@@ -522,6 +522,11 @@ public: ...@@ -522,6 +522,11 @@ public:
Bridge& operator=(const Ptr_TonemapReinhard& ) { return *this; } Bridge& operator=(const Ptr_TonemapReinhard& ) { return *this; }
Ptr_TonemapReinhard toPtrTonemapReinhard() { return Ptr_TonemapReinhard(); } Ptr_TonemapReinhard toPtrTonemapReinhard() { return Ptr_TonemapReinhard(); }
operator Ptr_TonemapReinhard() { return toPtrTonemapReinhard(); } operator Ptr_TonemapReinhard() { return toPtrTonemapReinhard(); }
// --------------------------- Ptr_float ----------------------
Bridge& operator=(const Ptr_float& ) { return *this; }
Ptr_float toPtrFloat() { return Ptr_float(); }
operator Ptr_float() { return toPtrFloat(); }
}; // class Bridge }; // class Bridge
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment