More variable initializations and curly braces to avoid Linux compiler
warnings.
git-svn-id: http://skia.googlecode.com/svn/trunk@1993 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/views/SkStackViewLayout.cpp b/src/views/SkStackViewLayout.cpp
index a6e3f50..bf6f363 100644
--- a/src/views/SkStackViewLayout.cpp
+++ b/src/views/SkStackViewLayout.cpp
@@ -202,8 +202,9 @@
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 @@
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");
+ }
}
///////////////////////////////////////////////////////////////////////////////////////////