bjori Sun Jun 25 21:06:39 2006 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/image image_type_to_extension.phpt
Modified files:
/php-src/ext/standard basic_functions.c image.c
Log:
MFH: image_type_to_mime_type()
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.5&r2=1.725.2.31.2.6&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.5
php-src/ext/standard/basic_functions.c:1.725.2.31.2.6
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.5 Tue May 30
14:51:20 2006
+++ php-src/ext/standard/basic_functions.c Sun Jun 25 21:06:39 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.5 2006/05/30 14:51:20 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.6 2006/06/25 21:06:39 bjori Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -196,6 +196,7 @@
PHP_FE(iptcembed,
NULL)
PHP_FE(getimagesize, second_arg_force_ref)
PHP_FE(image_type_to_mime_type,
NULL)
+ PHP_FE(image_type_to_extension,
NULL)
PHP_FE(phpinfo,
NULL)
PHP_FE(phpversion,
NULL)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/image.c?r1=1.114.2.2&r2=1.114.2.2.2.1&diff_format=u
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.114.2.2
php-src/ext/standard/image.c:1.114.2.2.2.1
--- php-src/ext/standard/image.c:1.114.2.2 Sun Jan 1 12:50:14 2006
+++ php-src/ext/standard/image.c Sun Jun 25 21:06:39 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: image.c,v 1.114.2.2 2006/01/01 12:50:14 sniper Exp $ */
+/* $Id: image.c,v 1.114.2.2.2.1 2006/06/25 21:06:39 bjori Exp $ */
#include "php.h"
#include <stdio.h>
@@ -1165,6 +1165,10 @@
RETURN_STRING(".jpc" + !inc_dot, 1);
case IMAGE_FILETYPE_JP2:
RETURN_STRING(".jp2" + !inc_dot, 1);
+ case IMAGE_FILETYPE_JPX:
+ RETURN_STRING(".jpx" + !inc_dot, 1);
+ case IMAGE_FILETYPE_JB2:
+ RETURN_STRING(".jb2" + !inc_dot, 1);
case IMAGE_FILETYPE_XBM:
RETURN_STRING(".xbm" + !inc_dot, 1);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/image/image_type_to_extension.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/image/image_type_to_extension.phpt
+++ php-src/ext/standard/tests/image/image_type_to_extension.phpt
--TEST--
image_type_to_extension()
--SKIPIF--
<?php
if (!function_exists('image_type_to_extension')) die('skip
image_type_to_extension() not available');
require_once('skipif_imagetype.inc');
?>
--FILE--
<?php
$constants = array(
"IMAGETYPE_GIF" => IMAGETYPE_GIF,
"IMAGETYPE_JPEG" => IMAGETYPE_JPEG,
"IMAGETYPE_PNG" => IMAGETYPE_PNG,
"IMAGETYPE_SWF" => IMAGETYPE_SWF,
"IMAGETYPE_PSD" => IMAGETYPE_PSD,
"IMAGETYPE_BMP" => IMAGETYPE_BMP,
"IMAGETYPE_TIFF_II" => IMAGETYPE_TIFF_II,
"IMAGETYPE_TIFF_MM" => IMAGETYPE_TIFF_MM,
"IMAGETYPE_JPC" => IMAGETYPE_JPC,
"IMAGETYPE_JP2" => IMAGETYPE_JP2,
"IMAGETYPE_JPX" => IMAGETYPE_JPX,
"IMAGETYPE_JB2" => IMAGETYPE_JB2,
"IMAGETYPE_IFF" => IMAGETYPE_IFF,
"IMAGETYPE_WBMP" => IMAGETYPE_WBMP,
"IMAGETYPE_JPEG2000" => IMAGETYPE_JPEG2000,
"IMAGETYPE_XBM" => IMAGETYPE_XBM
);
foreach($constants as $name => $constant) {
printf("Constant: %s\n\tWith dot: %s\n\tWithout dot: %s\n", $name,
image_type_to_extension($constant), image_type_to_extension($constant, false));
}
?>
--EXPECT--
Constant: IMAGETYPE_GIF
With dot: .gif
Without dot: gif
Constant: IMAGETYPE_JPEG
With dot: .jpeg
Without dot: jpeg
Constant: IMAGETYPE_PNG
With dot: .png
Without dot: png
Constant: IMAGETYPE_SWF
With dot: .swf
Without dot: swf
Constant: IMAGETYPE_PSD
With dot: .psd
Without dot: psd
Constant: IMAGETYPE_BMP
With dot: .bmp
Without dot: bmp
Constant: IMAGETYPE_TIFF_II
With dot: .tiff
Without dot: tiff
Constant: IMAGETYPE_TIFF_MM
With dot: .tiff
Without dot: tiff
Constant: IMAGETYPE_JPC
With dot: .jpc
Without dot: jpc
Constant: IMAGETYPE_JP2
With dot: .jp2
Without dot: jp2
Constant: IMAGETYPE_JPX
With dot: .jpx
Without dot: jpx
Constant: IMAGETYPE_JB2
With dot: .jb2
Without dot: jb2
Constant: IMAGETYPE_IFF
With dot: .iff
Without dot: iff
Constant: IMAGETYPE_WBMP
With dot: .bmp
Without dot: bmp
Constant: IMAGETYPE_JPEG2000
With dot: .jpc
Without dot: jpc
Constant: IMAGETYPE_XBM
With dot: .xbm
Without dot: xbm
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
