AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More variable initializations and curly braces to avoid Linux compiler

Browse Source 
warnings.



git-svn-id: http://skia.googlecode.com/svn/trunk@1993 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
tomhudson@google.com 2011-07-29 13:44:30 +00:00
parent e14490adad
commit 2c2508d2ed
5 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gpu/src/GrRedBlackTree.h
View File

@ -354,7 +354,7 @@ typename GrRedBlackTree<T,C>::Iter GrRedBlackTree<T,C>::insert(const T& t) {
Node* p = NULL;
Node* n = fRoot;
Child pc = kLeft_Child; // suppress uninit warning
Child gpc;
Child gpc = kLeft_Child;
bool first = true;
bool last = true;

2
samplecode/SampleFuzz.cpp
View File

@ -45,7 +45,7 @@ static float huge() {
}
static float make_number() {
float v;
float v = 0;
int sel;
if (return_large == true && R(3) == 1) sel = R(6); else sel = R(4);

12
src/core/SkPath.cpp
View File

@ -218,10 +218,12 @@ bool SkPath::isRect(SkRect* rect) const {
int corners = 0;
SkPoint first, last;
int firstDirection;
int lastDirection;
int nextDirection;
bool closedOrMoved;
first.set(0, 0);
last.set(0, 0);
int firstDirection = 0;
int lastDirection = 0;
int nextDirection = 0;
bool closedOrMoved = false;
bool autoClose = false;
const uint8_t* verbs = fVerbs.begin();
const uint8_t* verbStop = fVerbs.end();
@ -269,7 +271,7 @@ bool SkPath::isRect(SkRect* rect) const {
// Possible values for corners are 2, 3, and 4.
// When corners == 3, nextDirection opposes firstDirection.
// Otherwise, nextDirection at corner 2 opposes corner 4.
int turn = firstDirection ^ corners - 1;
int turn = firstDirection ^ (corners - 1);
int directionCycle = 3 == corners ? 0 : nextDirection ^ turn;
if ((directionCycle ^ turn) != nextDirection) {
return false; // direction didn't follow cycle

2
src/svg/SkSVGClipPath.cpp
View File

@ -28,7 +28,7 @@ void SkSVGClipPath::translate(SkSVGParser& parser, bool defState) {
SkSVGElement* child = *fChildren.begin();
SkASSERT(child->getType() == SkSVGType_Use);
SkSVGUse* use = (SkSVGUse*) child;
SkSVGElement* ref;
SkSVGElement* ref = NULL;
const char* refStr = &use->f_xlink_href.c_str()[1];
SkASSERT(parser.getIDs().find(refStr, &ref));
SkASSERT(ref);

15
src/views/SkStackViewLayout.cpp
View File

@ -202,8 +202,9 @@ void SkStackViewLayout::onInflate(const SkDOM& dom, const SkDOM::Node* node)
if ((index = dom.findList(node, "orient", "horizontal,vertical")) >= 0)
this->setOrient((Orient)index);
else
else {
assert_no_attr(dom, node, "orient");
}
if (dom.findScalars(node, "margin", value, 4))
{
@ -211,23 +212,27 @@ void SkStackViewLayout::onInflate(const SkDOM& dom, const SkDOM::Node* node)
margin.set(value[0], value[1], value[2], value[3]);
this->setMargin(margin);
}
else
else {
assert_no_attr(dom, node, "margin");
}
if (dom.findScalar(node, "spacer", value))
this->setSpacer(value[0]);
else
else {
assert_no_attr(dom, node, "spacer");
}
if ((index = dom.findList(node, "pack", "start,center,end")) >= 0)
this->setPack((Pack)index);
else
else {
assert_no_attr(dom, node, "pack");
}
if ((index = dom.findList(node, "align", "start,center,end,stretch")) >= 0)
this->setAlign((Align)index);
else
else {
assert_no_attr(dom, node, "align");
}
}
///////////////////////////////////////////////////////////////////////////////////////////