[freetype2-demos] master b80fe1c: * graph/x11/grx11.c (gr_x11_surface_done): Free the bitmap here...

[Alexei Podtelezhnikov]

branch: master
commit b80fe1cead93ccd8f9c369ac300ddb020b871642
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>

    * graph/x11/grx11.c (gr_x11_surface_done): Free the bitmap here...
    * src/ftcommon.c (FTDemo_Display_Done): ... rather than here.
---
 ChangeLog         | 5 +++++
 graph/grobjs.c    | 2 +-
 graph/x11/grx11.c | 2 ++
 src/ftcommon.c    | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3cffe4b..6308a04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2020-10-28  Alexei Podtelezhnikov  <apodtele@gmail.com>
 
+       * graph/x11/grx11.c (gr_x11_surface_done): Free the bitmap here...
+       * src/ftcommon.c (FTDemo_Display_Done): ... rather than here.
+
+2020-10-28  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
        Fix PNG dump from 32-bit display.
 
        * src/ftcommon.c (FTDemo_Display_Print): The 32-bit mode needs
diff --git a/graph/grobjs.c b/graph/grobjs.c
index 9129193..a7e0b0a 100644
--- a/graph/grobjs.c
+++ b/graph/grobjs.c
@@ -247,7 +247,7 @@
   extern  void  grDoneBitmap( grBitmap*  bit )
   {
     grFree( bit->buffer );
-    bit->buffer = 0;
+    bit->buffer = NULL;
   }
 
 
diff --git a/graph/x11/grx11.c b/graph/x11/grx11.c
index e84cdb4..1758ce6 100644
--- a/graph/x11/grx11.c
+++ b/graph/x11/grx11.c
@@ -1012,6 +1012,8 @@
         surface->win = 0;
       }
     }
+
+    grDoneBitmap( &surface->root.bitmap );
   }
 
 
diff --git a/src/ftcommon.c b/src/ftcommon.c
index 7973177..e75d35f 100644
--- a/src/ftcommon.c
+++ b/src/ftcommon.c
@@ -214,7 +214,7 @@
     if ( !display )
       return;
 
-    grDoneBitmap( display->bitmap );
+    display->bitmap = NULL;
     grDoneSurface( display->surface );
 
     grDoneDevices();