kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[drape_frontend] Fix memcpy of non-trivial GLM type

Browse source 
Fixes the following GCC warning:

````
drape_frontend/arrow3d.cpp:503:11: warning: ‘void* memcpy(void*, const void*, size_t)’
copying an object of non-trivial type ‘glm::mat4’ {aka ‘struct glm::mat<4, 4, float, glm::packed_highp>’}
from an array of ‘const struct math::Matrix<float, 4, 4>’ [-Wclass-memaccess]
  503 |     memcpy(&pTo3dView, &m, sizeof(pTo3dView));
      |     ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
````

Signed-off-by: Ferenc Géczi <ferenc.gm@gmail.com>
This commit is contained in:
Ferenc Géczi 2024-12-19 00:00:00 +00:00 • committed by Viktor Havaka
parent 1d8bfb75cd
commit 2b78ba1749
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drape_frontend/arrow3d.cpp
View file

@ -497,10 +497,7 @@ std::pair<glsl::mat4, glsl::mat4> Arrow3d::CalculateTransform(ScreenBase const &
if (screen.isPerspective())
{
glm::mat4 pTo3dView;
auto const m = math::Matrix<float, 4, 4>(screen.Pto3dMatrix());
static_assert(sizeof(m) == sizeof(pTo3dView));
memcpy(&pTo3dView, &m, sizeof(pTo3dView));
glm::mat4 pTo3dView = glm::make_mat4x4(screen.Pto3dMatrix().m_data);
auto postProjectionPerspective = pTo3dView * modelTransform;
return std::make_pair(postProjectionPerspective, normalMatrix);
}