1.009 release

[imager.git] / typemap

diff --git a/typemap b/typemap
index 56e8cc7735279a027eefebee1992a949263ad1d4..d7d57a1fef4b2aebcd6add3ff54c6bfdaa8c0c85 100644 (file)
--- a/typemap
+++ b/typemap
@@ -5,15 +5,16 @@ Imager::ImgRaw          T_IMAGER_IMAGE
 Imager::Font::TT       T_PTROBJ
 Imager::IO              T_PTROBJ
 Imager::FillHandle      T_PTROBJ
 Imager::Font::TT       T_PTROBJ
 Imager::IO              T_PTROBJ
 Imager::FillHandle      T_PTROBJ

-Imager::Internal::Hlines T_PTROBJ

 const char *           T_PV
 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
 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
+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
 
 # these types are for use by Inline, which can't handle types containing ::
 Imager__Color           T_PTROBJ_INV


@@ -25,29 +26,12 @@ Imager__IO              T_PTROBJ_INV
 # mostly intended for non-Imager-core use
 Imager                  T_IMAGER_FULL_IMAGE
 
 # mostly intended for non-Imager-core use
 Imager                  T_IMAGER_FULL_IMAGE
 

-off_t                  T_OFF_T
-
-# STRLEN isn't in the default typemap in older perls
-STRLEN                 T_UV
-
-# internal types used in Imager.xs
-i_channel_list         T_IM_CHANNEL_LIST
-i_sample_list          T_IM_SAMPLE_LIST
-i_fsample_list         T_IM_FSAMPLE_LIST
-

 #############################################################################
 INPUT
 T_PTR_NULL
        if (SvOK($arg)) $var = INT2PTR($type,SvIV($arg));
        else $var = NULL
 
 #############################################################################
 INPUT
 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\")) {
 # handles Imager objects rather than just raw objects
 T_IMAGER_IMAGE
         if (sv_derived_from($arg, \"Imager::ImgRaw\")) {


@@ -94,91 +78,26 @@ T_PTROBJ_INV
         else
             croak(\"$var is not of type ${(my $ntt=$ntype)=~s/__/::/g;\$ntt}\");
 
         else
             croak(\"$var is not of type ${(my $ntt=$ntype)=~s/__/::/g;\$ntt}\");
 

-T_OFF_T
-  $var = i_sv_off_t(aTHX_ $arg);
-
-T_IM_CHANNEL_LIST
-        SvGETMAGIC($arg);
-       if (SvOK($arg)) {
-         AV *channels_av;
-         int i;
-         if (!SvROK($arg) || SvTYPE(SvRV($arg)) != SVt_PVAV) {
-           croak(\"$var is not an array ref\");
-         }
-         channels_av = (AV *)SvRV($arg);
-         $var.count = av_len(channels_av) + 1;
-         if ($var.count < 1) {
-           croak(\"$pname: no channels provided\");
-         }
-         $var.channels = malloc_temp(aTHX_ sizeof(int) * $var.count);
-         for (i = 0; i < $var.count; ++i) {
-           SV **entry = av_fetch(channels_av, i, 0);
-           $var.channels[i] = entry ? SvIV(*entry) : 0;
-         }
-        }
-       else {
-         /* assumes we have an image */
-         $var.count = im->channels;
-         $var.channels = NULL;
+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_IM_SAMPLE_LIST
-       SvGETMAGIC($arg);
-       if (!SvOK($arg))
-         croak(\"$var must be a scalar or an arrayref\");
-       if (SvROK($arg)) {
-         i_img_dim i;
-         AV *av;
-         i_sample_t *s;
-         if (SvTYPE(SvRV($arg)) != SVt_PVAV)
-           croak(\"$var must be a scalar or an arrayref\");
-         av = (AV *)SvRV($arg);
-          $var.count = av_len(av) + 1;
-          if ($var.count < 1)
-           croak(\"$pname: no samples provided in $var\");
-         s = malloc_temp(aTHX_ sizeof(i_sample_t) * $var.count);
-         for (i = 0; i < $var.count; ++i) {
-           SV **entry = av_fetch(av, i, 0);
-           s[i] = entry ? SvIV(*entry) : 0;
-         }
-          $var.samples = s;
-       }
-       else {
-         /* non-magic would be preferable here */
-         $var.samples = (const i_sample_t *)SvPVbyte($arg, $var.count);
-         if ($var.count == 0)
-           croak(\"$pname: no samples provided in $var\");
-       }
-
-T_IM_FSAMPLE_LIST
-       SvGETMAGIC($arg);
-       if (!SvOK($arg))
-         croak(\"$var must be a scalar or an arrayref\");
-       if (SvROK($arg)) {
-         i_img_dim i;
-         AV *av;
-         i_fsample_t *s;
-         if (SvTYPE(SvRV($arg)) != SVt_PVAV)
-           croak(\"$var must be a scalar or an arrayref\");
-         av = (AV *)SvRV($arg);
-          $var.count = av_len(av) + 1;
-          if ($var.count < 1)
-           croak(\"$pname: no samples provided in $var\");
-         s = malloc_temp(aTHX_ sizeof(i_fsample_t) * $var.count);
-         for (i = 0; i < $var.count; ++i) {
-           SV **entry = av_fetch(av, i, 0);
-           s[i] = entry ? SvNV(*entry) : 0;
-         }
-          $var.samples = s;
-       }
-       else {
-         /* non-magic would be preferable here */
-         $var.samples = (const i_fsample_t *)SvPVbyte($arg, $var.count);
-         if ($var.count % sizeof(double))
-           croak(\"$pname: $var doesn't not contain a integer number of samples\");
-          $var.count /= sizeof(double);
-         if ($var.count == 0)
-           croak(\"$pname: no samples provided in $var\");
+T_IV_checked
+       {
+           SvGETMAGIC($arg);
+           if (SvROK($arg) && !SvAMAGIC($arg)) {
+               croak(\"Numeric argument '$var' shouldn't be a reference\");
+           }
+           else {
+               $var = ($type)SvIV($arg);
+           }

        }
 
 #############################################################################
        }
 
 #############################################################################


@@ -212,5 +131,9 @@ T_IMAGER_FULL_IMAGE
         else {
           $arg = &PL_sv_undef;
         }
         else {
           $arg = &PL_sv_undef;
         }

-T_OFF_T
-       $arg = i_new_sv_off_t(aTHX_ $var);
+
+T_IV_checked
+       sv_setiv($arg, (IV)$var);
+
+T_NV_checked
+       sv_setnv($arg, (NV)$var);