File tree Expand file tree Collapse file tree 1 file changed +6
-2
lines changed Expand file tree Collapse file tree 1 file changed +6
-2
lines changed Original file line number Diff line number Diff 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 ;
You can’t perform that action at this time.
0 commit comments