| Index: third_party/freetype2/src/src/bdf/bdf.c
|
| diff --git a/third_party/smhasher/LICENSE b/third_party/freetype2/src/src/bdf/bdf.c
|
| similarity index 75%
|
| copy from third_party/smhasher/LICENSE
|
| copy to third_party/freetype2/src/src/bdf/bdf.c
|
| index 3f18a844ad0be4ca83c084b9cff5bcf020704b1e..f95fb76225f38243e787faf2d0d72f5969bb0a72 100644
|
| --- a/third_party/smhasher/LICENSE
|
| +++ b/third_party/freetype2/src/src/bdf/bdf.c
|
| @@ -1,8 +1,9 @@
|
| -All MurmurHash source files are placed in the public domain.
|
| +/* bdf.c
|
|
|
| -The license below applies to all other code in SMHasher:
|
| + FreeType font driver for bdf files
|
|
|
| -Copyright (c) 2011 Google, Inc.
|
| + Copyright (C) 2001, 2002 by
|
| + Francesco Zappa Nardelli
|
|
|
| Permission is hereby granted, free of charge, to any person obtaining a copy
|
| of this software and associated documentation files (the "Software"), to deal
|
| @@ -16,8 +17,18 @@ all copies or substantial portions of the Software.
|
|
|
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
| -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
| +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
| THE SOFTWARE.
|
| +*/
|
| +
|
| +#define FT_MAKE_OPTION_SINGLE_OBJECT
|
| +
|
| +#include <ft2build.h>
|
| +#include "bdflib.c"
|
| +#include "bdfdrivr.c"
|
| +
|
| +
|
| +/* END */
|
|
|