From 5ad3fac14d691c2d5a025b19e92929283c6d6d6a Mon Sep 17 00:00:00 2001 From: Michael Larabel Date: Sun, 28 Dec 2008 20:39:08 -0500 Subject: bilde_renderer: When setting the image quality level to use with the render_image() function, base it on a 100-point scale --- CHANGE-LOG | 1 + pts-core/objects/bilde_renderer/bilde_gd_renderer.php | 2 +- pts-core/objects/bilde_renderer/bilde_png_renderer.php | 3 ++- pts-core/objects/bilde_renderer/bilde_renderer.php | 2 +- pts-core/objects/bilde_renderer/bilde_svg_renderer.php | 3 ++- pts-core/objects/pts_Graph/pts_Graph.php | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGE-LOG b/CHANGE-LOG index c0d97f9..10563a6 100644 --- a/CHANGE-LOG +++ b/CHANGE-LOG @@ -23,6 +23,7 @@ Phoronix Test Suite (Git) - pts: Update lzma download link for compress-lzma test profile - pts_Graph: Tweak formatting of basic graph attributes - bilde_renderer: Add and implement draw_polygon and draw_ellipse to drawing API +- bilde_renderer: When setting the image quality level to use with the render_image() function, base it on a 100-point scale - bilde_renderer: Add support for dynamically resizing the image drawing buffer - bilde_renderer: Add experimental Adobe Flash / SWF renderer - bilde_renderer: Add a generic abstract GD library renderer and then have bilde_png_renderer extend that diff --git a/pts-core/objects/bilde_renderer/bilde_gd_renderer.php b/pts-core/objects/bilde_renderer/bilde_gd_renderer.php index 25675e6..6d8ad3e 100644 --- a/pts-core/objects/bilde_renderer/bilde_gd_renderer.php +++ b/pts-core/objects/bilde_renderer/bilde_gd_renderer.php @@ -31,7 +31,7 @@ abstract class bilde_gd_renderer extends bilde_renderer } /* - public function render_image($output_file = null, $quality = 0) + public function render_image($output_file = null, $quality = 100) { // To be implemented by the class extending bilde_gd_renderer } diff --git a/pts-core/objects/bilde_renderer/bilde_png_renderer.php b/pts-core/objects/bilde_renderer/bilde_png_renderer.php index 47a414d..f1ecba6 100644 --- a/pts-core/objects/bilde_renderer/bilde_png_renderer.php +++ b/pts-core/objects/bilde_renderer/bilde_png_renderer.php @@ -29,8 +29,9 @@ class bilde_png_renderer extends bilde_gd_renderer $this->image_width = $width; $this->image_height = $height; } - public function render_image($output_file = null, $quality = 0) + public function render_image($output_file = null, $quality = 100) { + $quality = floor(9 - (($quality / 100) * 9)); // calculate compression level return imagepng($this->image, $output_file, $quality); } } diff --git a/pts-core/objects/bilde_renderer/bilde_renderer.php b/pts-core/objects/bilde_renderer/bilde_renderer.php index 9d07b34..6eb0599 100644 --- a/pts-core/objects/bilde_renderer/bilde_renderer.php +++ b/pts-core/objects/bilde_renderer/bilde_renderer.php @@ -29,7 +29,7 @@ abstract class bilde_renderer var $embed_identifiers = null; abstract function __construct($width, $height, $embed_identifiers = ""); // create the object - abstract function render_image($output_file = null, $quality = 0); + abstract function render_image($output_file = null, $quality = 100); abstract function resize_image($width, $height); abstract function destroy_image(); diff --git a/pts-core/objects/bilde_renderer/bilde_svg_renderer.php b/pts-core/objects/bilde_renderer/bilde_svg_renderer.php index 6c91a0c..b7b87ab 100644 --- a/pts-core/objects/bilde_renderer/bilde_svg_renderer.php +++ b/pts-core/objects/bilde_renderer/bilde_svg_renderer.php @@ -34,8 +34,9 @@ class bilde_svg_renderer extends bilde_renderer $this->image_width = $width; $this->image_height = $height; } - public function render_image($output_file = null, $quality = 0) + public function render_image($output_file = null, $quality = 100) { + // $quality is unused with SVG files $svg_image = "\n\n"; if(is_array($this->embed_identifiers)) diff --git a/pts-core/objects/pts_Graph/pts_Graph.php b/pts-core/objects/pts_Graph/pts_Graph.php index c152511..dd843a3 100644 --- a/pts-core/objects/pts_Graph/pts_Graph.php +++ b/pts-core/objects/pts_Graph/pts_Graph.php @@ -546,7 +546,7 @@ abstract class pts_Graph } protected function return_graph_image() { - $this->graph_image->render_image($this->graph_output, 5); + $this->graph_image->render_image($this->graph_output, 85); $this->graph_image->destroy_image(); } protected function trim_double($double, $accuracy = 2) -- cgit