Update to 1.7.3.
This commit is contained in:
parent
370c738063
commit
7626b9f07b
|
@ -1,34 +0,0 @@
|
|||
From fc8ec604f5cc4cafca063029adb2cdfee3107360 Mon Sep 17 00:00:00 2001
|
||||
From: Rafael Fonseca <rdossant@redhat.com>
|
||||
Date: Thu, 13 Oct 2016 15:36:20 +0200
|
||||
Subject: [PATCH] Fallback to HDF5 in case of big endian architectures.
|
||||
|
||||
Fixes https://github.com/imageworks/Field3D/issues/90
|
||||
---
|
||||
src/Field3DFile.cpp | 13 +++++++++++++
|
||||
1 file changed, 13 insertions(+)
|
||||
|
||||
diff --git a/src/Field3DFile.cpp b/src/Field3DFile.cpp
|
||||
index d34d364..e6caced 100644
|
||||
--- a/src/Field3DFile.cpp
|
||||
+++ b/src/Field3DFile.cpp
|
||||
@@ -826,6 +826,19 @@ bool Field3DInputFile::open(const string &filename)
|
||||
"In file: " + filename + " - Bad file hierarchy. ");
|
||||
success = false;
|
||||
}
|
||||
+ catch (runtime_error &e) {
|
||||
+ // HDF5 fallback
|
||||
+ m_hdf5.reset(new Field3DInputFileHDF5);
|
||||
+ m_hdf5Base = m_hdf5;
|
||||
+ if (m_hdf5->open(filename)) {
|
||||
+ // Handled. Just return.
|
||||
+ return true;
|
||||
+ } else {
|
||||
+ Msg::print(Msg::SevWarning,
|
||||
+ "In file: " + filename + ": " + string(e.what()));
|
||||
+ success = false;
|
||||
+ }
|
||||
+ }
|
||||
catch (...) {
|
||||
Msg::print(Msg::SevWarning,
|
||||
"In file: " + filename + " Unknown exception ");
|
11
Field3D.spec
11
Field3D.spec
|
@ -1,6 +1,6 @@
|
|||
Name: Field3D
|
||||
Version: 1.7.2
|
||||
Release: 18%{?dist}
|
||||
Version: 1.7.3
|
||||
Release: 1%{?dist}
|
||||
Summary: Library for storing voxel data
|
||||
|
||||
License: BSD
|
||||
|
@ -8,8 +8,6 @@ URL: https://sites.google.com/site/field3d/
|
|||
|
||||
Source0: https://github.com/imageworks/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
Patch0: Field3D-unit_test.patch
|
||||
|
||||
BuildRequires: cmake gcc-c++ doxygen
|
||||
BuildRequires: hdf5-devel
|
||||
BuildRequires: boost-devel
|
||||
|
@ -38,7 +36,7 @@ Development headers and documentation for %{name}.
|
|||
|
||||
|
||||
%build
|
||||
rm -rf build && mkdir build && pushd build
|
||||
mkdir build && pushd build
|
||||
%cmake -DINSTALL_DOCS=OFF \
|
||||
../
|
||||
|
||||
|
@ -72,6 +70,9 @@ pushd build
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Mar 12 2020 Richard Shaw <hobbes1069@gmail.com> - 1.7.3-1
|
||||
- Update to 1.7.3.
|
||||
|
||||
* Mon Feb 03 2020 Kalev Lember <klember@redhat.com> - 1.7.2-18
|
||||
- Avoid hardcoding man page compression
|
||||
|
||||
|
|
Loading…
Reference in New Issue