Subversion-Projekte lars-tiefland.ci

Revision

Revision 2049 | Revision 2242 | Zur aktuellen Revision | Ganze Datei anzeigen | Leerzeichen ignorieren | Details | Blame | Letzte Änderung | Log anzeigen | RSS feed

Revision 2049 Revision 2107
Zeile 390... Zeile 390...
390 
		if (count($props) > 0)
 390 
		if (count($props) > 0)
391 
		{
 391 
		{
392 
			$this->initialize($props);
 392 
			$this->initialize($props);
393 
		}
 393 
		}
Zeile -... Zeile 394...
- 
 
 394 
 
- 
 
 395 
		/**
- 
 
 396 
		 * A work-around for some improperly formatted, but
- 
 
 397 
		 * usable JPEGs; known to be produced by Samsung
- 
 
 398 
		 * smartphones' front-facing cameras.
- 
 
 399 
		 *
- 
 
 400 
		 * @see	https://github.com/bcit-ci/CodeIgniter/issues/4967
- 
 
 401 
		 * @see	https://bugs.php.net/bug.php?id=72404
- 
 
 402 
		 */
- 
 
 403 
		ini_set('gd.jpeg_ignore_warning', 1);
394 
 
 404 
 
395 
		log_message('info', 'Image Lib Class Initialized');
 405 
		log_message('info', 'Image Lib Class Initialized');
Zeile 396... Zeile 406...
396 
	}
 406 
	}
Zeile 960... Zeile 970...
960 
		else // Resize
 970 
		else // Resize
961 
		{
 971 
		{
962 
			$cmd_inner = 'pnmscale -xysize '.$this->width.' '.$this->height;
 972 
			$cmd_inner = 'pnmscale -xysize '.$this->width.' '.$this->height;
963 
		}
 973 
		}
Zeile 964... Zeile 974...
964 
 
 974 
 
Zeile 965... Zeile 975...
965 
		$cmd = $this->library_path.$cmd_in.' '.$this->full_src_path.' | '.$cmd_inner.' | '.$cmd_out.' > '.$this->dest_folder.'netpbm.tmp';
 975 
		$cmd = $this->library_path.$cmd_in.' '.escapeshellarg($this->full_src_path).' | '.$cmd_inner.' | '.$cmd_out.' > '.$this->dest_folder.'netpbm.tmp';
966 
 
 976 
 
967 
		$retval = 1;
 977 
		$retval = 1;
968 
		// exec() might be disabled
 978 
		// exec() might be disabled