Skip to content

Commit

Permalink
Merge bff2db3 into e024993
Browse files Browse the repository at this point in the history
  • Loading branch information
jgrewe committed Nov 1, 2018
2 parents e024993 + bff2db3 commit 4f5abda
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion nixio.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Summary: IO-libray for nix data files

License: BSD
URL: https://www.g-node.org/nix
Source0: https://github.com/G-Node/nix/archive/%{version}/%{name}-%{version}.tar.gz
Source0: https://github.com/G-Node/nix/archive/%{version}.tar.gz

BuildRequires: cmake, boost-devel, hdf5-devel, cppunit-devel

Expand Down
5 changes: 3 additions & 2 deletions src/util/dataAccess.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,9 @@ void getOffsetAndCount(const MultiTag &tag, const DataArray &array, const vector
}

size_t dimcount_sizet = check::fits_in_size_t(dimension_count, "getOffsetAndCount() failed; dimension count > size_t.");
NDSize temp_offset(dimcount_sizet, static_cast<NDSize::value_type>(0));
NDSize temp_count(dimcount_sizet, static_cast<NDSize::value_type>(1));

NDSize temp_offset(positions.dataExtent().size(), static_cast<NDSize::value_type>(0));
NDSize temp_count(positions.dataExtent().size(), static_cast<NDSize::value_type>(1));

int dim_index = dimension_count > 1 ? 1 : 0;
temp_count[dim_index] = static_cast<NDSize::value_type>(dimension_count);
Expand Down

0 comments on commit 4f5abda

Please sign in to comment.