Skip to content

Image::sample avoids invalid memory access if the image is empty #5656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Fedr merged 1 commit into from
Jan 29, 2026
Merged

Image::sample avoids invalid memory access if the image is empty #5656

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions source/MRMesh/MRImage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,23 @@ namespace MR

Color Image::sampleDiscrete( const UVCoord & pos ) const
{
if ( resolution.x <= 0 || resolution.y <= 0 )
{
assert( false );
return {};
}
const float x = std::clamp( pos.x, 0.0f, 1.0f ) * ( resolution.x - 1 );
const float y = std::clamp( pos.y, 0.0f, 1.0f ) * ( resolution.y - 1 );
return operator[]( { (int)std::lround( x ), (int)std::lround( y ) } );
}

Color Image::sampleBilinear( const UVCoord & pos ) const
{
if ( resolution.x <= 0 || resolution.y <= 0 )
{
assert( false );
return {};
}
const float x = std::clamp( pos.x, 0.0f, 1.0f ) * ( resolution.x - 1 );
const float y = std::clamp( pos.y, 0.0f, 1.0f ) * ( resolution.y - 1 );

Expand Down
Loading