add some more extensions, add add_type_extensions() class method

[imager.git] / typemap

diff --git a/typemap b/typemap
index abc867e97654e4edfe680a473579f7ac480bc5a8..83f7152f6c1ff653ac76d9779cd33f0bb3e585a0 100644 (file)
--- a/typemap
+++ b/typemap
@@ -4,9 +4,7 @@ Imager::Color::Float    T_PTROBJ
 Imager::ImgRaw          T_IMAGER_IMAGE
 Imager::Font::TT       T_PTROBJ
 Imager::IO              T_PTROBJ
 Imager::ImgRaw          T_IMAGER_IMAGE
 Imager::Font::TT       T_PTROBJ
 Imager::IO              T_PTROBJ

-Imager::Font::FT2       T_PTROBJ

 Imager::FillHandle      T_PTROBJ
 Imager::FillHandle      T_PTROBJ

-Imager::Internal::Hlines T_PTROBJ

 const char *           T_PV
 float                  T_FLOAT
 float*                 T_ARRAY
 const char *           T_PV
 float                  T_FLOAT
 float*                 T_ARRAY


@@ -14,6 +12,7 @@ undef_int             T_IV_U
 undef_neg_int           T_IV_NEGU
 HASH                   T_HVREF
 utf8_str               T_UTF8_STR
 undef_neg_int           T_IV_NEGU
 HASH                   T_HVREF
 utf8_str               T_UTF8_STR

+i_img_dim              T_IV

 
 # these types are for use by Inline, which can't handle types containing ::
 Imager__Color           T_PTROBJ_INV
 
 # these types are for use by Inline, which can't handle types containing ::
 Imager__Color           T_PTROBJ_INV


@@ -31,13 +30,6 @@ T_PTR_NULL
        if (SvOK($arg)) $var = INT2PTR($type,SvIV($arg));
        else $var = NULL
 
        if (SvOK($arg)) $var = INT2PTR($type,SvIV($arg));
        else $var = NULL
 

-# the pre-5.8.0 T_AVREF input map was fixed in 5.8.0
-T_AVREF
-        if (SvROK($arg) && SvTYPE(SvRV($arg))==SVt_PVAV)
-            $var = (AV*)SvRV($arg);
-        else
-            Perl_croak(aTHX_ \"$var is not an array reference\")
-

 # handles Imager objects rather than just raw objects
 T_IMAGER_IMAGE
         if (sv_derived_from($arg, \"Imager::ImgRaw\")) {
 # handles Imager objects rather than just raw objects
 T_IMAGER_IMAGE
         if (sv_derived_from($arg, \"Imager::ImgRaw\")) {


@@ -111,7 +103,7 @@ T_IMAGER_FULL_IMAGE
           HV *hv = newHV();
           sv_setref_pv(imobj, \"Imager::ImgRaw\", $var);
           hv_store(hv, "IMG", 3, imobj, 0);
           HV *hv = newHV();
           sv_setref_pv(imobj, \"Imager::ImgRaw\", $var);
           hv_store(hv, "IMG", 3, imobj, 0);

-          $arg = sv_2mortal(sv_bless(newRV((SV*)hv), gv_stashpv("Imager", 1)));
+          $arg = sv_2mortal(sv_bless(newRV_noinc((SV*)hv), gv_stashpv("Imager", 1)));

         }
         else {
           $arg = &PL_sv_undef;
         }
         else {
           $arg = &PL_sv_undef;