diff --git a/inc/image.php b/inc/image.php index 7727256c..d7756ffd 100644 --- a/inc/image.php +++ b/inc/image.php @@ -10,7 +10,7 @@ class Image { public $src, $format, $image, $size; public function __construct($src, $format = false, $size = false) { global $config; - + $this->src = $src; $this->format = $format; @@ -24,21 +24,21 @@ class Image { error(_('Unsupported file format: ') . $this->format); } } - + $this->image = new $classname($this, $size); if (!$this->image->valid()) { $this->delete(); error($config['error']['invalidimg']); } - + $this->size = (object)array('width' => $this->image->_width(), 'height' => $this->image->_height()); if ($this->size->width < 1 || $this->size->height < 1) { $this->delete(); error($config['error']['invalidimg']); } } - + public function resize($extension, $max_width, $max_height) { global $config; @@ -62,16 +62,16 @@ class Image { error(_('Unsupported file format: ') . $extension); } } - + $thumb = new $classname(false); $thumb->src = $this->src; $thumb->format = $this->format; $thumb->original_width = $this->size->width; $thumb->original_height = $this->size->height; - + $x_ratio = $max_width / $this->size->width; $y_ratio = $max_height / $this->size->height; - + if (($this->size->width <= $max_width) && ($this->size->height <= $max_height)) { $width = $this->size->width; $height = $this->size->height; @@ -82,16 +82,16 @@ class Image { $width = ceil($y_ratio * $this->size->width); $height = $max_height; } - + $thumb->_resize($this->image->image, $width, $height); - + return $thumb; } - + public function to($dst) { $this->image->to($dst); } - + public function delete() { file_unlink($this->src); } @@ -114,26 +114,26 @@ class ImageGD { } class ImageBase extends ImageGD { - public $image, $src, $original, $original_width, $original_height, $width, $height; + public $image, $src, $original, $original_width, $original_height, $width, $height; public function valid() { return (bool)$this->image; } - + public function __construct($img, $size = false) { if (method_exists($this, 'init')) $this->init(); - + if ($size && $size[0] > 0 && $size[1] > 0) { $this->width = $size[0]; $this->height = $size[1]; } - + if ($img !== false) { $this->src = $img->src; $this->from(); } } - + public function _width() { if (method_exists($this, 'width')) return $this->width(); @@ -156,7 +156,7 @@ class ImageBase extends ImageGD { $this->original = &$original; $this->width = $width; $this->height = $height; - + if (method_exists($this, 'resize')) $this->resize(); else @@ -199,31 +199,31 @@ class ImageImagick extends ImageBase { } public function resize() { global $config; - + if ($this->format == 'gif' && ($config['thumb_ext'] == 'gif' || $config['thumb_ext'] == '')) { $this->image = new Imagick(); $this->image->setFormat('gif'); - + $keep_frames = array(); for ($i = 0; $i < $this->original->getNumberImages(); $i += floor($this->original->getNumberImages() / $config['thumb_keep_animation_frames'])) $keep_frames[] = $i; - + $i = 0; $delay = 0; foreach ($this->original as $frame) { $delay += $frame->getImageDelay(); - + if (in_array($i, $keep_frames)) { // $frame->scaleImage($this->width, $this->height, false); $frame->sampleImage($this->width, $this->height); $frame->setImagePage($this->width, $this->height, 0, 0); $frame->setImageDelay($delay); $delay = 0; - + $this->image->addImage($frame->getImage()); } $i++; - } + } } else { $this->image = clone $this->original; $this->image->scaleImage($this->width, $this->height, false); @@ -234,15 +234,15 @@ class ImageImagick extends ImageBase { class ImageConvert extends ImageBase { public $width, $height, $temp, $gm = false, $gifsicle = false; - + public function init() { global $config; - + if ($config['thumb_method'] == 'gm' || $config['thumb_method'] == 'gm+gifsicle') $this->gm = true; if ($config['thumb_method'] == 'convert+gifsicle' || $config['thumb_method'] == 'gm+gifsicle') $this->gifsicle = true; - + $this->temp = false; } public function get_size($src, $try_gd_first = true) { @@ -264,7 +264,7 @@ class ImageConvert extends ImageBase { if ($size) { $this->width = $size[0]; $this->height = $size[1]; - + $this->image = true; } else { // mark as invalid @@ -273,7 +273,7 @@ class ImageConvert extends ImageBase { } public function to($src) { global $config; - + if (!$this->temp) { if ($config['strip_exif']) { if($error = shell_exec_error(($this->gm ? 'gm ' : '') . 'convert ' . @@ -305,16 +305,16 @@ class ImageConvert extends ImageBase { } public function resize() { global $config; - + if ($this->temp) { // remove old $this->destroy(); } - + $this->temp = tempnam($config['tmp'], 'convert') . ($config['thumb_ext'] == '' ? '' : '.' . $config['thumb_ext']); - + $config['thumb_keep_animation_frames'] = (int)$config['thumb_keep_animation_frames']; - + if ($this->format == 'gif' && ($config['thumb_ext'] == 'gif' || $config['thumb_ext'] == '') && $config['thumb_keep_animation_frames'] > 1) { if ($this->gifsicle) { if (($error = shell_exec("gifsicle -w --unoptimize -O2 --resize {$this->width}x{$this->height} < " . @@ -380,7 +380,7 @@ class ImageConvert extends ImageBase { } } } - + // For when -auto-orient doesn't exist (older versions) static public function jpeg_exif_orientation($src, $exif = false) { if (!$exif) { @@ -398,16 +398,16 @@ class ImageConvert extends ImageBase { // 8888 // 88 // 88 - + return '-flop'; case 3: - + // 88 // 88 // 8888 // 88 // 888888 - + return '-flip -flop'; case 4: // 88 @@ -415,31 +415,31 @@ class ImageConvert extends ImageBase { // 8888 // 88 // 888888 - + return '-flip'; case 5: // 8888888888 // 88 88 // 88 - + return '-rotate 90 -flop'; case 6: // 88 // 88 88 // 8888888888 - + return '-rotate 90'; case 7: // 88 // 88 88 // 8888888888 - + return '-rotate "-90" -flop'; case 8: // 8888888888 // 88 88 // 88 - + return '-rotate "-90"'; } } @@ -496,8 +496,3 @@ class ImageBMP extends ImageBase { imagebmp($this->image, $src); } } - - -if (PHP_MAJOR_VERSION <= 7 && PHP_MINOR_VERSION < 2) { - include 'inc/image/bmp.php'; -} diff --git a/inc/image/bmp.php b/inc/image/bmp.php deleted file mode 100644 index 845da0de..00000000 --- a/inc/image/bmp.php +++ /dev/null @@ -1,186 +0,0 @@ -= 7.2.0 provides these functions by default. - * - * These functions were submitted by user DHKold to the PHP manual in 2005. - * http://php.net/manual/en/function.imagecreate.php#53879 - * - * As per http://php.net/manual/en/about.notes.php ("About user notes", PHP - * Manual), all PHP User Contributed Notes are "...considered part of the PHP - * manual, and are therefore covered by the same license that covers this - * documentation." - * - * Therefore, as per http://php.net/manual/en/copyright.php ("Copyright", PHP - * Manual), the code below is licensed under the terms of the Creative Commons - * Attribution 3.0 license, AKA CC-BY 3.0. - * http://creativecommons.org/licenses/by/3.0/ - */ - -/*********************************************/ -/* Function: imagecreatefrombmp */ -/* Author: DHKold */ -/* Contact: admin@dhkold.com */ -/* Date: The 15th of June 2005 */ -/* Version: 2.0B */ -/*********************************************/ -function imagecreatefrombmp($filename) { - if (! $f1 = fopen($filename,"rb")) return FALSE; - $FILE = unpack("vfile_type/Vfile_size/Vreserved/Vbitmap_offset", fread($f1,14)); - if ($FILE['file_type'] != 19778) return FALSE; - $BMP = unpack('Vheader_size/Vwidth/Vheight/vplanes/vbits_per_pixel'. - '/Vcompression/Vsize_bitmap/Vhoriz_resolution'. - '/Vvert_resolution/Vcolors_used/Vcolors_important', fread($f1,40)); - $BMP['colors'] = pow(2,$BMP['bits_per_pixel']); - if ($BMP['size_bitmap'] == 0) $BMP['size_bitmap'] = $FILE['file_size'] - $FILE['bitmap_offset']; - $BMP['bytes_per_pixel'] = $BMP['bits_per_pixel']/8; - $BMP['bytes_per_pixel2'] = ceil($BMP['bytes_per_pixel']); - $BMP['decal'] = ($BMP['width']*$BMP['bytes_per_pixel']/4); - $BMP['decal'] -= floor($BMP['width']*$BMP['bytes_per_pixel']/4); - $BMP['decal'] = 4-(4*$BMP['decal']); - if ($BMP['decal'] == 4) $BMP['decal'] = 0; - - $PALETTE = array(); - if ($BMP['colors'] < 16777216) - { - $PALETTE = unpack('V'.$BMP['colors'], fread($f1,$BMP['colors']*4)); - } - - $IMG = fread($f1,$BMP['size_bitmap']); - $VIDE = chr(0); - - $res = imagecreatetruecolor($BMP['width'],$BMP['height']); - $P = 0; - $Y = $BMP['height']-1; - while ($Y >= 0) - { - $X=0; - while ($X < $BMP['width']) - { - if ($BMP['bits_per_pixel'] == 24) - $COLOR = unpack("V",substr($IMG,$P,3).$VIDE); - elseif ($BMP['bits_per_pixel'] == 16) - { - $COLOR = unpack("n",substr($IMG,$P,2)); - $COLOR[1] = $PALETTE[$COLOR[1]+1]; - } - elseif ($BMP['bits_per_pixel'] == 8) - { - $COLOR = unpack("n",$VIDE.substr($IMG,$P,1)); - $COLOR[1] = $PALETTE[$COLOR[1]+1]; - } - elseif ($BMP['bits_per_pixel'] == 4) - { - $COLOR = unpack("n",$VIDE.substr($IMG,floor($P),1)); - if (($P*2)%2 == 0) $COLOR[1] = ($COLOR[1] >> 4) ; else $COLOR[1] = ($COLOR[1] & 0x0F); - $COLOR[1] = $PALETTE[$COLOR[1]+1]; - } - elseif ($BMP['bits_per_pixel'] == 1) - { - $COLOR = unpack("n",$VIDE.substr($IMG,floor($P),1)); - if (($P*8)%8 == 0) $COLOR[1] = $COLOR[1] >>7; - elseif (($P*8)%8 == 1) $COLOR[1] = ($COLOR[1] & 0x40)>>6; - elseif (($P*8)%8 == 2) $COLOR[1] = ($COLOR[1] & 0x20)>>5; - elseif (($P*8)%8 == 3) $COLOR[1] = ($COLOR[1] & 0x10)>>4; - elseif (($P*8)%8 == 4) $COLOR[1] = ($COLOR[1] & 0x8)>>3; - elseif (($P*8)%8 == 5) $COLOR[1] = ($COLOR[1] & 0x4)>>2; - elseif (($P*8)%8 == 6) $COLOR[1] = ($COLOR[1] & 0x2)>>1; - elseif (($P*8)%8 == 7) $COLOR[1] = ($COLOR[1] & 0x1); - $COLOR[1] = $PALETTE[$COLOR[1]+1]; - } - else - return FALSE; - imagesetpixel($res,$X,$Y,$COLOR[1]); - $X++; - $P += $BMP['bytes_per_pixel']; - } - $Y--; - $P+=$BMP['decal']; - } - fclose($f1); - - return $res; -} - -function imagebmp(&$img, $filename='') { - $widthOrig = imagesx($img); - $widthFloor = ((floor($widthOrig/16))*16); - $widthCeil = ((ceil($widthOrig/16))*16); - $height = imagesy($img); - - $size = ($widthCeil*$height*3)+54; - - // Bitmap File Header - $result = 'BM'; // header (2b) - $result .= int_to_dword($size); // size of file (4b) - $result .= int_to_dword(0); // reserved (4b) - $result .= int_to_dword(54); // byte location in the file which is first byte of IMAGE (4b) - // Bitmap Info Header - $result .= int_to_dword(40); // Size of BITMAPINFOHEADER (4b) - $result .= int_to_dword($widthCeil); // width of bitmap (4b) - $result .= int_to_dword($height); // height of bitmap (4b) - $result .= int_to_word(1); // biPlanes = 1 (2b) - $result .= int_to_word(24); // biBitCount = {1 (mono) or 4 (16 clr ) or 8 (256 clr) or 24 (16 Mil)} (2b - $result .= int_to_dword(0); // RLE COMPRESSION (4b) - $result .= int_to_dword(0); // width x height (4b) - $result .= int_to_dword(0); // biXPelsPerMeter (4b) - $result .= int_to_dword(0); // biYPelsPerMeter (4b) - $result .= int_to_dword(0); // Number of palettes used (4b) - $result .= int_to_dword(0); // Number of important colour (4b) - - // is faster than chr() - $arrChr = array(); - for ($i=0; $i<256; $i++){ - $arrChr[$i] = chr($i); - } - - // creates image data - $bgfillcolor = array('red'=>0, 'green'=>0, 'blue'=>0); - - // bottom to top - left to right - attention blue green red !!! - $y=$height-1; - for ($y2=0; $y2<$height; $y2++) { - for ($x=0; $x<$widthFloor; ) { - $rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y)); - $result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']]; - $rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y)); - $result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']]; - $rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y)); - $result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']]; - $rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y)); - $result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']]; - $rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y)); - $result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']]; - $rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y)); - $result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']]; - $rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y)); - $result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']]; - $rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y)); - $result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']]; - } - for ($x=$widthFloor; $x<$widthCeil; $x++) { - $rgb = ($x<$widthOrig) ? imagecolorsforindex($img, imagecolorat($img, $x, $y)) : $bgfillcolor; - $result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']]; - } - $y--; - } - - // see imagegif - if ($filename == '') { - echo $result; - } else { - $file = fopen($filename, 'wb'); - fwrite($file, $result); - fclose($file); - } -} - -// imagebmp helpers -function int_to_dword($n) { - return chr($n & 255).chr(($n >> 8) & 255).chr(($n >> 16) & 255).chr(($n >> 24) & 255); -} - -function int_to_word($n) { - return chr($n & 255).chr(($n >> 8) & 255); -} -?>