ec3ed6a5eb
I have manually examined all of these diffs and restored a few files that seem to require manual adjustment. The following files still need to be modified manually, in a separate CL: android_sample/SampleApp/AndroidManifest.xml android_sample/SampleApp/res/layout/layout.xml android_sample/SampleApp/res/menu/sample.xml android_sample/SampleApp/res/values/strings.xml android_sample/SampleApp/src/com/skia/sampleapp/SampleApp.java android_sample/SampleApp/src/com/skia/sampleapp/SampleView.java experimental/CiCarbonSampleMain.c experimental/CocoaDebugger/main.m experimental/FileReaderApp/main.m experimental/SimpleCocoaApp/main.m experimental/iOSSampleApp/Shared/SkAlertPrompt.h experimental/iOSSampleApp/Shared/SkAlertPrompt.m experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig gpu/src/android/GrGLDefaultInterface_android.cpp gyp/common.gypi gyp_skia include/ports/SkHarfBuzzFont.h include/views/SkOSWindow_wxwidgets.h make.bat make.py src/opts/memset.arm.S src/opts/memset16_neon.S src/opts/memset32_neon.S src/opts/opts_check_arm.cpp src/ports/SkDebug_brew.cpp src/ports/SkMemory_brew.cpp src/ports/SkOSFile_brew.cpp src/ports/SkXMLParser_empty.cpp src/utils/ios/SkImageDecoder_iOS.mm src/utils/ios/SkOSFile_iOS.mm src/utils/ios/SkStream_NSData.mm tests/FillPathTest.cpp Review URL: http://codereview.appspot.com/4816058 git-svn-id: http://skia.googlecode.com/svn/trunk@1982 2bbb7eff-a529-9590-31e7-b0007b416f81
83 lines
1.9 KiB
C++
83 lines
1.9 KiB
C++
|
|
/*
|
|
* Copyright 2010 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
|
|
|
|
#ifndef GrGlyph_DEFINED
|
|
#define GrGlyph_DEFINED
|
|
|
|
#include "GrPath.h"
|
|
#include "GrRect.h"
|
|
|
|
class GrAtlas;
|
|
|
|
/* Need this to be quad-state:
|
|
- complete w/ image
|
|
- just metrics
|
|
- failed to get image, but has metrics
|
|
- failed to get metrics
|
|
*/
|
|
struct GrGlyph {
|
|
typedef uint32_t PackedID;
|
|
|
|
GrAtlas* fAtlas;
|
|
GrPath* fPath;
|
|
PackedID fPackedID;
|
|
GrIRect16 fBounds;
|
|
GrIPoint16 fAtlasLocation;
|
|
|
|
void init(GrGlyph::PackedID packed, const GrIRect& bounds) {
|
|
fAtlas = NULL;
|
|
fPath = NULL;
|
|
fPackedID = packed;
|
|
fBounds.set(bounds);
|
|
fAtlasLocation.set(0, 0);
|
|
}
|
|
|
|
void free() {
|
|
if (fPath) {
|
|
delete fPath;
|
|
fPath = NULL;
|
|
}
|
|
}
|
|
|
|
int width() const { return fBounds.width(); }
|
|
int height() const { return fBounds.height(); }
|
|
bool isEmpty() const { return fBounds.isEmpty(); }
|
|
uint16_t glyphID() const { return UnpackID(fPackedID); }
|
|
|
|
///////////////////////////////////////////////////////////////////////////
|
|
|
|
static inline unsigned ExtractSubPixelBitsFromFixed(GrFixed pos) {
|
|
// two most significant fraction bits from fixed-point
|
|
return (pos >> 14) & 3;
|
|
}
|
|
|
|
static inline PackedID Pack(uint16_t glyphID, GrFixed x, GrFixed y) {
|
|
x = ExtractSubPixelBitsFromFixed(x);
|
|
y = ExtractSubPixelBitsFromFixed(y);
|
|
return (x << 18) | (y << 16) | glyphID;
|
|
}
|
|
|
|
static inline GrFixed UnpackFixedX(PackedID packed) {
|
|
return ((packed >> 18) & 3) << 14;
|
|
}
|
|
|
|
static inline GrFixed UnpackFixedY(PackedID packed) {
|
|
return ((packed >> 16) & 3) << 14;
|
|
}
|
|
|
|
static inline uint16_t UnpackID(PackedID packed) {
|
|
return (uint16_t)packed;
|
|
}
|
|
};
|
|
|
|
|
|
#endif
|
|
|