Changeset 4458

Timestamp:

01/05/12 20:35:32 (5 months ago)

Author:

tboutell

Message:

* Fixed [1212]: cropping type 'c' does not work properly with JPEGs that have an orientation other than landscape. Calling aImageConverter::getInfo() rather than getimagesize() does the trick.

* Added a new 'uncropped' option to the aSlideshowSlot/slideshow component. When 'uncropped' => true is specified, the uncropped originals of images are used instead of any user-cropped version. Normally this is not a good thing, but it may be helpful when you render the same slideshow in two ways, one of which accommodates user cropping well and one of which does not.

Location:

plugins/apostrophePlugin/branches/1.5/lib

Files:

• action/BaseaSlideshowSlotComponents.class.php (modified) (2 diffs)
• toolkit/aImageConverter.class.php (modified) (3 diffs)

plugins/apostrophePlugin/branches/1.5/lib/action/BaseaSlideshowSlotComponents.class.php

@@ -24 +24 @@
     $this->setupOptions();
     $this->getLinkedItems();
+    
+    if ($this->options['uncropped'])
+    {
+      $newItems = array();
+      foreach ($this->items as $item)
+      {
+        $item = $item->getCropOriginal();
+        $newItems[] = $item;
+      }
+      $this->items = $newItems;
+    }
     
     if ($this->options['random'] && count($this->items))
@@ -66 +77 @@
     $this->options['slideshowTemplate'] = $this->getOption('slideshowTemplate', 'slideshow');
     $this->options['random'] = $this->getOption('random', false);
+    // Ignore any manual crops by the user. This is useful if you want to use 'c' in an
+    // alternative rendering of a slideshow where custom crops are normally welcome
+    $this->options['uncropped'] = $this->getOption('uncropped', false);
     
     // We automatically set up the aspect ratio if the resizeType is set to 'c'

plugins/apostrophePlugin/branches/1.5/lib/toolkit/aImageConverter.class.php

@@ -100 +100 @@
   static public function cropOriginal($fileIn, $fileOut, $width, $height, $quality = 75, $cropLeft = null, $cropTop = null, $cropWidth = null,  $cropHeight = null)
   {
+    $args = func_get_args();
+    error_log(implode(',', $args));
     // Allow skipping of parameters
     if (is_null($quality))
@@ -108 +110 @@
     $height = ceil($height);
     $quality = ceil($quality);
-    list($iwidth, $iheight) = getimagesize($fileIn); 
-    if (!$iwidth) 
+    // Make sure we use a method that understands about JPEG orientation
+    $info = aImageConverter::getInfo($fileIn); 
+    if (!$info)
     {
       return false;
     }
+    $iwidth = $info['width'];
+    $iheight = $info['height'];
+    
     $iratio = $iwidth / $iheight;
     $ratio = $width / $height;
@@ -146 +152 @@
     $scale = array('xysize' => array($width + 0, $height + 0));
     $crop = array('left' => $cropLeft, 'top' => $cropTop, 'width' => $cropWidth, 'height' => $cropHeight);
+    error_log("scale: " . json_encode($scale));
+    error_log("crop: " . json_encode($crop));
     return self::scaleBody($fileIn, $fileOut, $scale, $crop, $quality);
   }