more optimization - pretty minor returns

diff --git a/Imager.pm b/Imager.pm
index e8ec81552e1da9510c3bd2207d3fd03aa55af70a..90737c70074eed82762bba0df23a2dc41efa042c 100644 (file)
--- a/Imager.pm
+++ b/Imager.pm
@@ -2678,9 +2678,7 @@ sub box {
     my $color = $opts{'color'};
 
     if (defined $color) {
-      unless (ref $color &&
-             (UNIVERSAL::isa($color, "Imager::Color")
-              || UNIVERSAL::isa($color, "Imager::Color::Float"))) {
+      unless (_is_color_object($color)) {
        $color = _color($color);
        unless ($color) { 
          $self->{ERRSTR} = $Imager::ERRSTR; 
@@ -2708,9 +2706,7 @@ sub box {
   else {
     my $color = $opts{'color'};
     if (defined $color) {
-      unless (ref $color &&
-             (UNIVERSAL::isa($color, "Imager::Color")
-              || UNIVERSAL::isa($color, "Imager::Color::Float"))) {
+      unless (_is_color_object($color)) {
        $color = _color($color);
        unless ($color) { 
          $self->{ERRSTR} = $Imager::ERRSTR;

diff --git a/Imager.xs b/Imager.xs
index 31f0e3a88bd5f63885708c02abb98cd8161d6c0a..d910b065ba7a6bab7f051e950a2d6a9504dd7d0b 100644 (file)
--- a/Imager.xs
+++ b/Imager.xs
@@ -1969,6 +1969,17 @@ undef_int
 i_init_fonts(t1log=0)
     int t1log
 
+bool
+_is_color_object(sv)
+       SV* sv
+    CODE:
+        SvGETMAGIC(sv);
+        RETVAL = SvOK(sv) && SvROK(sv) &&
+          (sv_derived_from(sv, "Imager::Color")
+          || sv_derived_from(sv, "Imager::Color::Float"));
+    OUTPUT:
+        RETVAL
+
 #ifdef HAVE_LIBT1
 
 void

diff --git a/bench/box.pl b/bench/box.pl
index 19e537351ae98d1be47787c773f697a46a21e483..1d2089389075dc8f1dab1b30fce4fdcb93b01979 100644 (file)
--- a/bench/box.pl
+++ b/bench/box.pl
@@ -225,3 +225,26 @@ palbox0010: 1314.1 /s (0.000761 / iter)
 palbox0100: 752.2 /s (0.001330 / iter)
 palbox0500: 269.4 /s (0.003712 / iter)
 palbox1000: 145.3 /s (0.006884 / iter)
+
+make _is_color_object xs
+
+box0010: 1359.4 /s (0.000736 / iter)
+box0010c: 3.4 /s (0.294118 / iter)
+box0010d: 635.6 /s (0.001573 / iter)
+box0100: 818.6 /s (0.001222 / iter)
+box0500: 294.3 /s (0.003398 / iter)
+box1000: 162.9 /s (0.006140 / iter)
+fbox0010: 1230.8 /s (0.000813 / iter)
+fbox0010c: 3.2 /s (0.313125 / iter)
+fbox0010d: 608.7 /s (0.001643 / iter)
+fbox0100: 158.5 /s (0.006308 / iter)
+fbox0500: 7.5 /s (0.134103 / iter)
+fbox1000: 1.9 /s (0.530000 / iter)
+fpalbox0010: 1328.8 /s (0.000753 / iter)
+fpalbox0100: 553.2 /s (0.001808 / iter)
+fpalbox0500: 43.5 /s (0.022974 / iter)
+fpalbox1000: 11.4 /s (0.087627 / iter)
+palbox0010: 1344.8 /s (0.000744 / iter)
+palbox0100: 783.0 /s (0.001277 / iter)
+palbox0500: 274.5 /s (0.003643 / iter)
+palbox1000: 147.9 /s (0.006761 / iter)