Skip to content

Commit

Permalink
Merge branch 'gz-common5' into assimp_transmission
Browse files Browse the repository at this point in the history
  • Loading branch information
mjcarroll authored Mar 4, 2024
2 parents 8ea66e1 + 3571cb4 commit ade42a8
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions graphics/src/Image.cc
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,8 @@ math::Color Image::Pixel(unsigned int _x, unsigned int _y) const
<< _x << " " << _y << "] \n";
return clr;
}
clr.Set(firgb.rgbRed, firgb.rgbGreen, firgb.rgbBlue);
clr.Set(firgb.rgbRed / 255.0f, firgb.rgbGreen / 255.0f,
firgb.rgbBlue / 255.0f);
}
else
{
Expand Down Expand Up @@ -606,7 +607,8 @@ math::Color Image::MaxColor() const
<< x << " " << y << "] \n";
continue;
}
clr.Set(firgb.rgbRed, firgb.rgbGreen, firgb.rgbBlue);
clr.Set(firgb.rgbRed / 255.0f, firgb.rgbGreen / 255.0f,
firgb.rgbBlue / 255.0f);

if (clr.R() + clr.G() + clr.B() > maxClr.R() + maxClr.G() + maxClr.B())
{
Expand Down

0 comments on commit ade42a8

Please sign in to comment.