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

Merge pull request #14725 from alalek:update_openexr_2.3.0

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
+9 -8
View File
@@ -2,9 +2,9 @@
//
// Copyright (c) 2004, 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
@@ -41,8 +41,9 @@
#include <ImfKeyCodeAttribute.h>
namespace Imf {
OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_ENTER
using namespace OPENEXR_IMF_INTERNAL_NAMESPACE;
template <>
const char *
@@ -54,7 +55,7 @@ KeyCodeAttribute::staticTypeName ()
template <>
void
KeyCodeAttribute::writeValueTo (OStream &os, int) const
KeyCodeAttribute::writeValueTo (OPENEXR_IMF_INTERNAL_NAMESPACE::OStream &os, int version) const
{
Xdr::write <StreamIO> (os, _value.filmMfcCode());
Xdr::write <StreamIO> (os, _value.filmType());
@@ -68,7 +69,7 @@ KeyCodeAttribute::writeValueTo (OStream &os, int) const
template <>
void
KeyCodeAttribute::readValueFrom (IStream &is, int, int)
KeyCodeAttribute::readValueFrom (OPENEXR_IMF_INTERNAL_NAMESPACE::IStream &is, int size, int version)
{
int tmp;
@@ -95,4 +96,4 @@ KeyCodeAttribute::readValueFrom (IStream &is, int, int)
}
} // namespace Imf
OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_EXIT