Added Destroy method for Imager::Font::TT and moved to that package name

the tt handles.  Other miscelleanious memory leaks sealed.

diff --git a/Changes b/Changes
index 5fd50fc815b43cbe7de6d3ec2a2de667f9d5a894..3e5606c8ae192e2ab4d737f446f638638d555a97 100644 (file)
--- a/Changes
+++ b/Changes
@@ -541,7 +541,7 @@ Revision history for Perl extension Imager.
         - io_buffer implemented as a source for io layer and
           XS and perl OO code added.
         - Test for iolayer t/t07iolayer.t implemented.
-
+       - Fixed most known memory leaks.
 
 =================================================================
 

diff --git a/Imager.xs b/Imager.xs
index 0a9014508df1a5e08d13ce856a84f31b7b16fecb..290497d9b2ac18e2e4fe6039f125bc4aa7529031 100644 (file)
--- a/Imager.xs
+++ b/Imager.xs
@@ -21,7 +21,7 @@ typedef i_img*   Imager__ImgRaw;
 
 
 #ifdef HAVE_LIBTT
-typedef TT_Fonthandle* Imager__TTHandle;
+typedef TT_Fonthandle* Imager__Font__TT;
 #endif
 
 #ifdef HAVE_FT2
@@ -1258,19 +1258,26 @@ i_t1_text(im,xb,yb,cl,fontnum,points,str,len,align)
 #ifdef HAVE_LIBTT
 
 
-Imager::TTHandle
+Imager::Font::TT
 i_tt_new(fontname)
              char*     fontname
 
+
+MODULE = Imager         PACKAGE = Imager::Font::TT      PREFIX=TT_
+
+#define TT_DESTROY(handle) i_tt_destroy(handle)
+
 void
-i_tt_destroy(handle)
-     Imager::TTHandle    handle
+TT_DESTROY(handle)
+     Imager::Font::TT   handle
 
 
+MODULE = Imager         PACKAGE = Imager
+
 
 undef_int
 i_tt_text(handle,im,xb,yb,cl,points,str,len,smooth)
-  Imager::TTHandle     handle
+  Imager::Font::TT     handle
     Imager::ImgRaw     im
               int     xb
               int     yb
@@ -1283,7 +1290,7 @@ i_tt_text(handle,im,xb,yb,cl,points,str,len,smooth)
 
 undef_int
 i_tt_cp(handle,im,xb,yb,channel,points,str,len,smooth)
-  Imager::TTHandle     handle
+  Imager::Font::TT     handle
     Imager::ImgRaw     im
               int     xb
               int     yb
@@ -1297,7 +1304,7 @@ i_tt_cp(handle,im,xb,yb,channel,points,str,len,smooth)
 
 undef_int
 i_tt_bbox(handle,point,str,len)
-  Imager::TTHandle     handle
+  Imager::Font::TT     handle
             float     point
              char*    str
               int     len

diff --git a/draw.c b/draw.c
index 1656105eda620591c5cc2c05cdf258758f0a7f90..5ad73f1c30f3d9ce95132ef04c7ac28f621035b4 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -335,6 +335,7 @@ i_circle_aa(i_img *im, float x, float y, float rad, i_color *val) {
       }
     }
   }
+  i_mmarray_dst(&dot);
 }
 
 

diff --git a/font.c b/font.c
index 1b764675236175bf32a7eef075b58feb7dba698d..c7784246a268ed0b404d0d016374e07b088e75fa 100644 (file)
--- a/font.c
+++ b/font.c
@@ -538,7 +538,7 @@ i_tt_new(char *fontname) {
   
   /* allocate memory for the structure */
   
-  handle=mymalloc( sizeof(TT_Fonthandle) );
+  handle = mymalloc( sizeof(TT_Fonthandle) );
 
   /* load the typeface */
   error = TT_Open_Face( engine, fontname, &handle->face );
@@ -782,6 +782,7 @@ pixmaps and glyphs
 void
 i_tt_destroy( TT_Fonthandle *handle) {
   TT_Close_Face( handle->face );
+  myfree( handle );
   
   /* FIXME: Should these be freed automatically by the library? 
 

diff --git a/t/t35ttfont.t b/t/t35ttfont.t
index 7825f858f5016d345ab28b7223ff77b422fb6e69..d4fb51f2a577c794a4d1149a986bf775a96c5626 100644 (file)
--- a/t/t35ttfont.t
+++ b/t/t35ttfont.t
@@ -34,15 +34,15 @@ if (! -f $fontname) {
 i_init_fonts();
 #     i_tt_set_aa(1);
 
-$bgcolor=i_color_new(255,0,0,0);
-$overlay=Imager::ImgRaw::new(200,70,3);
+$bgcolor = i_color_new(255,0,0,0);
+$overlay = Imager::ImgRaw::new(200,70,3);
 
-$ttraw=Imager::i_tt_new($fontname);
+$ttraw = Imager::i_tt_new($fontname);
 
 #use Data::Dumper;
 #warn Dumper($ttraw);
 
-@bbox=i_tt_bbox($ttraw,50.0,'XMCLH',5);
+@bbox = i_tt_bbox($ttraw,50.0,'XMCLH',5);
 print "#bbox: ($bbox[0], $bbox[1]) - ($bbox[2], $bbox[3])\n";
 
 i_tt_cp($ttraw,$overlay,5,50,1,50.0,'XMCLH',5,1);

diff --git a/typemap b/typemap
index f39ed30ea3fbc4717d169c1e66329d54efd4e91b..f6b5688c0d560a06427828f82445016e6503f6c4 100644 (file)
--- a/typemap
+++ b/typemap
@@ -2,7 +2,7 @@
 Imager::Color           T_PTROBJ
 Imager::Color::Float    T_PTROBJ
 Imager::ImgRaw          T_PTROBJ
-Imager::TTHandle       T_PTROBJ
+Imager::Font::TT       T_PTROBJ
 Imager::IO              T_PTROBJ
 Imager::Font::FT2       T_PTROBJ
 Imager::FillHandle      T_PTROBJ