Commit: 8a07908215556f24ebe12acfc843483d4a85420d Author: Ondřej Surý <ond...@sury.org> Thu, 25 Apr 2013 14:25:12 +0200 Committer: Remi Collet <r...@php.net> Sat, 4 May 2013 16:49:59 +0200 Parents: 6aedadce0a65ea4de3a971cb3aaee1cadade2c8d Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8a07908215556f24ebe12acfc843483d4a85420d Log: Remove overflow2, getmbi and skipheader, since they are not needed anymore. Changed paths: M ext/gd/libgd/gd_compat.c Diff: diff --git a/ext/gd/libgd/gd_compat.c b/ext/gd/libgd/gd_compat.c index f3627a1..875fbd6 100644 --- a/ext/gd/libgd/gd_compat.c +++ b/ext/gd/libgd/gd_compat.c @@ -32,51 +32,3 @@ const char * gdPngGetVersionString() return PNG_LIBPNG_VER_STRING; } #endif - -/* Not exported by libgd, copied from gdhelpers.h */ -int overflow2(int a, int b) -{ - if(a <= 0 || b <= 0) { - return 1; - } - if(a > INT_MAX / b) { - return 1; - } - return 0; -} - -/* Not exported by libgd, copied from wbmp.c */ -int -getmbi (int (*getin) (void *in), void *in) -{ - int i, mbi = 0; - - do - { - i = getin (in); - if (i < 0) - return (-1); - mbi = (mbi << 7) | (i & 0x7f); - } - while (i & 0x80); - - return (mbi); -} - -/* Not exported by libgd, copied from wbmp.c */ -int -skipheader (int (*getin) (void *in), void *in) -{ - int i; - - do - { - i = getin (in); - if (i < 0) - return (-1); - } - while (i & 0x80); - - return (0); -} - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
