Skip to content

Commit 8b749f7

Browse files
iche033mergify[bot]
authored andcommitted
cleanup
Signed-off-by: Ian Chen <[email protected]> (cherry picked from commit 3276a52) # Conflicts: # graphics/src/Image.cc
1 parent 1d61cea commit 8b749f7

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

graphics/src/Image.cc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ namespace gz
3838
class Image::Implementation
3939
{
4040
/// \brief bitmap data
41-
public: FIBITMAP *bitmap;
41+
public: FIBITMAP *bitmap{nullptr};
4242

4343
/// \brief path name of the image file
4444
public: std::string fullName;
@@ -51,11 +51,15 @@ namespace gz
5151
FIBITMAP *_img) const;
5252
=======
5353
/// \brief Color type for this image
54-
public: FREE_IMAGE_COLOR_TYPE colorType;
54+
public: FREE_IMAGE_COLOR_TYPE colorType{FIC_RGB};
5555

5656
/// \brief Image type, i.e. pixel format
57+
<<<<<<< HEAD
5758
public: FREE_IMAGE_TYPE imageType;
5859
>>>>>>> 0e307e7 (refactor)
60+
=======
61+
public: FREE_IMAGE_TYPE imageType{FIT_UNKNOWN};
62+
>>>>>>> 3276a52 (cleanup)
5963

6064
/// \brief Implementation of Data, returns vector of bytes
6165
public: std::vector<unsigned char> DataImpl(FIBITMAP *_img) const;

0 commit comments

Comments
 (0)