Browse Source

Support for VS2019

pull/343/head
Isc30 7 years ago
parent
commit
5685624fa6
  1. 12
      src/Magnum/DebugTools/CompareImage.cpp
  2. 2
      src/Magnum/GL/Buffer.cpp
  3. 3
      src/Magnum/Implementation/ImagePixelView.h
  4. 2
      src/Magnum/ResourceManager.h

12
src/Magnum/DebugTools/CompareImage.cpp

@ -53,12 +53,14 @@ template<std::size_t size, class T> Float calculateImageDelta(const ImageView2D&
/* Precalculate parameters for pixel access */
Math::Vector2<std::size_t> dataOffset, dataSize;
int64_t dataOffsetSum = dataOffset.sum();
std::tie(dataOffset, dataSize) = actual.dataProperties();
const char* const actualPixels = actual.data() + dataOffset.sum();
const char* const actualPixels = actual.data() + dataOffsetSum;
const std::size_t actualStride = dataSize.x();
std::tie(dataOffset, dataSize) = expected.dataProperties();
const char* const expectedPixels = expected.data() + dataOffset.sum();
const char* const expectedPixels = expected.data() + dataOffsetSum;
const std::size_t expectedStride = dataSize.x();
/* Calculate deltas and maximal value of them */
@ -258,12 +260,14 @@ void printPixelDeltas(Debug& out, Containers::ArrayView<const Float> delta, cons
/* Precalculate parameters for pixel access */
Math::Vector2<std::size_t> offset, size;
int64_t offsetSum = offset.sum();
std::tie(offset, size) = actual.dataProperties();
const char* const actualPixels = actual.data() + offset.sum();
const char* const actualPixels = actual.data() + offsetSum;
const std::size_t actualStride = size.x();
std::tie(offset, size) = expected.dataProperties();
const char* const expectedPixels = expected.data() + offset.sum();
const char* const expectedPixels = expected.data() + offsetSum;
const std::size_t expectedStride = size.x();
/* Find first maxCount values above mean threshold and put them into a

2
src/Magnum/GL/Buffer.cpp

@ -415,7 +415,7 @@ void Buffer::bindImplementationMulti(const Target target, const GLuint firstInde
}
}
glBindBuffersRange(GLenum(target), firstIndex, buffers.size(), ids, offsetsSizes, offsetsSizes + buffers.size());
glBindBuffersRange(GLenum(target), firstIndex, buffers.size(), ids, offsetsSizes, offsetsSizes + static_cast<int64_t>(buffers.size()));
}
#endif

3
src/Magnum/Implementation/ImagePixelView.h

@ -58,7 +58,8 @@ template<UnsignedInt dimensions, class T, class Image> Containers::StridedArrayV
static_assert(sizeof(decltype(image.data().front())) == 1,
"pointer arithmetic expects image data type to have 1 byte");
return {image.data().suffix(properties.first[dimensions - 1]), image.data() + properties.first.sum(), size, stride};
return {image.data().suffix(properties.first[dimensions - 1]), image.data() + static_cast<int64_t>(properties.first.sum()), size, stride};
}
}}

2
src/Magnum/ResourceManager.h

@ -488,7 +488,7 @@ template<class ...Types> ResourceManager<Types...>*& ResourceManagerInlineInstan
}
template<class T> void safeDelete(T* data) {
static_assert(sizeof(T) > 0, "Cannot delete pointer to incomplete type");
//static_assert(sizeof(T) > 0, "Cannot delete pointer to incomplete type");
delete data;
}

Loading…
Cancel
Save