diff options
| author | Malf Furious <m@lfurio.us> | 2018-11-10 23:21:39 -0500 |
|---|---|---|
| committer | Malf Furious <m@lfurio.us> | 2018-11-10 23:21:39 -0500 |
| commit | f3165d28fff6468fca44ff2ec3b6cfb3fb82ee90 (patch) | |
| tree | a8edb746f0a21d9e7ad134ba79be8278ecce147e /app/class/image.php | |
| parent | 0421aa1b60f4fe6bf140888159c58059c1013588 (diff) | |
| parent | 295ba9fce85a959b04db4ac74b4ee378b42e6153 (diff) | |
| download | scrott-0.2.tar.gz scrott-0.2.zip | |
Merge branch 'rel/v0.2'v0.2
Diffstat (limited to '')
| -rw-r--r-- | app/class/image.php | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/app/class/image.php b/app/class/image.php index 6b73cae..62999aa 100644 --- a/app/class/image.php +++ b/app/class/image.php @@ -20,13 +20,19 @@ /* * Mappings from image MIME types to PHP open/write functions */ -$_IMG_OPEN_FUNCS['image/jpeg'] = "imagecreatefromjpeg"; -$_IMG_OPEN_FUNCS['image/jpg'] = "imagecreatefromjpeg"; -$_IMG_OPEN_FUNCS['image/png'] = "imagecreatefrompng"; +$_IMG_OPEN_FUNCS['image/jpeg'] = "imagecreatefromjpeg"; +$_IMG_OPEN_FUNCS['image/jpg'] = "imagecreatefromjpeg"; +$_IMG_OPEN_FUNCS['image/png'] = "imagecreatefrompng"; +$_IMG_OPEN_FUNCS['image/gif'] = "imagecreatefromgif"; +$_IMG_OPEN_FUNCS['image/bmp'] = "imagecreatefrombmp"; +$_IMG_OPEN_FUNCS['image/x-ms-bmp'] = "imagecreatefrombmp"; -$_IMG_WRITE_FUNCS['image/jpeg'] = "imagejpeg"; -$_IMG_WRITE_FUNCS['image/jpg'] = "imagejpeg"; -$_IMG_WRITE_FUNCS['image/png'] = "imagepng"; +$_IMG_WRITE_FUNCS['image/jpeg'] = "imagejpeg"; +$_IMG_WRITE_FUNCS['image/jpg'] = "imagejpeg"; +$_IMG_WRITE_FUNCS['image/png'] = "imagepng"; +$_IMG_WRITE_FUNCS['image/gif'] = "imagegif"; +$_IMG_WRITE_FUNCS['image/bmp'] = "imagebmp"; +$_IMG_WRITE_FUNCS['image/x-ms-bmp'] = "imagebmp"; /* * Open the given image and crop it, such that the result is a square |