Changeset 40782

Timestamp:

Jun 6, 2019, 5:21:43 PM (7 years ago)

Author:

eugene

Message:

free memory on exit

Location:

branches/eam_branches/ohana.20190329/src/kapa2

Files:

• include/prototypes.h (modified) (3 diffs)
• src/CheckVisual.c (modified) (1 diff)
• src/Layout.c (modified) (1 diff)
• src/LoadLabels.c (modified) (1 diff)
• src/SetUpGraphic.c (modified) (3 diffs)
• src/bDrawImage.c (modified) (1 diff)
• src/kapa.c (modified) (1 diff)

branches/eam_branches/ohana.20190329/src/kapa2/include/prototypes.h

@@ -3 +3 @@
 int           args                PROTO((int *argc, char **argv));
 void          SetUpGraphic        PROTO((int *argc, char **argv));
+void          FreeGraphic         PROTO((void));
 void          DefineLayout        PROTO((int, char **));
 int           EventLoop           PROTO((void));
@@ -29 +30 @@
 void          MapWindow           PROTO((Graphic *graphic));
 void          CheckVisual         PROTO((Graphic *graphic, int *argc, char **argv));
-void          FreeVisual          PROTO((Graphic *graphic));
 
 /* X drawing utilities */
@@ -116 +116 @@
 
 void          InitLayout          PROTO((int argc, char **argv));
+void          FreeLayout          PROTO((void));
 
 /* PS drawing utilities */

branches/eam_branches/ohana.20190329/src/kapa2/src/CheckVisual.c

@@ -195 +195 @@
   }
 }
-
-void FreeVisual (Graphic *graphic) {
-  free (graphic[0].pixels);
-  free (graphic[0].cmap);
-}

branches/eam_branches/ohana.20190329/src/kapa2/src/Layout.c

@@ -45 +45 @@
   AddSection ("default", 0.0, 0.0, 1.0, 1.0, -1);
 }
+
+void FreeLayout (void) {
+  FreeSections ();
+  FreeRotFonts ();
+}

branches/eam_branches/ohana.20190329/src/kapa2/src/LoadLabels.c

@@ -26 +26 @@
   label[Nbytes] = 0;
   
+  FREE (label);
+
   c = GetRotFont (&size);
 

branches/eam_branches/ohana.20190329/src/kapa2/src/SetUpGraphic.c

@@ -32 +32 @@
   graphic->pixels       = NULL;
 
+  graphic->smooth_sigma = 0.0;
+
   if (!USE_XWINDOW) {
     ALLOCATE (graphic[0].pixels, unsigned long, NPIXELS_STATIC);
@@ -50 +52 @@
   CheckVisual (graphic, argc, argv);
   CheckColors (graphic, argc, argv);
-
-  graphic->smooth_sigma = 0.0;
 
   icon.width = icon_width;
@@ -97 +97 @@
   return TRUE;
 }
+
+void FreeGraphic () {
+  free (graphic->pixels);
+  free (graphic->cmap);
+  free (graphic->color);
+  free (graphic->colormapName);
+  free (graphic);
+}

branches/eam_branches/ohana.20190329/src/kapa2/src/bDrawImage.c

@@ -187 +187 @@
 
   free (data);
-
-  // XDestroyImage (pix);
 }
 

branches/eam_branches/ohana.20190329/src/kapa2/src/kapa.c

@@ -10 +10 @@
   EventLoop ();
 
-  // free things related to the graphic:
-  { 
-    Graphic *graphic = GetGraphic ();
-    FreeVisual(graphic);
-  }
-  
   CloseDisplay ();
+
+  // free things
+  FreeLayout();
+  FreeGraphic();
+  FREE (NAME_WINDOW);
+
   MemoryDumpAndExit ();
 }