diff options
| author | Manolo Gouy <Manolo> | 2016-02-28 06:28:19 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-02-28 06:28:19 +0000 |
| commit | 9f91e336a18d2d8ffa8c5216eeed210054685fdb (patch) | |
| tree | 5af73af8445b5c4a39fabee11b22952cdc24f02e /src | |
| parent | 1883e9d3868d501a55c56438a5eb0b830febfbe7 (diff) | |
Remove "passing NULL to non-pointer argument" warning.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11249 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Image_Surface.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Fl_Image_Surface.cxx b/src/Fl_Image_Surface.cxx index eaa5cc975..f072187e7 100644 --- a/src/Fl_Image_Surface.cxx +++ b/src/Fl_Image_Surface.cxx @@ -47,7 +47,7 @@ \version 1.3.4 (1.3.3 without the highres parameter) */ Fl_Image_Surface::Fl_Image_Surface(int w, int h, int high_res) : Fl_Widget_Surface(NULL) { - initialize_(NULL, w, h, high_res); + initialize_((Fl_Offscreen)0, w, h, high_res); } void Fl_Image_Surface::initialize_(Fl_Offscreen pixmap, int w, int h, int high_res) { @@ -255,7 +255,7 @@ static int find_slot() { // return an available slot to memorize an Fl_Image_Sur */ Fl_Offscreen fl_create_offscreen(int w, int h) { int rank = find_slot(); - if (rank < 0) return NULL; + if (rank < 0) return (Fl_Offscreen)0; offscreen_api_surface[rank] = new Fl_Image_Surface(w, h); return offscreen_api_surface[rank]->offscreen; } @@ -263,7 +263,7 @@ Fl_Offscreen fl_create_offscreen(int w, int h) { #if USE_X11 Fl_Offscreen fl_create_offscreen_with_alpha(int w, int h) { int rank = find_slot(); - if (rank < 0) return NULL; + if (rank < 0) return (Fl_Offscreen)0; Fl_Offscreen pixmap = XCreatePixmap(fl_display, RootWindow(fl_display, fl_screen), w, h, 32); offscreen_api_surface[rank] = new Fl_Image_Surface(pixmap, w, h); return pixmap; |
