potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge pull request #14725 from alalek:update_openexr_2.3.0

Browse Source 
3rdparty: update OpenEXR 2.3.0 (#14725)

* openexr 2.2.1

* openexr 2.3.0

* openexr: build fixes

* openexr: build dwa tables on-demand
This commit is contained in:
Alexander Alekhin
2019-06-10 20:04:23 +03:00
committed by GitHub
parent d2f9cfcf81
commit 878af7ada8
285 changed files with 44878 additions and 12743 deletions
Download Patch File Download Diff File Expand all files Collapse all files
3rdparty/openexr/IlmThread/IlmThread.cpp
Vendored
+54 -18
View File
@@ -1,10 +1,10 @@
///////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2005, Industrial Light & Magic, a division of Lucas
// Copyright (c) 2005-2012, Industrial Light & Magic, a division of Lucas
// Digital Ltd. LLC
//
//
// All rights reserved.
//
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
@@ -16,8 +16,8 @@
// distribution.
// * Neither the name of Industrial Light & Magic nor the names of
// its contributors may be used to endorse or promote products derived
// from this software without specific prior written permission.
//
// from this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -34,21 +34,56 @@
//-----------------------------------------------------------------------------
//
// class Thread -- dummy implementation for
// platforms that do not support threading
// class Thread -- this file contains two implementations of thread:
// - dummy implementation for platforms that do not support threading
// when OPENEXR_FORCE_CXX03 is on
// - c++11 and newer version
//
//-----------------------------------------------------------------------------
#include "IlmBaseConfig.h"
#if !defined (_WIN32) && !defined(_WIN64) && !(HAVE_PTHREAD)
#include "IlmThread.h"
#include "Iex.h"
namespace IlmThread {
ILMTHREAD_INTERNAL_NAMESPACE_SOURCE_ENTER
#ifndef ILMBASE_FORCE_CXX03
//-----------------------------------------------------------------------------
// C++11 and newer implementation
//-----------------------------------------------------------------------------
bool
supportsThreads ()
{
return true;
}
Thread::Thread ()
{
// empty
}
Thread::~Thread ()
{
// hopefully the thread has basically exited and we are just
// cleaning up, because run is a virtual function, so the v-table
// has already been partly destroyed...
if ( _thread.joinable () )
_thread.join ();
}
void
Thread::start ()
{
_thread = std::thread (&Thread::run, this);
}
#else
# if !defined (_WIN32) &&!(_WIN64) && !(HAVE_PTHREAD)
//-----------------------------------------------------------------------------
// OPENEXR_FORCE_CXX03 with no windows / pthread support
//-----------------------------------------------------------------------------
bool
supportsThreads ()
{
@@ -58,23 +93,24 @@ supportsThreads ()
Thread::Thread ()
{
throw Iex::NoImplExc ("Threads not supported on this platform.");
throw IEX_NAMESPACE::NoImplExc ("Threads not supported on this platform.");
}
Thread::~Thread ()
{
throw Iex::NoImplExc ("Threads not supported on this platform.");
throw IEX_NAMESPACE::NoImplExc ("Threads not supported on this platform.");
}
void
Thread::start ()
{
throw Iex::NoImplExc ("Threads not supported on this platform.");
throw IEX_NAMESPACE::NoImplExc ("Threads not supported on this platform.");
}
} // namespace IlmThread
# endif
#endif
ILMTHREAD_INTERNAL_NAMESPACE_SOURCE_EXIT