Changeset 16973 for extensions/rotateImage/ws_functions.inc.php

Timestamp:

Jul 24, 2012, 3:38:35 PM (12 years ago)

Author:

plg

Message:

compatibility with Piwigo 2.4

ability to use jpegtran with $confrotate_image_jpegtran = true : lossless photo rotation

File:

• extensions/rotateImage/ws_functions.inc.php (modified) (2 diffs)

extensions/rotateImage/ws_functions.inc.php

@@ -1 +1 @@
 <?php
-
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
@@ -34 +33 @@
   }
 
-  include_once(PHPWG_ROOT_PATH.'admin/include/functions_upload.inc.php');
+  include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
   include_once(PHPWG_ROOT_PATH.'admin/include/image.class.php');
+
   $image_id=(int)$params['image_id'];
   
   $query='
-SELECT id, path, tn_ext, has_high
+SELECT
+    id,
+    path,
+    representative_ext,
+    rotation
   FROM '.IMAGES_TABLE.'
   WHERE id = '.$image_id.'
 ;';
-  $image = pwg_db_fetch_assoc(pwg_query($query));
-  if ($image == null)
+  $row = pwg_db_fetch_assoc(pwg_query($query));
+  if ($row == null)
   {
     return new PwgError(403, "image_id not found");
   }
 
-  // rotation angle
-  if ('auto' == $params['angle']) {
-    $angle = $params['angle'];
+  $base_angle = pwg_image::get_rotation_angle_from_code($row['rotation']);
+
+  if (get_boolean($params['rotate_hd'])) {
+    if ('auto' == $angle) {
+      $angle = pwg_image::get_rotation_angle($row['path']);
+      $rotation_code = 0;
+    }
+    else {
+      // the angle is based on what the user sees (the thumbnail) and not on
+      // the original, which may have a different angle
+      $angle = ($base_angle + $params['angle']) % 360;
+
+      // the derivatives must not be rotated
+      $rotation_code = 4;
+    }
+
+    if (isset($conf['rotate_image_jpegtran']) and $conf['rotate_image_jpegtran']) {
+      $angle = ($angle + 180) % 360;
+      $command = 'jpegtran -copy all -rotate '.$angle.' -outfile '.$row['path'].' '.$row['path'];
+      exec($command);
+    }
+    else {
+      $image = new pwg_image($row['path']);
+      $image->set_compression_quality(98);
+      $image->rotate($angle);
+      $image->write($row['path']);
+    }
+
+    $conf['use_exif'] = false;
+    $conf['use_iptc'] = false;
+    sync_metadata(array($row['id']));
+
+    single_update(
+      IMAGES_TABLE,
+      array('rotation' => $rotation_code),
+      array('id' => $row['id'])
+    );
   }
-  else {
-    $angle = (int)$params['angle'];
+  elseif ('auto' != $params['angle']) {
+    $new_angle = ($base_angle + $params['angle']) % 360;
+    $rotation_code = pwg_image::get_rotation_code_from_angle($new_angle);
+
+    // to show that it's a manual rotation, we use 4,5,6,7 instead of 0,1,2,3
+    $rotation_code+= 4;
+
+    single_update(
+      IMAGES_TABLE,
+      array('rotation' => $rotation_code),
+      array('id' => $row['id'])
+    );
   }
 
-  if (get_boolean($params['rotate_hd']) and get_boolean($image['has_high'])) {
-    $to_rotate_path = file_path_for_type($image['path'], 'high');
-    $quality = $conf['upload_form_hd_quality'];
-    $regenerate_websize = true;
-
-    if ('auto' == $angle) {
-      $angle = pwg_image::get_rotation_angle($to_rotate_path);
-    }
-  }
-  else {
-    $to_rotate_path = $image['path'];
-    $quality = $conf['upload_form_websize_quality'];
-    $regenerate_websize = false;
-  }
-
-  $rotated = new pwg_image($to_rotate_path);
-  $rotated->set_compression_quality($quality);
-  $rotated->rotate($angle);
-  $rotated->write($to_rotate_path);
-
-  if ($regenerate_websize) {
-    ws_images_resizewebsize(
-      array(
-        'image_id' => $params['image_id'],
-        'maxwidth' => $conf['upload_form_websize_maxwidth'],
-        'maxheight' => $conf['upload_form_websize_maxheight'],
-        'quality' => $conf['upload_form_websize_quality'],
-        'automatic_rotation' => $conf['upload_form_automatic_rotation'],
-        'library' => $conf['graphics_library'],
-        ),
-      $service
-      );
-  }
-
-  ws_images_resizethumbnail(
-    array(
-      'image_id' => $params['image_id'],
-      'maxwidth' => $conf['upload_form_thumb_maxwidth'],
-      'maxheight' => $conf['upload_form_thumb_maxheight'],
-      'quality' => $conf['upload_form_thumb_quality'],
-      'crop' => $conf['upload_form_thumb_crop'],
-      'follow_orientation' => $conf['upload_form_thumb_follow_orientation'],
-      'library' => $conf['graphics_library'],
-      ),
-    $service
-    );
-
-  $conf['use_exif'] = false;
-  $conf['use_iptc'] = false;
-  update_metadata(array($image['id'] => $image['path']));
+  delete_element_derivatives($row);
   
   return true;