Changeset 1917 for plugins/apostrophePlugin/trunk/lib/toolkit/aImageConverter.class.php

Timestamp:

08/08/10 12:18:34 (22 months ago)

Author:

tboutell

Message:

Merged the cropping branch back to trunk:

Cropping is now available in the media repository. Every time you select an image for use on the site you have the opportunity to crop it. The image size constraints of the slot are taken into account. This means that you can satisfy a given set of constraints by cropping a wide variety of images that would not have been eligible for selection before.

Crops of existing images appear in the database as separate aMediaItem objects but do not duplicate the original image file. This means that many crops of a single source image can exist without significant overhead.

The slug field of a cropped version of an image contains cropping parameters. When rendering the image, Symfony routes spot these and crop the original file as needed.

By approaching the problem this way we have avoided the need for code that takes advantage of the media repository's image selection capabilities to change in any way in order to take advantage of cropping.

The single-image-select behavior of Apostrophe has changed to accommodate the extra cropping step. Single select for PDFs and videos still uses the selectSingle partial because they cannot be cropped.

Thanks to Spike Broehm for his contributions to the cropping project.

Fixes #227

Location:

plugins/apostrophePlugin/trunk

Files:

• . (modified) (1 prop)
• lib/toolkit/aImageConverter.class.php (modified) (3 diffs)

plugins/apostrophePlugin/trunk/lib/toolkit/aImageConverter.class.php

@@ -55 +55 @@
   }
 
-  static public function cropOriginal($fileIn, $fileOut, $width, $height, $quality = 75)
-  {
+  // $width and $height are the dimensions of the final rendered image. $quality is the JPEG quality setting (where needed).
+  // The $crop parameters, when not null (all four must be null or not null), are used to crop the original before scaling/distorting 
+  // to the specified width and height and are always in the original image's coordinates.
+  
+  // If cropping coordinates are not specified, the largest possible portion of the center of the original image is scaled to fit into the 
+  // destination image without distortion
+  
+  static public function cropOriginal($fileIn, $fileOut, $width, $height, $quality = 75, $cropLeft = null, $cropTop = null, $cropWidth = null,  $cropHeight = null)
+  {
+    // Allow skipping of parameters
+    if (is_null($quality))
+    {
+      $quality = 75;
+    }
     $width = ceil($width);
     $height = ceil($height);
@@ -67 +79 @@
     $iratio = $iwidth / $iheight;
     $ratio = $width / $height;
+
+     // Spike's contribution: arbitrary cropping
+     if (!is_null($cropWidth) && !is_null($cropHeight) && !is_null($cropLeft) && !is_null($cropTop))
+     {
+       $cropTop = ceil($cropTop + 0);
+       $cropLeft = ceil($cropLeft + 0);
+       $cropWidth = ceil($cropWidth + 0);
+       $cropHeight = ceil($cropHeight + 0);
+       
+       $scale = array('xysize' => array($width + 0, $height + 0));
+       $crop = array('left' => $cropLeft, 'top' => $cropTop, 'width' => $cropWidth, 'height' => $cropHeight);
+       return self::scaleBody($fileIn, $fileOut, $scale, $crop, $quality);
+     }
 
     $scale = array('xysize' => array($width + 0, $height + 0));
@@ -356 +381 @@
         $width = $scaleParameters['xysize'][0];
         $height = $scaleParameters['xysize'][1];
-        
+        // This was backwards until 05/31/2010, making things bigger rather than smaller if their
+        // aspect ratios differed from the original. Be consistent with netpbm which makes things
+        // smaller not bigger
         if (($width / $height) > ($swidth / $sheight))
         {
-          // Wider than the original. So it will be shorter than requested
-          $height = ceil($width * ($sheight / $swidth));
+          // Wider than the original. So it will be narrower than requested
+          $width = ceil($height * ($swidth / $sheight));
         }
         else
         {
-          // Taller than the original. So it will be narrower than requested
-          $width = ceil($height * ($swidth / $sheight));
+          // Taller than the original. So it will be shorter than requested
+          $height = ceil($width * ($sheight / $swidth));
         }
         $out = self::createTrueColorAlpha($width, $height);