From 349aee42bfdb07449186ded5fd831b714da7dd18 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 7 Mar 2003 18:01:07 +0000
Subject: [PATCH] width and height options

---
 libraries/transformations/image_jpeg__inline.inc.php3 | 3 +--
 transformation_wrapper.php3                           | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/libraries/transformations/image_jpeg__inline.inc.php3 b/libraries/transformations/image_jpeg__inline.inc.php3
index 9505c26a1..073d1138a 100644
--- a/libraries/transformations/image_jpeg__inline.inc.php3
+++ b/libraries/transformations/image_jpeg__inline.inc.php3
@@ -9,8 +9,7 @@ if (!defined('PMA_TRANSFORMATION_IMAGE_JPEG__INLINE')){
         include('./libraries/transformations/global.inc.php3');
         
         if (PMA_IS_GD2) {
-            //$transform_options = array ('string' => '<img src="transformation_wrapper.php3' . $options['wrapper_link'] . '&resize=1&suggested_size=' . (isset($options[0]) ? $options[0] : '100') . '" alt="[__BUFFER__]">');
-            $transform_options = array ('string' => '<a href="transformation_wrapper.php3' . $options['wrapper_link'] . '" target="_blank"><img src="transformation_wrapper.php3' . $options['wrapper_link'] . '&resize=1&suggested_size=' . (isset($options[0]) ? $options[0] : '100') . '" alt="[__BUFFER__]" border="0"></a>');
+            $transform_options = array ('string' => '<a href="transformation_wrapper.php3' . $options['wrapper_link'] . '" target="_blank"><img src="transformation_wrapper.php3' . $options['wrapper_link'] . '&resize=1&newWidth=' . (isset($options[0]) ? $options[0] : '100') . '&newHeight=' . (isset($options[1]) ? $options[1] : 100) . '" alt="[__BUFFER__]" border="0"></a>');
         } else {
             $transform_options = array ('string' => '<img src="transformation_wrapper.php3' . $options['wrapper_link'] . '" alt="[__BUFFER__]" width="320" height="240">');
         }
diff --git a/transformation_wrapper.php3 b/transformation_wrapper.php3
index 42f6a41be..a0e91f324 100644
--- a/transformation_wrapper.php3
+++ b/transformation_wrapper.php3
@@ -155,8 +155,8 @@ if (!isset($resize)) {
     // it sets $resize to 1 
    
     $srcImage = imagecreatefromstring($row[urldecode($transform_key)]);
-    $newWidth = $suggested_size;
-    $newHeight = $suggested_size;
+    //$newWidth = $suggested_size;
+    //$newHeight = $suggested_size;
     $srcWidth = ImageSX( $srcImage );
     $srcHeight = ImageSY( $srcImage );