diff --git a/VERSION b/VERSION index e70b4523ae7ffe8aa3cac8ecd1b093fba5a98737..6a6a3d8e35c7a98eaeb47d4212cc13d1d8938003 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6.0 +2.6.1 diff --git a/lib/PZ/Controller/Shortcut.pm b/lib/PZ/Controller/Shortcut.pm index 310427f99eb90ce2e2bfeb4f24cb2d14e8e5d41e..b4bc292319ddacc899f2e56717f972a8c25ffdd0 100644 --- a/lib/PZ/Controller/Shortcut.pm +++ b/lib/PZ/Controller/Shortcut.pm @@ -116,16 +116,19 @@ sub qr ($c) { my $url = 'https://' . $c->config->{domain} . '/' . $c->stash->{shortcut}; $c->trace($url); - my $png = qrpng (text => $url, level => 4, scale => 6); + my $png = qrpng (text => $url, level => 4, scale => 7); my $qr = GD::Image->new($png); - my $logo = GD::Image->new($c->app->home . '/public/logo.png'); - $qr->trueColor(1); + + my $logo = GD::Image->new($c->app->home . '/public/logo.png'); $logo->trueColor(1); + + my ($wq,$hq) = $qr->getBounds(); + my ($wl,$hl) = $logo->getBounds(); $logo->transparent($logo->colorClosest($logo->rgb($logo->getPixel(0,0)))); - $qr->copyMerge($logo,73,73,0,0,100,100,80); + $qr->copyMerge($logo, ($wq-$wl)/2, ($hq-$hl)/2, 0, 0, $wl, $hl, 80); $c->res->headers->content_type('image/png'); $c->render( data => $qr->png );