X-Git-Url: http://git.imager.perl.org/imager.git/blobdiff_plain/ee07115ddb7a9e1bac89530c5cede51653483afb..e1c0692925:/typemap

diff --git a/typemap b/typemap
index abc867e9..d7d57a1f 100644
--- a/typemap
+++ b/typemap
@@ -4,16 +4,17 @@ Imager::Color::Float    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::Internal::Hlines T_PTROBJ
 const char *		T_PV
-float			T_FLOAT
+im_float		T_FLOAT
 float*			T_ARRAY
 undef_int		T_IV_U
 undef_neg_int           T_IV_NEGU
 HASH			T_HVREF
 utf8_str		T_UTF8_STR
+i_img_dim		T_IV_checked
+im_double		T_NV_checked
+
 
 # these types are for use by Inline, which can't handle types containing ::
 Imager__Color           T_PTROBJ_INV
@@ -31,13 +32,6 @@ T_PTR_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\")) {
@@ -84,6 +78,27 @@ T_PTROBJ_INV
         else
             croak(\"$var is not of type ${(my $ntt=$ntype)=~s/__/::/g;\$ntt}\");
 
+T_NV_checked
+	{
+	    SvGETMAGIC($arg);
+	    if (SvROK($arg) && !SvAMAGIC($arg)) {
+	        croak(\"Numeric argument '$var' shouldn't be a reference\");
+	    }
+	    else {
+	    	$var = ($type)SvNV($arg);
+	    }
+	}
+
+T_IV_checked
+	{
+	    SvGETMAGIC($arg);
+	    if (SvROK($arg) && !SvAMAGIC($arg)) {
+	        croak(\"Numeric argument '$var' shouldn't be a reference\");
+	    }
+	    else {
+	    	$var = ($type)SvIV($arg);
+	    }
+	}
 
 #############################################################################
 OUTPUT
@@ -111,8 +126,14 @@ T_IMAGER_FULL_IMAGE
           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;
         }
+
+T_IV_checked
+	sv_setiv($arg, (IV)$var);
+
+T_NV_checked
+	sv_setnv($arg, (NV)$var);