lint and build fix

Signed-off-by: Ian Chen <[email protected]>
(cherry picked from commit b71e351)

Author: iche033

graphics/src/Image.cc

@@ -19,6 +19,7 @@
 #endif
 #include <FreeImage.h>
 
+#include <cstdint>
 #include <cstring>
 #include <string>
 
@@ -539,7 +540,7 @@ math::Color Image::Pixel(unsigned int _x, unsigned int _y) const
   if (_x >= this->Width() || _y >= this->Height())
   {
     gzerr << "Image: Coordinates out of range["
-      << _x << " " << _y << "] \n";
+      << _x << ", " << _y << "] \n";
     return clr;
   }
 
@@ -551,7 +552,7 @@ math::Color Image::Pixel(unsigned int _x, unsigned int _y) const
     if (FreeImage_GetPixelColor(this->dataPtr->bitmap, _x, _y, &firgb) == FALSE)
     {
       gzerr << "Failed to get pixel value at ["
-            << _x << " " << _y << "] \n";
+            << _x << ", " << _y << "] \n";
       return clr;
     }
     clr.Set(firgb.rgbRed / 255.0f, firgb.rgbGreen / 255.0f,
@@ -563,7 +564,7 @@ math::Color Image::Pixel(unsigned int _x, unsigned int _y) const
            this->dataPtr->bitmap, _x, _y, clr) == FALSE)
     {
       gzerr << "Failed to get pixel value at ["
-            << _x << " " << _y << "] \n";
+            << _x << ", " << _y << "] \n";
       return clr;
     }
   }
@@ -628,7 +629,7 @@ BOOL Image::Implementation::PixelIndex(
   if (!_dib)
     return FALSE;
 
-  if (_x >= this->Width() || _y >= this->Height())
+  if (_x >= FreeImage_GetWidth(_dib) || _y >= FreeImage_GetHeight(_dib))
     return FALSE;
 
   // 8 bit images

graphics/src/Image_TEST.cc

@@ -15,6 +15,7 @@
  *
 */
 #include <fstream>
+#include <string>
 
 #include <gtest/gtest.h>