зеркало из https://github.com/mozilla/moz-skia.git
Some Linux / 64-bit compile fixes.
Review URL: http://codereview.appspot.com/63189 git-svn-id: http://skia.googlecode.com/svn/trunk@209 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
Родитель
00dae86f58
Коммит
1220e1c28a
|
@ -257,7 +257,7 @@ protected:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Line2DPathEffect::Line2DPathEffect(SkFlattenableReadBuffer& buffer) : Sk2DPathEffect(buffer)
|
Line2DPathEffect(SkFlattenableReadBuffer& buffer) : Sk2DPathEffect(buffer)
|
||||||
{
|
{
|
||||||
fWidth = buffer.readScalar();
|
fWidth = buffer.readScalar();
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,7 +20,7 @@ typedef SkView* (*SkViewFactory)();
|
||||||
|
|
||||||
class SkViewRegister : SkNoncopyable {
|
class SkViewRegister : SkNoncopyable {
|
||||||
public:
|
public:
|
||||||
SkViewRegister(SkViewFactory);
|
explicit SkViewRegister(SkViewFactory);
|
||||||
|
|
||||||
static const SkViewRegister* Head() { return gHead; }
|
static const SkViewRegister* Head() { return gHead; }
|
||||||
|
|
||||||
|
|
|
@ -245,7 +245,7 @@ protected:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Line2DPathEffect::Line2DPathEffect(SkFlattenableReadBuffer& buffer) : Sk2DPathEffect(buffer)
|
Line2DPathEffect(SkFlattenableReadBuffer& buffer) : Sk2DPathEffect(buffer)
|
||||||
{
|
{
|
||||||
fWidth = buffer.readScalar();
|
fWidth = buffer.readScalar();
|
||||||
}
|
}
|
||||||
|
|
|
@ -73,7 +73,7 @@ class SkDrawTypeface : public SkPaintPart {
|
||||||
virtual void dump(SkAnimateMaker *);
|
virtual void dump(SkAnimateMaker *);
|
||||||
#endif
|
#endif
|
||||||
SkTypeface* getTypeface() {
|
SkTypeface* getTypeface() {
|
||||||
return SkTypeface::Create(fontName.c_str(), style); }
|
return SkTypeface::CreateFromName(fontName.c_str(), style); }
|
||||||
protected:
|
protected:
|
||||||
virtual bool add();
|
virtual bool add();
|
||||||
SkString fontName;
|
SkString fontName;
|
||||||
|
|
|
@ -119,7 +119,7 @@ static FcPattern* FontMatch(const char* type, FcType vtype, const void* value,
|
||||||
fcvalue.u.s = (FcChar8*) value;
|
fcvalue.u.s = (FcChar8*) value;
|
||||||
break;
|
break;
|
||||||
case FcTypeInteger:
|
case FcTypeInteger:
|
||||||
fcvalue.u.i = (int) value;
|
fcvalue.u.i = (int)(intptr_t)value;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
SkASSERT(!"FontMatch unhandled type");
|
SkASSERT(!"FontMatch unhandled type");
|
||||||
|
|
Загрузка…
Ссылка в новой задаче