tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[msvc] Fix warnings, mainly casting to smaller types (#270)

Browse Source 
If the checks by GitHub Actions checks are met, then it seems good to go.  Thanks for supporting FOSS4G!
This commit is contained in:
Tadej Novak
2022-04-22 20:40:55 +02:00
committed by GitHub
parent cf41e113f9
commit 32ed70c95d
121 changed files with 645 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mbgl/programs/fill_program.cpp
View File

@@ -19,8 +19,8 @@ FillPatternProgram::layoutUniformValues(mat4 matrix,
const TransformState& state,
const float pixelRatio) {
const auto tileRatio = 1 / tileID.pixelsToTileUnits(1, state.getIntegerZoom());
int32_t tileSizeAtNearestZoom = util::tileSize * state.zoomScale(state.getIntegerZoom() - tileID.canonical.z);
int32_t pixelX = tileSizeAtNearestZoom * (tileID.canonical.x + tileID.wrap * state.zoomScale(tileID.canonical.z));
int32_t tileSizeAtNearestZoom = static_cast<int32_t>(util::tileSize_D * state.zoomScale(state.getIntegerZoom() - tileID.canonical.z));
int32_t pixelX = static_cast<int32_t>(tileSizeAtNearestZoom * (tileID.canonical.x + tileID.wrap * state.zoomScale(tileID.canonical.z)));
int32_t pixelY = tileSizeAtNearestZoom * tileID.canonical.y;
return {
@@ -29,8 +29,8 @@ FillPatternProgram::layoutUniformValues(mat4 matrix,
uniforms::texsize::Value( atlasSize ),
uniforms::scale::Value({ {pixelRatio, tileRatio, crossfade.fromScale, crossfade.toScale} } ),
uniforms::fade::Value( crossfade.t ),
uniforms::pixel_coord_upper::Value( std::array<float, 2> {{ float(pixelX >> 16), float(pixelY >> 16) }}),
uniforms::pixel_coord_lower::Value( std::array<float, 2> {{ float(pixelX & 0xFFFF), float(pixelY & 0xFFFF) }} )
uniforms::pixel_coord_upper::Value( std::array<float, 2> {{ static_cast<float>(pixelX >> 16), static_cast<float>(pixelY >> 16) }}),
uniforms::pixel_coord_lower::Value( std::array<float, 2> {{ static_cast<float>(pixelX & 0xFFFF), static_cast<float>(pixelY & 0xFFFF) }} )
};
}