minor improvements and added freecrop method

Author: adityapatadia

README.md

@@ -41,10 +41,10 @@ use \Eventviva\ImageResize;
 $image = new ImageResize();
 ```
 
-Note: This library uses GD class which do not support resizing animated gif files
+> Note: This library uses GD class which do not support resizing animated gif files
 
-Usage
------
+Resize
+------
 
 To scale an image, in this case to half it's size (scaling is percentage based):
 
@@ -53,7 +53,7 @@ $image = new ImageResize('image.jpg');
 $image->scale(50);
 $image->save('image2.jpg')
 ```
- 
+
 To resize an image according to one dimension (keeping aspect ratio):
 
 ```php
@@ -73,6 +73,27 @@ $image->resizeToBestFit(500, 300);
 $image->save('image2.jpg');
 ```
 
+All resize functions have ```$allow_enlarge``` option which is set to false by default.
+You can enable by passing ```true``` to any resize function:
+```php
+$image = new ImageResize('image.jpg');
+$image->resize(500, 300, $allow_enlarge = True);
+$image->save('image2.jpg');
+```
+
+If you are happy to handle aspect ratios yourself, you can resize directly:
+
+```php
+$image = new ImageResize('image.jpg');
+$image->resize(800, 600);
+$image->save('image2.jpg');
+```
+
+This will cause your image to skew if you do not use the same width/height ratio as the source image.
+
+Crop
+----
+
 To to crop an image:
 
 ```php
@@ -85,16 +106,15 @@ This will scale the image to as close as it can to the passed dimensions, and th
 
 In the case of the example above, an image of 400px × 600px will be resized down to 200px × 300px, and then 50px will be taken off the top and bottom, leaving you with 200px × 200px.
 
-If you are happy to handle aspect ratios yourself, you can resize directly:
+There is also a way to define custom crop position.
+You can define $x and $y in ```freecrop``` method:
 
 ```php
 $image = new ImageResize('image.jpg');
-$image->resize(800, 600);
+$image->freecrop(200, 200, $x =  20, $y = 20);
 $image->save('image2.jpg');
 ```
 
-This will cause your image to skew if you do not use the same width/height ratio as the source image.
-
 Loading and saving images from string
 -------------------------------------
 
@@ -183,12 +203,12 @@ We're passing `null` for the image type in the example above to skip over it and
 Interlacing
 -----------
 
-By default, [image interlacing](http://php.net/manual/en/function.imageinterlace.php) is turned off. It can be enabled by setting `$interlace` to `1`:
+By default, [image interlacing](http://php.net/manual/en/function.imageinterlace.php) is turned on. It can be disabled by setting `$interlace` to `0`:
 
 ```php
 $image = new ImageResize('image.jpg');
 $image->scale(50);
-$image->interlace = 1;
+$image->interlace = 0;
 $image->save('image2.jpg')
 ```
 

composer.json

@@ -17,6 +17,6 @@
         "ext-exif": "*"
     },
     "autoload": {
-        "classmap": ["src"]
+        "classmap": ["lib"]
     }
 }

src/ImageResize.php lib/ImageResize.phpsrc/ImageResize.php renamed to lib/ImageResize.php

@@ -19,7 +19,7 @@ class ImageResize
     public $quality_jpg = 75;
     public $quality_png = 0;
 
-    public $interlace = 0;
+    public $interlace = 1;
 
     public $source_type;
 
@@ -213,14 +213,12 @@ public function save($filename, $image_type = null, $quality = null, $permission
      */
     public function getImageAsString($image_type = null, $quality = null)
     {
-        $string_temp = tempnam(sys_get_temp_dir(), '');
+        $string_temp = "php://temp/" . substr(str_shuffle(str_repeat('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789',5)),0,40);
 
-        $this->save($string_temp, $image_type, $quality);
+        $this->save($string_temp , $image_type, $quality);
 
         $string = file_get_contents($string_temp);
 
-        unlink($string_temp);
-
         return $string;
     }
 
@@ -312,7 +310,7 @@ public function resizeToBestFit($max_width, $max_height, $allow_enlarge = false)
      * Resizes image according to given scale (proportionally)
      *
      * @param integer|float $scale
-     * @return \Eventviva\ImageResize
+     * @return \static
      */
     public function scale($scale)
     {
@@ -366,7 +364,7 @@ public function resize($width, $height, $allow_enlarge = false)
      * @param integer $position
      * @return \static
      */
-    public function crop($width, $height, $allow_enlarge = false, $position = self::CROPCENTER)
+    public function crop($width, $height, $position = self::CROPCENTER, $allow_enlarge = false)
     {
         if (!$allow_enlarge) {
             // this logic is slightly different to resize(),
@@ -408,6 +406,40 @@ public function crop($width, $height, $allow_enlarge = false, $position = self::
         return $this;
     }
 
+    /**
+     * Crops image according to the given width, height, x and y
+     *
+     * @param integer $width
+     * @param integer $height
+     * @param integer $x
+     * @param integer $y
+     * @return \static
+     */
+    public function freecrop($width, $height, $x = false, $y = false)
+    {
+        if($x === false or $y === false){
+          return $this->crop($width, $height);
+        }
+        $this->source_x = $x;
+        $this->source_y = $y;
+        if($width > $this->getSourceWidth() - $x){
+          $this->source_w = $this->getSourceWidth() - $x;
+        } else {
+          $this->source_w = $width;
+        }
+
+        if($height > $this->getSourceHeight() - $h){
+          $this->source_h = $this->getSourceHeight() - $h;
+        } else {
+          $this->source_h = $height;
+        }
+
+        $this->dest_w = $width;
+        $this->dest_h = $height;
+
+        return $this;
+    }
+
     /**
      * Gets source width
      *

test/Test.php

@@ -1,6 +1,6 @@
 <?php
 
-include __DIR__.'/../src/ImageResize.php';
+include __DIR__.'/../lib/ImageResize.php';
 
 use \Eventviva\ImageResize;
 
@@ -209,6 +209,17 @@ public function testCrop()
         $this->assertEquals(50, $resize->getDestHeight());
     }
 
+    public function testFreeCrop()
+    {
+        $image = $this->createImage(200, 100, 'png');
+        $resize = new ImageResize($image);
+
+        $resize->freecrop(50, 50 , $x = 20, $y = 20);
+
+        $this->assertEquals(50, $resize->getDestWidth());
+        $this->assertEquals(50, $resize->getDestHeight());
+    }
+
     public function testCropPosition()
     {
         $image = $this->createImage(200, 100, 'png');