[med-svn] [SCM] libbio-graphics-perl branch, master, updated. debian/2.33-1-11-g28d7223

[Olivier Sallou]

The following commit has been merged in the master branch:
commit 366f17990f1fba9e19639facc823859caa900360
Author: Olivier Sallou <olivier.sallou at debian.org>
Date:   Mon Jul 29 08:49:08 2013 +0200

    fix merge issues on Glyph

diff --git a/lib/Bio/Graphics/Glyph.pm b/lib/Bio/Graphics/Glyph.pm
index 9e8739f..b6d2587 100755
--- a/lib/Bio/Graphics/Glyph.pm
+++ b/lib/Bio/Graphics/Glyph.pm
@@ -780,29 +780,9 @@ sub getfont {
   my $font = $self->option($option) || $default;
   return unless $font;
 
-<<<<<<< HEAD
-  my $img_class = $self->image_class;
-
-  if (!UNIVERSAL::isa($font,$img_class . '::Font') && $font =~ /^(gd|sanserif)/) {
-    my $ref    = {
-		  gdTinyFont       => $img_class->gdTinyFont(),
-		  gdSmallFont      => $img_class->gdSmallFont(),
-		  gdMediumBoldFont => $img_class->gdMediumBoldFont(),
-		  gdLargeFont      => $img_class->gdLargeFont(),
-		  gdGiantFont      => $img_class->gdGiantFont(),
-		  sanserif         => $img_class->gdSmallFont(),
-    		 };
-
-    my $gdfont = $ref->{$font} || $ref->{gdSmallFont};
-    $self->configure($option => $gdfont);
-    return $gdfont;
-  }
-  return $font;
-=======
   my $gdfont = $self->panel->gdfont($font);
   $self->configure($option => $gdfont);  
   return $gdfont;
->>>>>>> upstream/2.37
 }
 
 sub tkcolor { # "track color"
diff --git a/lib/Bio/Graphics/Glyph/xyplot.pm b/lib/Bio/Graphics/Glyph/xyplot.pm
index 5fd03df..754461b 100755
--- a/lib/Bio/Graphics/Glyph/xyplot.pm
+++ b/lib/Bio/Graphics/Glyph/xyplot.pm
@@ -116,13 +116,8 @@ sub pad_top {
 sub pad_bottom {
   my $self = shift;
   my $pad  = $self->Bio::Graphics::Glyph::generic::pad_bottom(@_);
-<<<<<<< HEAD
-  if ($pad < $self->font_height('gdTinyFont')/4) {
-      $pad = $self->font_height('gdTinyFont')/4;  # extra room for the scale
-=======
   if ($pad < $self->font_height($self->getfont('gdTinyFont'))/4) {
       $pad = $self->font_height($self->getfont('gdTinyFont'))/4;  # extra room for the scale
->>>>>>> upstream/2.37
   }
   $pad;
 }

-- 
Generate GD images of Bio::Seq objects.