Browse Source

Text: use char type for pixels if it's filled with char literals.

Fixes signed/unsigned mismatch warning on MSVC.
pull/674/head
Vladimír Vondruš 12 months ago
parent
commit
435953ec5a
  1. 4
      src/Magnum/Text/Test/DistanceFieldGlyphCacheGLTest.cpp

4
src/Magnum/Text/Test/DistanceFieldGlyphCacheGLTest.cpp

@ -570,7 +570,7 @@ void DistanceFieldGlyphCacheGLTest::setImageEdgeClamp() {
DistanceFieldGlyphCacheGL cache{{8, 4}, {4, 2}, 4}; DistanceFieldGlyphCacheGL cache{{8, 4}, {4, 2}, 4};
/* Make the right edge all white */ /* Make the right edge all white */
Containers::StridedArrayView2D<UnsignedByte> src = cache.image().pixels<UnsignedByte>()[0]; Containers::StridedArrayView2D<char> src = cache.image().pixels<char>()[0];
src[0][7] = '\xff'; src[0][7] = '\xff';
src[1][7] = '\xff'; src[1][7] = '\xff';
src[2][7] = '\xff'; src[2][7] = '\xff';
@ -635,7 +635,7 @@ void DistanceFieldGlyphCacheGLTest::setImageEdgeClampArray() {
DistanceFieldGlyphCacheArrayGL cache{{8, 4, 1}, {4, 2}, 4}; DistanceFieldGlyphCacheArrayGL cache{{8, 4, 1}, {4, 2}, 4};
/* Make the right edge all white */ /* Make the right edge all white */
Containers::StridedArrayView2D<UnsignedByte> src = cache.image().pixels<UnsignedByte>()[0]; Containers::StridedArrayView2D<char> src = cache.image().pixels<char>()[0];
src[0][7] = '\xff'; src[0][7] = '\xff';
src[1][7] = '\xff'; src[1][7] = '\xff';
src[2][7] = '\xff'; src[2][7] = '\xff';

Loading…
Cancel
Save