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

Diff for /embedaddon/php/ext/standard/image.c between versions 1.1.1.4 and 1.1.1.5

version 1.1.1.4, 2013/10/14 08:02:34 version 1.1.1.5, 2014/06/15 20:03:57
Line 2 Line 2
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | PHP Version 5                                                        |     | PHP Version 5                                                        |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
   | Copyright (c) 1997-2013 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 30 Line 30
 #include <unistd.h>  #include <unistd.h>
 #endif  #endif
 #include "php_image.h"  #include "php_image.h"
   #ifdef PHP_WIN32
   #include "win32/php_stdint.h"
   #endif
   
 #if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)  #if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
 #include "zlib.h"  #include "zlib.h"
Line 163  static struct gfxinfo *php_handle_bmp (php_stream * st Line 166  static struct gfxinfo *php_handle_bmp (php_stream * st
                 result = (struct gfxinfo *) ecalloc (1, sizeof(struct gfxinfo));                  result = (struct gfxinfo *) ecalloc (1, sizeof(struct gfxinfo));
                 result->width    =  (((unsigned int)dim[ 7]) << 24) + (((unsigned int)dim[ 6]) << 16) + (((unsigned int)dim[ 5]) << 8) + ((unsigned int) dim[ 4]);                  result->width    =  (((unsigned int)dim[ 7]) << 24) + (((unsigned int)dim[ 6]) << 16) + (((unsigned int)dim[ 5]) << 8) + ((unsigned int) dim[ 4]);
                 result->height   =  (((unsigned int)dim[11]) << 24) + (((unsigned int)dim[10]) << 16) + (((unsigned int)dim[ 9]) << 8) + ((unsigned int) dim[ 8]);                  result->height   =  (((unsigned int)dim[11]) << 24) + (((unsigned int)dim[10]) << 16) + (((unsigned int)dim[ 9]) << 8) + ((unsigned int) dim[ 8]);
                   result->height   =  abs((int32_t)result->height);
                 result->bits     =  (((unsigned int)dim[15]) <<  8) +  ((unsigned int)dim[14]);                  result->bits     =  (((unsigned int)dim[15]) <<  8) +  ((unsigned int)dim[14]);
         } else {          } else {
                 return NULL;                  return NULL;
Removed from v.1.1.1.4  
changed lines
  Added in v.1.1.1.5

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