gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

sdf_image

Browse source
This commit is contained in:
Viktor Govako 2022-04-02 17:57:53 +03:00
parent b138cd76ee
commit 34b3407588
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
3party/sdf_image/sdf_image.cpp
View file

@ -77,13 +77,6 @@ SdfImage::SdfImage(uint32_t h, uint32_t w, uint8_t * imageData, uint8_t border)
}
}
SdfImage::SdfImage(SdfImage const & copy)
{
m_height = copy.m_height;
m_width = copy.m_width;
m_data = copy.m_data;
}
uint32_t SdfImage::GetWidth() const
{
return m_width;
@ -182,6 +175,7 @@ SdfImage SdfImage::Bilinear(float scale)
SdfImage result(dstHeight, dstWidth);
/// @todo Probably, should make srcWidth-1, srcHeight-1 here, but now it works fine with current std::round.
float xRatio = static_cast<float>(srcWidth) / dstWidth;
float yRatio = static_cast<float>(srcHeight) / dstHeight;
for (uint32_t i = 0; i < dstHeight; i++)
@ -194,9 +188,8 @@ SdfImage SdfImage::Bilinear(float scale)
uint32_t x = static_cast<uint32_t>(fx);
uint32_t y = static_cast<uint32_t>(fy);
uint32_t index = y * srcWidth + x;
ASSERT_LESS(index, m_data.size(), ());
ASSERT_LESS(index + srcWidth + 1, m_data.size(), ());
// range is 0 to 255 thus bitwise AND with 0xff
float A = m_data[index];
float B = m_data[index + 1];
float C = m_data[index + srcWidth];

1
3party/sdf_image/sdf_image.h
View file

@ -42,7 +42,6 @@ public:
SdfImage() = default;
SdfImage(uint32_t h, uint32_t w);
SdfImage(uint32_t h, uint32_t w, uint8_t * imageData, uint8_t border);
SdfImage(SdfImage const & copy);
uint32_t GetWidth() const;
uint32_t GetHeight() const;