Changeset 10641 for trunk/include

Timestamp:

Apr 27, 2011, 7:03:25 PM (13 years ago)

Author:

patdenice

Message:

feature:2284
Create a class to manipulate images.

Location:

trunk/include

Files:

• config_default.inc.php (modified) (1 diff)
• ws_functions.inc.php (modified) (2 diffs)

trunk/include/config_default.inc.php

@@ -321 +321 @@
 // 'filename'
 $conf['uniqueness_mode'] = 'md5sum';
+
+// Library used for image resizing. Value could be 'auto', 'imagick',
+// 'ext_imagick or 'gd'. If value is 'auto', library will be choosen in this
+// order. If choosen library is not available, another one will be picked up.
+$conf['image_library'] = 'auto';
+
+// If library used is external installation of ImageMagick ('ext_imagick'),
+// you can define imagemagick directory.
+$conf['ext_imagick_dir'] = '';
 
 // +-----------------------------------------------------------------------+

trunk/include/ws_functions.inc.php

@@ -2689 +2689 @@
   include_once(PHPWG_ROOT_PATH.'include/functions_picture.inc.php');
   include_once(PHPWG_ROOT_PATH.'admin/include/functions_upload.inc.php');
+  include_once(PHPWG_ROOT_PATH.'admin/include/image.class.php');
 
   if (!empty($params['image_id']))
@@ -2726 +2727 @@
     prepare_directory(dirname($thumb_path));
 
-    $result = trigger_event(
-      'upload_thumbnail_resize',
-      false,
-      $image_path,
+    $img = new pwg_image($image_path, $params['library']);
+
+    $result =  $img->pwg_resize(
       $thumb_path,
       $params['maxwidth'],
       $params['maxheight'],
       $params['quality'],
+      $params['automatic_rotation'],
       true,
       get_boolean($params['crop']),
       get_boolean($params['follow_orientation'])
     );
+
+    $img->destroy();
   }
   elseif (file_exists($hd_path))
   {
-    $result = trigger_event(
-      'upload_image_resize',
-      false,
-      $hd_path,
+    $img = new pwg_image($hd_path);
+
+    $result = $img->pwg_resize(
       $image_path,
       $params['maxwidth'],
       $params['maxheight'],
       $params['quality'],
+      $params['automatic_rotation'],
       false
       );
+
+    $img->destroy();
 
     if (!empty($image['has_high']))