aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Backport of fix for CVE-2015-0973 to libpng 1.2.HEADmasterNarayan Kamath2015-10-181-22/+56
* external: libpng: fix numerous compiler warningscarvsdriver2013-07-139-18/+23
* Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/ex...Steve Kondik2012-11-183-60/+15
|\
| * Switch back to LOCAL_CLANG with -std=gnu89.Stephen Hines2012-08-031-2/+2
| * Fix build: Should use prebuilt version of clang instead of platform one.Shih-wei Liao2012-08-031-1/+1
| * Merge "Add signed integer overflow checking to libpng."Geremy Condra2012-06-122-36/+15
| |\
| | * Add signed integer overflow checking to libpng.Geremy Condra2012-06-122-36/+15
| * | This change appears to break skia, but I'm not convinced that its because ski...Geremy Condra2012-06-061-2/+4
| * | Add signed integer overflow checking to libpng.Geremy Condra2012-06-051-4/+2
| |/
| * Remove obsolete ThirdPartyProject.prop file.Elliott Hughes2012-05-151-10/+0
* | VeNum optimizations to libpng to improve PNG decode timeDinesh K Garg2012-07-105-10/+1220
|/
* Merge "Revise png_set_text_2() to avoid potential memory corruption (fixes CV...Geremy Condra2012-04-231-4/+14
|\
| * Revise png_set_text_2() to avoid potential memory corruption (fixes CVE-2011-...Terry Heo (Woncheol)2012-04-201-4/+14
* | am e2146085: (-s ours) am b4e0b528: (-s ours) Merge "DO NOT MERGE Fix for CVE...Geremy Condra2012-04-120-0/+0
|\ \
| * \ am b4e0b528: (-s ours) Merge "DO NOT MERGE Fix for CVE-2011-3045" into ics-mr1Geremy Condra2012-04-120-0/+0
| |\ \
| | * \ Merge "DO NOT MERGE Fix for CVE-2011-3045" into ics-mr1Geremy Condra2012-04-121-2/+2
| | |\ \
| | | * | DO NOT MERGE Fix for CVE-2011-3045Geremy Condra2012-04-111-2/+2
* | | | | Merge "Fix for CVE-2011-3045"Geremy Condra2012-04-101-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix for CVE-2011-3045Geremy Condra2012-03-291-2/+2
* | | | | am 004865ac: (-s ours) am 07fde26d: DO NOT MERGE Fix for CVE-2011-3026Dave Burke2012-04-040-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 07fde26d: DO NOT MERGE Fix for CVE-2011-3026Dave Burke2012-04-041-2/+8
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | DO NOT MERGE Fix for CVE-2011-3026Dave Burke2012-03-151-2/+8
| | | |/ | | |/|
* | | | Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood2012-04-030-0/+0
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl2011-10-280-0/+0
| |\ \ | | |/ | |/|
| | * undo reset to ics-mr1 until we have a better methodEd Heyl2011-10-260-0/+0
| | |\
| | | * reset to ics-mr1, but keep historyEd Heyl2011-10-260-0/+0
| | | |\ | | |/ / | |/| / | | |/
| | * am 17b24482: Reconcile with gingerbread-release gingerbread-mr4-releaseThe Android Open Source Project2011-08-040-0/+0
| | |\ | | |/ | |/|
| | * am bf601c7c: (-s ours) am 358907eb: (-s ours) am 3c3a7e1f: (-s ours) am 791d8...Eric Vannier2011-07-290-0/+0
| | |\
| | * \ am 84d92c71: (-s ours) am 615c9ab0: (-s ours) Upgrading libpng to 1.2.46 to f...Eric Vannier2011-07-260-0/+0
| | |\ \
* | | | | Fix for CVE-2011-3026Dave Burke2012-03-061-2/+8
|/ / / /
| | | |
| \ \ \
*-. \ \ \ Reconcile with gingerbread-release gingerbread-mr4-releaseThe Android Open Source Project2011-08-040-0/+0
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Upgrading libpng to 1.2.46 to fix a few vulnerabilities. DO NOT MERGEEric Vannier2011-08-0259-166/+3486
* | | | am 358907eb: (-s ours) am 3c3a7e1f: (-s ours) am 791d8f2e: Upgrading libpng t...Eric Vannier2011-07-290-0/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | am 3c3a7e1f: (-s ours) am 791d8f2e: Upgrading libpng to 1.2.46 to fix a few v...Eric Vannier2011-07-290-0/+0
| |\ \ \
| | * \ \ am 791d8f2e: Upgrading libpng to 1.2.46 to fix a few vulnerabilities. DO NOT ...Eric Vannier2011-07-2959-166/+3486
| | |\ \ \
| | | * | | Upgrading libpng to 1.2.46 to fix a few vulnerabilities. DO NOT MERGEEric Vannier2011-07-2159-166/+3486
| | | |/ /
* | | | | am 615c9ab0: (-s ours) Upgrading libpng to 1.2.46 to fix a few vulnerabilitie...Eric Vannier2011-07-260-0/+0
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Upgrading libpng to 1.2.46 to fix a few vulnerabilities. DO NOT MERGEEric Vannier2011-07-2559-166/+3486
* | | | Upgrading libpng to 1.2.46 to fix a few vulnerabilities.Eric Vannier2011-07-2159-166/+3486
|/ / /
* | | Fix infinite loop in decoding a broken PNG.Wei-Ta Chen2011-03-161-4/+9
|/ /
* | Merge "Fix libpng build under cygwin"Raphael Moll2011-02-111-4/+12
|\ \
| * | Fix libpng build under cygwinRaphael Moll2011-02-091-4/+12
|/ /
* | am 1e0a1b89: Merge "libpng: use GCC visibility to reduce shared library size"David Turner2010-12-072-2/+7
|\ \ | |/ |/|
| * Merge "libpng: use GCC visibility to reduce shared library size"David Turner2010-12-072-2/+7
| |\
| | * libpng: use GCC visibility to reduce shared library sizeJim Huang2010-08-082-2/+7
| |/
* | Add the feature of tile-based decoding to PNG.Joseph Wen2010-09-095-5/+338
* | add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+10
|/
* Upgrade libpng to 1.2.44 for security fixes.Patrick Scott2010-06-28113-3104/+23714
* Add an empty CleanSpec.mkJean-Baptiste Queru2010-03-081-0/+49
* reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
|\