[BACK]Return to gd.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / ext / gd

Diff for /embedaddon/php/ext/gd/gd.c between versions 1.1.1.2 and 1.1.1.5

version 1.1.1.2, 2012/05/29 12:34:39 version 1.1.1.5, 2014/06/15 20:03:48
Line 2 Line 2
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | PHP Version 5                                                        |     | PHP Version 5                                                        |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
   | Copyright (c) 1997-2012 The PHP Group                                |   | Copyright (c) 1997-2014 The PHP Group                                |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |     | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |     | that is bundled with this package in the file LICENSE, and is        |
Line 129  int gdImageColorClosestHWB(gdImagePtr im, int r, int g Line 129  int gdImageColorClosestHWB(gdImagePtr im, int r, int g
 /* IMPORTANT NOTE FOR NEW FILTER  /* IMPORTANT NOTE FOR NEW FILTER
  * Do not forget to update:   * Do not forget to update:
  * IMAGE_FILTER_MAX: define the last filter index   * IMAGE_FILTER_MAX: define the last filter index
 * IMAGE_FILTER_MAX_ARGS: define the biggest amout of arguments * IMAGE_FILTER_MAX_ARGS: define the biggest amount of arguments
  * image_filter array in PHP_FUNCTION(imagefilter)   * image_filter array in PHP_FUNCTION(imagefilter)
  * */   * */
 #define IMAGE_FILTER_NEGATE         0  #define IMAGE_FILTER_NEGATE         0
Line 1261  PHP_RSHUTDOWN_FUNCTION(gd) Line 1261  PHP_RSHUTDOWN_FUNCTION(gd)
 /* }}} */  /* }}} */
   
 #if HAVE_GD_BUNDLED  #if HAVE_GD_BUNDLED
#define PHP_GD_VERSION_STRING "bundled (2.0.34 compatible)"#define PHP_GD_VERSION_STRING "bundled (2.1.0 compatible)"
 #else  #else
#define PHP_GD_VERSION_STRING "2.0"# ifdef GD_VERSION_STRING
 #  define PHP_GD_VERSION_STRING GD_VERSION_STRING
 # else
 #  define PHP_GD_VERSION_STRING "2.0"
 # endif
 #endif  #endif
   
 /* {{{ PHP_MINFO_FUNCTION  /* {{{ PHP_MINFO_FUNCTION
Line 1328  PHP_MINFO_FUNCTION(gd) Line 1332  PHP_MINFO_FUNCTION(gd)
 #endif  #endif
 #if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED)  #if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED)
         php_info_print_table_row(2, "XPM Support", "enabled");          php_info_print_table_row(2, "XPM Support", "enabled");
           {
                   char tmp[12];
                   snprintf(tmp, sizeof(tmp), "%d", XpmLibraryVersion());
                   php_info_print_table_row(2, "libXpm Version", tmp);
           }
 #endif  #endif
 #ifdef HAVE_GD_XBM  #ifdef HAVE_GD_XBM
         php_info_print_table_row(2, "XBM Support", "enabled");          php_info_print_table_row(2, "XBM Support", "enabled");
Line 2821  static void _php_image_output(INTERNAL_FUNCTION_PARAME Line 2830  static void _php_image_output(INTERNAL_FUNCTION_PARAME
 #if HAVE_GD_BUNDLED  #if HAVE_GD_BUNDLED
 PHP_FUNCTION(imagexbm)  PHP_FUNCTION(imagexbm)
 {  {
        _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_XBM, "GIF", gdImageXbmCtx);        _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_XBM, "XBM", gdImageXbmCtx);
 }  }
 #endif  #endif
 /* }}} */  /* }}} */
Line 2841  PHP_FUNCTION(imagegif) Line 2850  PHP_FUNCTION(imagegif)
    Output PNG image to browser or file */     Output PNG image to browser or file */
 PHP_FUNCTION(imagepng)  PHP_FUNCTION(imagepng)
 {  {
        _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_PNG, "GIF", gdImagePngCtxEx);        _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_PNG, "PNG", gdImagePngCtxEx);
 }  }
 /* }}} */  /* }}} */
 #endif /* HAVE_GD_PNG */  #endif /* HAVE_GD_PNG */
Line 2852  PHP_FUNCTION(imagepng) Line 2861  PHP_FUNCTION(imagepng)
    Output PNG image to browser or file */     Output PNG image to browser or file */
 PHP_FUNCTION(imagewebp)  PHP_FUNCTION(imagewebp)
 {  {
        _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WEBP, "GIF", gdImageWebpCtx);        _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WEBP, "WEBP", gdImageWebpCtx);
 }  }
 /* }}} */  /* }}} */
 #endif /* HAVE_GD_WEBP */  #endif /* HAVE_GD_WEBP */
Line 2863  PHP_FUNCTION(imagewebp) Line 2872  PHP_FUNCTION(imagewebp)
    Output JPEG image to browser or file */     Output JPEG image to browser or file */
 PHP_FUNCTION(imagejpeg)  PHP_FUNCTION(imagejpeg)
 {  {
        _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_JPG, "GIF", gdImageJpegCtx);        _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_JPG, "JPEG", gdImageJpegCtx);
 }  }
 /* }}} */  /* }}} */
 #endif /* HAVE_GD_JPG */  #endif /* HAVE_GD_JPG */
Line 2873  PHP_FUNCTION(imagejpeg) Line 2882  PHP_FUNCTION(imagejpeg)
    Output WBMP image to browser or file */     Output WBMP image to browser or file */
 PHP_FUNCTION(imagewbmp)  PHP_FUNCTION(imagewbmp)
 {  {
        _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WBM, "GIF", gdImageWBMPCtx);        _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WBM, "WBMP", gdImageWBMPCtx);
 }  }
 /* }}} */  /* }}} */
 #endif /* HAVE_GD_WBMP */  #endif /* HAVE_GD_WBMP */
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.5

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>