diff options
author | 2011-01-25 21:01:34 +0000 | |
---|---|---|
committer | 2011-01-25 21:01:34 +0000 | |
commit | 2a22e10ab2946c5590cd2a258427ce3ccfca9bfa (patch) | |
tree | 1d96a3c68ca4bbe51935d5d2f56e46ccfd63f969 /src/core/SkTypeface.cpp | |
parent | c921843d85b4e79857103cdb614f76f123efa7f5 (diff) |
Add Truetype and Type 1 font embedding support
Sorry this is such a large CL. It was very exploratory for me to make this
work.
- Add an interface to SkFontHost to retrieve font information and provide NULL implementations on all platforms except Linux.
- Segment large Type 1 fonts into fonts with shared resources with 255 glyphs each.
- Convert the various Type 1 formats to the form PDF wants.
- Update font as we draw text instead of as part of the graphical state.
- Remove built-in font support, we can't really use it.
Other changes I can pull out to a separate CL if you like.
- Add SkTScopedPtr class.
- Fix double free of resources.
- Fix bug in resource unique-ifying code.
- Don't print anything for any empty clip path.
- Fix copy paste error - MiterLimit.
- Fix sign extension bug in SkPDFString
- Fix FlateTest rename that was missed on a previous commit.
Review URL: http://codereview.appspot.com/4082042
git-svn-id: http://skia.googlecode.com/svn/trunk@728 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkTypeface.cpp')
-rw-r--r-- | src/core/SkTypeface.cpp | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp index 257df278ea..6306098974 100644 --- a/src/core/SkTypeface.cpp +++ b/src/core/SkTypeface.cpp @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2011 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #include "SkTypeface.h" #include "SkFontHost.h" @@ -59,4 +75,6 @@ SkTypeface* SkTypeface::Deserialize(SkStream* stream) { return SkFontHost::Deserialize(stream); } - +SkPDFTypefaceInfo* SkTypeface::getPDFTypefaceInfo() const { + return SkFontHost::GetPDFTypefaceInfo(fUniqueID); +} |