summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updated freetype to 2.4.8Geremy Condra2011-12-1610-37/+231
| | | | | | | This change is to fix a vulnerability in 2.4.7 (CVE-2011-3439). It is taken from http://b/issue?id=5700584. Change-Id: I25a87999bc3ab44d7c7f59e7f04f56895d86bb5d
* Merge "DO NOT MERGE Update FreeType library to 2.4.7"Geremy Condra2011-11-1732-3209/+8496
|\
| * DO NOT MERGE Update FreeType library to 2.4.7Olivier Bailly2011-11-1132-3209/+8496
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copied common files from upstream repository only. changes to ftoption.h which were intentionally NOT taken: /* contain no glyph data, but supply it via a callback function. */ /* This is required by clients supporting document formats which */ /* supply font data incrementally as the document is parsed, such */ /* as the Ghostscript interpreter for the PostScript language. */ /* */ -/* #define FT_CONFIG_OPTION_INCREMENTAL */ +#define FT_CONFIG_OPTION_INCREMENTAL /*************************************************************************/ /* */ /* The size in bytes of the render pool used by the scan-line converter */ @@ -553,11 +553,11 @@ FT_BEGIN_HEADER /* TrueType glyphs without hinting. */ /* */ /* Do not #undef this macro here, since the build system might */ /* define it for certain configurations only. */ /* */ -/* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */ +#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER /*************************************************************************/ /* */ /* If you define TT_CONFIG_OPTION_UNPATENTED_HINTING, a special version */ @@ -603,11 +603,11 @@ FT_BEGIN_HEADER /* */ /* error = FT_Open_Face( library, &open_args, index, &face ); */ /* ... */ /* } */ /* */ -#define TT_CONFIG_OPTION_UNPATENTED_HINTING +/* #define TT_CONFIG_OPTION_UNPATENTED_HINTING */ /*************************************************************************/ /* */ /* Define TT_CONFIG_OPTION_INTERPRETER_SWITCH to compile the TrueType */ Manual changes to ftmodule.h: +/* + * New modules in 2.4.7: +FT_USE_MODULE( FT_Driver_ClassRec, t1_driver_class ) +FT_USE_MODULE( FT_Driver_ClassRec, t1cid_driver_class ) +FT_USE_MODULE( FT_Driver_ClassRec, pfr_driver_class ) +FT_USE_MODULE( FT_Driver_ClassRec, t42_driver_class ) +FT_USE_MODULE( FT_Driver_ClassRec, winfnt_driver_class ) +FT_USE_MODULE( FT_Driver_ClassRec, pcf_driver_class ) +FT_USE_MODULE( FT_Module_Class, psaux_module_class ) +FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class ) + */ + These lines were added for 2.4.7 but we decided to stick with our current use. Change-Id: Ic1b52909580c78ead44cf4f882be06f2837539db
* | am 15321e16: Add additional implementation files needed by Skia.Derek Sollenberger2011-11-100-0/+0
|\ \ | |/ |/| | | | | * commit '15321e16a085b9b5c85cf029aee86bf57b2e65c1': Add additional implementation files needed by Skia.
| * Add additional implementation files needed by Skia.Derek Sollenberger2011-11-103-0/+158
| | | | | | | | | | | | | | | | This adds the files that are need by Skia's SkFontHost::GetAdvancedTypefaceMetrics. bug: 5445861 Change-Id: Id0cc770476fcdf852557e8e4c4451f92e4a291d6
* | Add additional implementation files needed by Skia.Derek Sollenberger2011-11-083-0/+158
|/ | | | | | | | This adds the files that are need by Skia's SkFontHost::GetAdvancedTypefaceMetrics. bug: 5445861 Change-Id: Id0cc770476fcdf852557e8e4c4451f92e4a291d6
* Update to FreeType 2.4.6+David 'Digit' Turner2011-08-1772-1284/+3565
| | | | | | | | | | | | | | | This patch updates our copy of the FreeType sources to 2.4.6+. More precisely, it contains source code corresponding to the state of the upstream repository at the following hash submitted on August 16 2001: c3fb981e2ac79acad09d5673352646696472f55e This corresponds to 2.4.6 with 7 more patches applied on top of it to fix bugs in the TrueType interpreter and the CFF parser. Change-Id: I9f3ac736d616020c8d10fd1d4e4be466f35fb6e7
* Remove the simulator target from all makefiles.Jeff Brown2011-07-111-9/+0
| | | | | | Bug: 5010576 Change-Id: Iaf6f536effbc97be15f540b7582eb7e211c43a70
* am 6b1b3194: am 0c30ba13: Merge "improve compatibility"Jean-Baptiste Queru2011-05-110-0/+0
|\ | | | | | | | | * commit '6b1b3194b7bab8803a68436620beab7a8c1100fa': improve compatibility
| * am 0c30ba13: Merge "improve compatibility"Jean-Baptiste Queru2011-05-111-0/+1
| |\ | | | | | | | | | | | | * commit '0c30ba1342318e73197db7dd52dcca4b6d4bf06d': improve compatibility
| | * Merge "improve compatibility"Jean-Baptiste Queru2011-05-111-0/+1
| | |\
| | | * improve compatibilityJean-Baptiste Queru2011-05-111-0/+1
| | |/ | | | | | | | | | Change-Id: Id062746a79f20bce45f6d9176a74d7cb3979430a
* | / Fix linking issues in external/skia because of missing implementation.Derek Sollenberger2011-03-171-0/+1
|/ / | | | | | | | | | | | | | | | | The skia library uses FT_Library_SetLcdFilter(...), to see if LCD text is supported on the platform. Android currently does not implement LCD text, but we should not fail to link. Rather we should return the appropriate error code. Change-Id: Ib04bee1be2f3a66c7babea28442884492ddc1c83
* | Upgrade to upstream 2.4.4David 'Digit' Turner2011-01-2622-316/+660
| | | | | | | | | | | | This is necessary to fix several security issues. See b/3344697 Change-Id: Ica5c6387fbd791008199f7994ed03978ed700a69
* | am aacb8e13: upgrade freetype to 2.4.2.Nick Kralevich2010-09-1674-858/+1641
|\| | | | | | | | | | | | | Merge commit 'aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c' * commit 'aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c': upgrade freetype to 2.4.2.
| * upgrade freetype to 2.4.2.Nick Kralevich2010-09-1574-858/+1641
| | | | | | | | | | | | Bug: 2969145 Change-Id: I8debbbe0bd478d9cf8c39cff5179981b5f3b371a
* | am d4476115: am ff8c8b2d: Apply stack overflow patch from ↵Chris Palmer2010-08-090-0/+0
|\| | | | | | | | | | | | | | | | | http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=11d65e8a1f1f14e56148fd991965424d9bd1cdbc Merge commit 'd4476115dee94297c020b3a2b067188117424e25' * commit 'd4476115dee94297c020b3a2b067188117424e25': Apply stack overflow patch from
| * am ff8c8b2d: Apply stack overflow patch from ↵Chris Palmer2010-08-091-1/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=11d65e8a1f1f14e56148fd991965424d9bd1cdbc Merge commit 'ff8c8b2dfd829fd7b352355cbaf0052a998cc09d' into gingerbread * commit 'ff8c8b2dfd829fd7b352355cbaf0052a998cc09d': Apply stack overflow patch from
| | * Apply stack overflow patch fromChris Palmer2010-08-091-1/+4
| | | | | | | | | | | | | | | | | | http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=11d65e8a1f1f14e56148fd991965424d9bd1cdbc Change-Id: I2df2f52928358225d53b22bcf258f36812d2515d
* | | Apply patch to fix bug used in iPhone jailbreak.Chris Palmer2010-08-091-1/+4
|/ / | | | | | | | | | | | | | | | | See for more info: Change-Id: Ia9b2e707da92fe2dc613a616e497da933f75434f http://www.vupen.com/english/advisories/2010/2018 http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=11d65e8a1f1f14e56148fd991965424d9bd1cdbc http://b/editIssue?id=2902971&query=
* / add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+10
|/ | | | Change-Id: Ie08421661d71638dd453dced31acd586a1f4e6b8
* Add an empty CleanSpec.mkJean-Baptiste Queru2010-03-081-0/+49
| | | | Change-Id: I21935dec55ca504178b548bb9e93ec34639bab25
* Update to FreeType 2.3.12David 'Digit' Turner2010-03-03159-1811/+6467
|
* am 7b1211d2: am 07007660: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
|\ | | | | | | | | | | | | Merge commit '7b1211d28fc02f0fd24a9febeaae1e58da764f31' * commit '7b1211d28fc02f0fd24a9febeaae1e58da764f31': android-2.1_r1 snapshot
| * am 07007660: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| |\ | | | | | | | | | | | | | | | | | | Merge commit '070076603b2f7e260e2f198695432dbd9bcce5d9' into eclair-plus-aosp * commit '070076603b2f7e260e2f198695432dbd9bcce5d9': android-2.1_r1 snapshot
| | * reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| | |\
| | | * reconcile android-2.1_r1 snapshotThe Android Open Source Project2010-01-290-0/+0
| | |/|
| | | * android-2.1_r1 snapshotThe Android Open Source Project2010-01-120-0/+0
| | | |
* | | | merge from open-source masterJean-Baptiste Queru2009-11-150-0/+0
|\| | | | |/ / |/| |
| * | merge from open-source masterJean-Baptiste Queru2009-11-150-0/+0
|/| | | | | | | | | | | Merge commit 'goog/stage-korg-master' into HEAD
| * | merge from eclairJean-Baptiste Queru2009-11-153-12/+14
| |\|
| | * eclair snapshotJean-Baptiste Queru2009-11-123-12/+14
| | |
* | | freetype: remove outdated VERSION.TXT.Chia-chi Yeh2009-09-021-2/+0
| | |
* | | reconcile korg/master into goog/masterJean-Baptiste Queru2009-07-260-0/+0
|\| |
| * | Merge korg/donut into korg/masterJean-Baptiste Queru2009-07-25110-2569/+4137
| |\|
* | | resolved conflicts for merge 77f63d to masterDavid 'Digit' Turner2009-06-0920-105/+343
|\ \ \ | | |/ | |/|
| * | Integrate FreeType 2.3.9 into the donut tree.David 'Digit' Turner2009-06-08110-2566/+4136
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is done to get fixes for a few security-related issues. NOTE: the auto-hinter hasn't been changed to avoid modifying the rendering of characters. The 2.3.9 code contains minor fixes (not security-related) that could in theory do that (though extensive testing is needed to evaluate its real impact on Android).
* | | am d048699: Remove a reference to TARGET_BUILD_TYPEDave Bort2009-04-291-3/+1
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'd04869994887b14ee43c9f8a9a8597193b5a7107' * commit 'd04869994887b14ee43c9f8a9a8597193b5a7107': Remove a reference to TARGET_BUILD_TYPE
| * | Remove a reference to TARGET_BUILD_TYPEDave Bort2009-04-231-3/+1
| | | | | | | | | | | | | | | | | | | | | We're soon going to stop using TARGET_BUILD_TYPE==debug to debug native modules. Signed-off-by: Dave Bort <dbort@android.com>
* | | Merge donut into masterJean-Baptiste Queru2009-04-220-0/+0
|\| |
* | | Merge branch 'open_source_no_contributions' into google_internalThe Android Open Source Project2009-03-290-0/+0
|\ \ \ | | |/ | |/|
| * | Merge commit 'remotes/korg/cupcake' into cupcake_to_masterJean-Baptiste Queru2009-03-180-0/+0
| |\|
* | | auto import //branches/master/...@140412The Android Open Source Project2009-03-18108-2509/+3845
| |/ |/|
* | auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03232-0/+110765
| |
* | auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03232-110765/+0
|/
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-1/+1
|
* Initial ContributionThe Android Open Source Project2008-10-21506-173977/+4268
|
* external/freetype 2.3.5Upstream1970-01-12641-0/+280474
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-18 08:36:20 +0000