cvs: pear /Image_Transform Transform.php
[email protected] ("Christian Weiske")
| Newsgroups | php.pear.cvs |
|---|---|
| Message-ID | <cvscweiske1209461196@cvsserver> |
cweiske Tue Apr 29 09:26:36 2008 UTC
Modified files:
/pear/Image_Transform Transform.php
Log:
Revert switch() indendation changes
http://cvs.php.net/viewvc.cgi/pear/Image_Transform/Transform.php?r1=1.54&r2=1.55&diff_format=u
Index: pear/Image_Transform/Transform.php
diff -u pear/Image_Transform/Transform.php:1.54 pear/Image_Transform/Transform.php:1.55
--- pear/Image_Transform/Transform.php:1.54 Mon Apr 28 22:52:57 2008
+++ pear/Image_Transform/Transform.php Tue Apr 29 09:26:36 2008
@@ -22,7 +22,7 @@
* @author Philippe Jausions <[email protected]>
* @copyright 2002-2007 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version CVS: $Id: Transform.php,v 1.54 2008/04/28 22:52:57 cweiske Exp $
+ * @version CVS: $Id: Transform.php,v 1.55 2008/04/29 09:26:36 cweiske Exp $
* @link http://pear.php.net/package/Image_Transform
*/
@@ -220,15 +220,15 @@
}
} else {
switch (strtolower($driver)) {
- case 'gd':
- $driver = 'GD';
- break;
- case 'imagick':
- $driver = 'Imagick2';
- break;
- case 'imlib':
- $driver = 'Imlib';
- break;
+ case 'gd':
+ $driver = 'GD';
+ break;
+ case 'imagick':
+ $driver = 'Imagick2';
+ break;
+ case 'imlib':
+ $driver = 'Imlib';
+ break;
}
}
@@ -580,55 +580,55 @@
}
switch ($data[2]) {
- case IMAGETYPE_GIF:
- $type = 'gif';
- break;
- case IMAGETYPE_JPEG:
- $type = 'jpeg';
- break;
- case IMAGETYPE_PNG:
- $type = 'png';
- break;
- case IMAGETYPE_SWF:
- $type = 'swf';
- break;
- case IMAGETYPE_PSD:
- $type = 'psd';
- break;
- case IMAGETYPE_BMP:
- $type = 'bmp';
- break;
- case IMAGETYPE_TIFF_II:
- case IMAGETYPE_TIFF_MM:
- $type = 'tiff';
- break;
- case IMAGETYPE_JPC:
- $type = 'jpc';
- break;
- case IMAGETYPE_JP2:
- $type = 'jp2';
- break;
- case IMAGETYPE_JPX:
- $type = 'jpx';
- break;
- case IMAGETYPE_JB2:
- $type = 'jb2';
- break;
- case IMAGETYPE_SWC:
- $type = 'swc';
- break;
- case IMAGETYPE_IFF:
- $type = 'iff';
- break;
- case IMAGETYPE_WBMP:
- $type = 'wbmp';
- break;
- case IMAGETYPE_XBM:
- $type = 'xbm';
- break;
- default:
- return PEAR::raiseError("Cannot recognize image format",
- IMAGE_TRANSFORM_ERROR_UNSUPPORTED);
+ case IMAGETYPE_GIF:
+ $type = 'gif';
+ break;
+ case IMAGETYPE_JPEG:
+ $type = 'jpeg';
+ break;
+ case IMAGETYPE_PNG:
+ $type = 'png';
+ break;
+ case IMAGETYPE_SWF:
+ $type = 'swf';
+ break;
+ case IMAGETYPE_PSD:
+ $type = 'psd';
+ break;
+ case IMAGETYPE_BMP:
+ $type = 'bmp';
+ break;
+ case IMAGETYPE_TIFF_II:
+ case IMAGETYPE_TIFF_MM:
+ $type = 'tiff';
+ break;
+ case IMAGETYPE_JPC:
+ $type = 'jpc';
+ break;
+ case IMAGETYPE_JP2:
+ $type = 'jp2';
+ break;
+ case IMAGETYPE_JPX:
+ $type = 'jpx';
+ break;
+ case IMAGETYPE_JB2:
+ $type = 'jb2';
+ break;
+ case IMAGETYPE_SWC:
+ $type = 'swc';
+ break;
+ case IMAGETYPE_IFF:
+ $type = 'iff';
+ break;
+ case IMAGETYPE_WBMP:
+ $type = 'wbmp';
+ break;
+ case IMAGETYPE_XBM:
+ $type = 'xbm';
+ break;
+ default:
+ return PEAR::raiseError("Cannot recognize image format",
+ IMAGE_TRANSFORM_ERROR_UNSUPPORTED);
}
$this->img_x = $this->new_x = $data[0];
$this->img_y = $this->new_y = $data[1];
@@ -649,40 +649,40 @@
function _convert_image_type($type)
{
switch (strtolower($type)) {
- case 'gif':
- return IMAGETYPE_GIF;
- case 'jpeg':
- case 'jpg':
- return IMAGETYPE_JPEG;
- case 'png':
- return IMAGETYPE_PNG;
- case 'swf':
- return IMAGETYPE_SWF;
- case 'psd':
- return IMAGETYPE_PSD;
- case 'bmp':
- return IMAGETYPE_BMP;
- case 'tiff':
- return IMAGETYPE_TIFF_II;
- //IMAGETYPE_TIFF_MM;
- case 'jpc':
- return IMAGETYPE_JPC;
- case 'jp2':
- return IMAGETYPE_JP2;
- case 'jpx':
- return IMAGETYPE_JPX;
- case 'jb2':
- return IMAGETYPE_JB2;
- case 'swc':
- return IMAGETYPE_SWC;
- case 'iff':
- return IMAGETYPE_IFF;
- case 'wbmp':
- return IMAGETYPE_WBMP;
- case 'xbm':
- return IMAGETYPE_XBM;
- default:
- return $type;
+ case 'gif':
+ return IMAGETYPE_GIF;
+ case 'jpeg':
+ case 'jpg':
+ return IMAGETYPE_JPEG;
+ case 'png':
+ return IMAGETYPE_PNG;
+ case 'swf':
+ return IMAGETYPE_SWF;
+ case 'psd':
+ return IMAGETYPE_PSD;
+ case 'bmp':
+ return IMAGETYPE_BMP;
+ case 'tiff':
+ return IMAGETYPE_TIFF_II;
+ //IMAGETYPE_TIFF_MM;
+ case 'jpc':
+ return IMAGETYPE_JPC;
+ case 'jp2':
+ return IMAGETYPE_JP2;
+ case 'jpx':
+ return IMAGETYPE_JPX;
+ case 'jb2':
+ return IMAGETYPE_JB2;
+ case 'swc':
+ return IMAGETYPE_SWC;
+ case 'iff':
+ return IMAGETYPE_IFF;
+ case 'wbmp':
+ return IMAGETYPE_WBMP;
+ case 'xbm':
+ return IMAGETYPE_XBM;
+ default:
+ return $type;
}
return (isset($types[$t = strtolower($type)])) ? $types[$t] : $type;
@@ -923,12 +923,12 @@
function getWebSafeFormat()
{
switch ($this->type){
- case 'gif':
- case 'png':
- return 'png';
- break;
- default:
- return 'jpeg';
+ case 'gif':
+ case 'png':
+ return 'png';
+ break;
+ default:
+ return 'jpeg';
} // switch
}