elimintate IIM_new and IIM_DESTROY from Imager's internals

They only matter for XS

diff --git a/Changes b/Changes
index fe841219496cfc7d6443852cb1073d3a0ae736f4..8ffd10b9be1a41dc64e06ea7682b40594f7fc71f 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,8 @@
 Imager release history.  Older releases can be found in Changes.old
 
+ - eliminate the old IIM_new(), IIM_DESTROY() names from Imager's
+   internals, those names only matter for the XS interface.
+
 Imager 0.90 - 30 Apr 2012
 ===========
 

diff --git a/Imager.pm b/Imager.pm
index 6261a0cc505decde4a59a956029e25e14adb490b..ee99409f8adce1917d0e5fbb65c182564021c2a2 100644 (file)
--- a/Imager.pm
+++ b/Imager.pm
@@ -913,8 +913,8 @@ sub img_set {
     $self->{IMG} = i_img_16_new($hsh{xsize}, $hsh{ysize}, $hsh{channels});
   }
   else {
-    $self->{IMG}=Imager::ImgRaw::new($hsh{'xsize'}, $hsh{'ysize'},
-                                     $hsh{'channels'});
+    $self->{IMG}= i_img_8_new($hsh{'xsize'}, $hsh{'ysize'},
+                             $hsh{'channels'});
   }
 
   unless ($self->{IMG}) {

diff --git a/Imager.xs b/Imager.xs
index 171a738520aa878dbfc80298f0fc59ab5ec56e29..95c6f8eb1550f0a2af663ca52dfe4d5fb65d9cfd 100644 (file)
--- a/Imager.xs
+++ b/Imager.xs
@@ -835,6 +835,9 @@ static im_pl_ext_funcs im_perl_funcs =
 #define PERL_PL_SET_GLOBAL_CALLBACKS \
   sv_setiv(get_sv(PERL_PL_FUNCTION_TABLE_NAME, 1), PTR2IV(&im_perl_funcs));
 
+#define IIM_new i_img_8_new
+#define IIM_DESTROY i_img_destroy
+
 #ifdef IMEXIF_ENABLE
 #define i_exif_enabled() 1
 #else
@@ -3670,6 +3673,12 @@ i_glinf(im, l, r, y)
           myfree(vals);
         }
 
+Imager::ImgRaw
+i_img_8_new(x, y, ch)
+        i_img_dim x
+        i_img_dim y
+        int ch
+
 Imager::ImgRaw
 i_img_16_new(x, y, ch)
         i_img_dim x

diff --git a/imager.h b/imager.h
index 8cb2bfbb4bbacf27705317237b213076a3ebb70b..00ca8e2cadf0265f8f385b84d14b6af189f098e5 100644 (file)
--- a/imager.h
+++ b/imager.h
@@ -48,9 +48,7 @@ extern void i_hsv_to_rgbf(i_fcolor *color);
 extern void i_rgb_to_hsv(i_color *color);
 extern void i_hsv_to_rgb(i_color *color);
 
-i_img *IIM_new(i_img_dim x,i_img_dim y,int ch);
-#define i_img_8_new IIM_new
-void   IIM_DESTROY(i_img *im);
+i_img *i_img_8_new(i_img_dim x,i_img_dim y,int ch);
 i_img *i_img_new( void );
 i_img *i_img_empty(i_img *im,i_img_dim x,i_img_dim y);
 i_img *i_img_empty_ch(i_img *im,i_img_dim x,i_img_dim y,int ch);

diff --git a/img8.c b/img8.c
index 9a799f3b2b76a370faf9506fae211e719a90bc42..8a2cb243717ca4eed23ef65aec52f460d6bd52ad 100644 (file)
--- a/img8.c
+++ b/img8.c
@@ -80,8 +80,6 @@ static i_img IIM_base_8bit_direct =
   }*/
 
 /*
-=item IIM_new(x, y, ch)
-
 =item i_img_8_new(x, y, ch)
 
 =category Image creation/destruction
@@ -96,7 +94,7 @@ I<ch> channels.
 
 
 i_img *
-IIM_new(i_img_dim x,i_img_dim y,int ch) {
+i_img_8_new(i_img_dim x,i_img_dim y,int ch) {
   i_img *im;
 
   mm_log((1,"IIM_new(x %" i_DF ", y %" i_DF ", ch %d)\n",
@@ -108,14 +106,6 @@ IIM_new(i_img_dim x,i_img_dim y,int ch) {
   return im;
 }
 
-
-void
-IIM_DESTROY(i_img *im) {
-  mm_log((1,"IIM_DESTROY(im* %p)\n",im));
-  i_img_destroy(im);
-  /*   myfree(cl); */
-}
-
 /* 
 =item i_img_new()