No effect cleanup in pdf code.
Review URL: http://codereview.appspot.com/4927042
git-svn-id: http://skia.googlecode.com/svn/trunk@2146 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/pdf/SkPDFTypes.cpp b/src/pdf/SkPDFTypes.cpp
index cd1c51e..f97f21b 100644
--- a/src/pdf/SkPDFTypes.cpp
+++ b/src/pdf/SkPDFTypes.cpp
@@ -84,8 +84,9 @@
void SkPDFInt::emitObject(SkWStream* stream, SkPDFCatalog* catalog,
bool indirect) {
- if (indirect)
+ if (indirect) {
return emitIndirectObject(stream, catalog);
+ }
stream->writeDecAsText(fValue);
}
@@ -104,8 +105,9 @@
size_t SkPDFBool::getOutputSize(SkPDFCatalog* catalog, bool indirect) {
SkASSERT(!indirect);
- if (fValue)
+ if (fValue) {
return strlen("true");
+ }
return strlen("false");
}
@@ -114,8 +116,9 @@
void SkPDFScalar::emitObject(SkWStream* stream, SkPDFCatalog* catalog,
bool indirect) {
- if (indirect)
+ if (indirect) {
return emitIndirectObject(stream, catalog);
+ }
Append(fValue, stream);
}
@@ -223,8 +226,9 @@
SkASSERT(wideInput);
SkString result;
result.append("<");
- for (size_t i = 0; i < len; i++)
+ for (size_t i = 0; i < len; i++) {
result.appendHex(win[i], 4);
+ }
result.append(">");
return result;
}
@@ -247,8 +251,9 @@
for (size_t i = 0; i < len; i++) {
SkASSERT(!wideInput || !(win[i] & ~0xFF));
char val = wideInput ? win[i] : cin[i];
- if (val == '\\' || val == '(' || val == ')')
+ if (val == '\\' || val == '(' || val == ')') {
result.append("\\");
+ }
result.append(&val, 1);
}
result.append(")");
@@ -308,27 +313,32 @@
void SkPDFArray::emitObject(SkWStream* stream, SkPDFCatalog* catalog,
bool indirect) {
- if (indirect)
+ if (indirect) {
return emitIndirectObject(stream, catalog);
+ }
stream->writeText("[");
for (int i = 0; i < fValue.count(); i++) {
fValue[i]->emit(stream, catalog, false);
- if (i + 1 < fValue.count())
+ if (i + 1 < fValue.count()) {
stream->writeText(" ");
+ }
}
stream->writeText("]");
}
size_t SkPDFArray::getOutputSize(SkPDFCatalog* catalog, bool indirect) {
- if (indirect)
+ if (indirect) {
return getIndirectOutputSize(catalog);
+ }
size_t result = strlen("[]");
- if (fValue.count())
+ if (fValue.count()) {
result += fValue.count() - 1;
- for (int i = 0; i < fValue.count(); i++)
+ }
+ for (int i = 0; i < fValue.count(); i++) {
result += fValue[i]->getOutputSize(catalog, false);
+ }
return result;
}
@@ -381,8 +391,9 @@
void SkPDFDict::emitObject(SkWStream* stream, SkPDFCatalog* catalog,
bool indirect) {
- if (indirect)
+ if (indirect) {
return emitIndirectObject(stream, catalog);
+ }
stream->writeText("<<");
for (int i = 0; i < fValue.count(); i++) {
@@ -395,8 +406,9 @@
}
size_t SkPDFDict::getOutputSize(SkPDFCatalog* catalog, bool indirect) {
- if (indirect)
+ if (indirect) {
return getIndirectOutputSize(catalog);
+ }
size_t result = strlen("<<>>") + (fValue.count() * 2);
for (int i = 0; i < fValue.count(); i++) {