diff --git a/libraries/audio/src/AudioConstants.h b/libraries/audio/src/AudioConstants.h index 1c6cac71b6..6c4e582117 100644 --- a/libraries/audio/src/AudioConstants.h +++ b/libraries/audio/src/AudioConstants.h @@ -27,7 +27,7 @@ namespace AudioConstants { const int NETWORK_FRAME_SAMPLES_PER_CHANNEL = NETWORK_FRAME_BYTES_PER_CHANNEL / sizeof(AudioSample); const float NETWORK_FRAME_MSECS = (AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL / (float)AudioConstants::SAMPLE_RATE) * 1000.0f; - const unsigned int NETWORK_FRAME_USECS = (int)floorf(NETWORK_FRAME_MSECS * 1000.0f); + const unsigned int NETWORK_FRAME_USECS = (unsigned int)floorf(NETWORK_FRAME_MSECS * 1000.0f); const int MIN_SAMPLE_VALUE = std::numeric_limits::min(); const int MAX_SAMPLE_VALUE = std::numeric_limits::max(); } diff --git a/libraries/metavoxels/src/Spanner.cpp b/libraries/metavoxels/src/Spanner.cpp index 044c742347..30bc1f5a59 100644 --- a/libraries/metavoxels/src/Spanner.cpp +++ b/libraries/metavoxels/src/Spanner.cpp @@ -1529,7 +1529,7 @@ HeightfieldNode* HeightfieldNode::paintMaterial(const glm::vec3& position, const colorContents = _color->getContents(); } else { - colorContents = QByteArray(baseWidth * baseHeight * DataBlock::COLOR_BYTES, 0xFFu); + colorContents = QByteArray(baseWidth * baseHeight * DataBlock::COLOR_BYTES, 0xffU); } int materialWidth = baseWidth, materialHeight = baseHeight; @@ -1885,7 +1885,7 @@ HeightfieldNode* HeightfieldNode::clearAndFetchHeight(const glm::vec3& translati spanner->setHeight(HeightfieldHeightPointer(new HeightfieldHeight(spannerHeightWidth, QVector(spannerHeightWidth * spannerHeightHeight)))); spanner->setColor(HeightfieldColorPointer(new HeightfieldColor(spannerColorWidth, - QByteArray(spannerColorWidth * spannerColorHeight * DataBlock::COLOR_BYTES, 0xFFu)))); + QByteArray(spannerColorWidth * spannerColorHeight * DataBlock::COLOR_BYTES, 0xffU)))); spanner->setMaterial(HeightfieldMaterialPointer(new HeightfieldMaterial(spannerMaterialWidth, QByteArray(spannerMaterialWidth * spannerMaterialHeight, 0), QVector()))); } @@ -2358,7 +2358,7 @@ void HeightfieldNode::mergeChildren(bool height, bool colorMaterial) { return; } if (colorWidth > 0) { - QByteArray colorContents(colorWidth * colorHeight * DataBlock::COLOR_BYTES, 0xFFu); + QByteArray colorContents(colorWidth * colorHeight * DataBlock::COLOR_BYTES, 0xffU); for (int i = 0; i < CHILD_COUNT; i++) { HeightfieldColorPointer childColor = _children[i]->getColor(); if (!childColor) { diff --git a/tests/octree/src/OctreeTests.cpp b/tests/octree/src/OctreeTests.cpp index 4380ea13f6..4fc543d5d3 100644 --- a/tests/octree/src/OctreeTests.cpp +++ b/tests/octree/src/OctreeTests.cpp @@ -802,7 +802,7 @@ void OctreeTests::propertyFlagsTests(bool verbose) { qDebug() << "fill encoded byte array with extra garbage (as if it was bitstream with more content)"; } QByteArray extraContent; - extraContent.fill(0xbau, 10); + extraContent.fill(0xbaU, 10); encoded.append(extraContent); if (verbose) {