Ticket #560: image_proportion.diff

function.image.php

@@ -17 +17 @@
- * alt :string
- * width :uint
- * height :uint
+ * maxwidth :uint only with maxheight
+ * maxheight :uint only with maxwidth
- * zoom 1-100
- * omo :boolean
- * alignh [left|center|right|:int]
@@ -81 +83 @@
-    
-    // Cache and make changes if necessary.
-    if( is_file($origine_path) && !is_file($cache_path) ) {
-
+maxwidth'=>'', 'maxheight'=>'', '
-        if( count(array_intersect_key($params, $att)) )
-            jtpl_function_html_image_inCache($src, $cachename, $params);
-    }
@@ -94 +96 @@
-    if( !is_file($cache_path) ) {
-        $att['src'] = $origine_www;
-        $att['style'] = empty($att['style'])?'':$att['style'];
-
-
+
+
+
+
-    } else
-        $att['src'] = $cache_www;
-    
@@ -132 +136 @@
-        default                      : return ;
-    }
-    
+    if(!empty($array['maxwidth']) && !empty($array['maxheight'])) {
+        
+        $rapy = imagesy($image)/$array['maxwidth'];
+        $rapx = imagesx($image)/$array['maxheight'];
+        
+        if( $rapy > $rapx ) {
+            $array['height'] = $array['maxheight'];
+            $array['width'] = imagesx($image)/$rapy;
+        } else {
+            $array['width'] = $array['maxwidth'];
+            $array['height'] = imagesy($image)/$rapx;
+        }
+    }
+    
-    if (!empty($array['width']) || !empty($array['height'])) {
-    
-        $ancienimage = $image;