From bc4696b9176e05940a7c2d6778276cdbc55ccd61 Mon Sep 17 00:00:00 2001 From: halcanary Date: Wed, 6 May 2015 10:56:04 -0700 Subject: [PATCH] SkPDF: Move utility fns to SkPDFUtils BUG=skia:3585 Review URL: https://codereview.chromium.org/1124193003 --- src/pdf/SkPDFDevice.cpp | 18 +++---- src/pdf/SkPDFFont.cpp | 2 +- src/pdf/SkPDFTypes.cpp | 104 ++-------------------------------------- src/pdf/SkPDFTypes.h | 12 +---- src/pdf/SkPDFUtils.cpp | 123 +++++++++++++++++++++++++++++++++++++++++------- src/pdf/SkPDFUtils.h | 2 + 6 files changed, 124 insertions(+), 137 deletions(-) diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp index 2dbad5f..814504e 100644 --- a/src/pdf/SkPDFDevice.cpp +++ b/src/pdf/SkPDFDevice.cpp @@ -40,13 +40,13 @@ static void emit_pdf_color(SkColor color, SkWStream* result) { SkASSERT(SkColorGetA(color) == 0xFF); // We handle alpha elsewhere. SkScalar colorMax = SkIntToScalar(0xFF); - SkPDFScalar::Append( + SkPDFUtils::AppendScalar( SkScalarDiv(SkIntToScalar(SkColorGetR(color)), colorMax), result); result->writeText(" "); - SkPDFScalar::Append( + SkPDFUtils::AppendScalar( SkScalarDiv(SkIntToScalar(SkColorGetG(color)), colorMax), result); result->writeText(" "); - SkPDFScalar::Append( + SkPDFUtils::AppendScalar( SkScalarDiv(SkIntToScalar(SkColorGetB(color)), colorMax), result); result->writeText(" "); } @@ -164,11 +164,11 @@ static void set_text_transform(SkScalar x, SkScalar y, SkScalar textSkewX, // Flip the text about the x-axis to account for origin swap and include // the passed parameters. content->writeText("1 0 "); - SkPDFScalar::Append(0 - textSkewX, content); + SkPDFUtils::AppendScalar(0 - textSkewX, content); content->writeText(" -1 "); - SkPDFScalar::Append(x, content); + SkPDFUtils::AppendScalar(x, content); content->writeText(" "); - SkPDFScalar::Append(y, content); + SkPDFUtils::AppendScalar(y, content); content->writeText(" Tm\n"); } @@ -547,7 +547,7 @@ void GraphicStackState::updateDrawingState(const GraphicStateEntry& state) { if (state.fTextScaleX != currentEntry()->fTextScaleX) { SkScalar pdfScale = SkScalarMul(state.fTextScaleX, SkIntToScalar(100)); - SkPDFScalar::Append(pdfScale, fContentStream); + SkPDFUtils::AppendScalar(pdfScale, fContentStream); fContentStream->writeText(" Tz\n"); currentEntry()->fTextScaleX = state.fTextScaleX; } @@ -1080,7 +1080,7 @@ static SkString format_wide_string(const uint16_t* input, SkASSERT(0 == input[i] >> 8); tmp[i] = static_cast(input[i]); } - return SkPDFString::FormatString(tmp.c_str(), tmp.size()); + return SkPDFUtils::FormatString(tmp.c_str(), tmp.size()); } } @@ -1988,7 +1988,7 @@ void SkPDFDevice::updateFont(const SkPaint& paint, uint16_t glyphID, SkPDFResourceDict::kFont_ResourceType, fontIndex).c_str()); contentEntry->fContent.writeText(" "); - SkPDFScalar::Append(paint.getTextSize(), &contentEntry->fContent); + SkPDFUtils::AppendScalar(paint.getTextSize(), &contentEntry->fContent); contentEntry->fContent.writeText(" Tf\n"); contentEntry->fState.fFont = fFontResources[fontIndex]; } diff --git a/src/pdf/SkPDFFont.cpp b/src/pdf/SkPDFFont.cpp index 567806f..11cf012 100644 --- a/src/pdf/SkPDFFont.cpp +++ b/src/pdf/SkPDFFont.cpp @@ -286,7 +286,7 @@ SkScalar scaleFromFontUnits(int16_t val, uint16_t emSize) { void setGlyphWidthAndBoundingBox(SkScalar width, SkIRect box, SkWStream* content) { // Specify width and bounding box for the glyph. - SkPDFScalar::Append(width, content); + SkPDFUtils::AppendScalar(width, content); content->writeText(" 0 "); content->writeDecAsText(box.fLeft); content->writeText(" "); diff --git a/src/pdf/SkPDFTypes.cpp b/src/pdf/SkPDFTypes.cpp index ba5d6e2..2b2921d 100644 --- a/src/pdf/SkPDFTypes.cpp +++ b/src/pdf/SkPDFTypes.cpp @@ -7,6 +7,7 @@ */ #include "SkPDFTypes.h" +#include "SkPDFUtils.h" #include "SkStream.h" #ifdef SK_BUILD_FOR_WIN @@ -134,11 +135,11 @@ static void write_string(SkWStream* o, const SkString& s) { } static SkString format_string(const SkString& s) { - return SkPDFString::FormatString(s.c_str(), s.size()); + return SkPDFUtils::FormatString(s.c_str(), s.size()); } static SkString format_string(const char* s) { - return SkPDFString::FormatString(s, strlen(s)); + return SkPDFUtils::FormatString(s, strlen(s)); } void SkPDFUnion::emitObject(SkWStream* stream, @@ -152,7 +153,7 @@ void SkPDFUnion::emitObject(SkWStream* stream, stream->writeText(fBoolValue ? "true" : "false"); return; case Type::kScalar: - SkPDFScalar::Append(fScalarValue, stream); + SkPDFUtils::AppendScalar(fScalarValue, stream); return; case Type::kName: stream->writeText("/"); @@ -281,103 +282,6 @@ void SkPDFAtom::addResources(SkPDFObjNumMap* map, fValue.addResources(map, substitutes); } #endif // 0 -//////////////////////////////////////////////////////////////////////////////// - -// static -void SkPDFScalar::Append(SkScalar value, SkWStream* stream) { - // The range of reals in PDF/A is the same as SkFixed: +/- 32,767 and - // +/- 1/65,536 (though integers can range from 2^31 - 1 to -2^31). - // When using floats that are outside the whole value range, we can use - // integers instead. - -#if !defined(SK_ALLOW_LARGE_PDF_SCALARS) - if (value > 32767 || value < -32767) { - stream->writeDecAsText(SkScalarRoundToInt(value)); - return; - } - - char buffer[SkStrAppendScalar_MaxSize]; - char* end = SkStrAppendFixed(buffer, SkScalarToFixed(value)); - stream->write(buffer, end - buffer); - return; -#endif // !SK_ALLOW_LARGE_PDF_SCALARS - -#if defined(SK_ALLOW_LARGE_PDF_SCALARS) - // Floats have 24bits of significance, so anything outside that range is - // no more precise than an int. (Plus PDF doesn't support scientific - // notation, so this clamps to SK_Max/MinS32). - if (value > (1 << 24) || value < -(1 << 24)) { - stream->writeDecAsText(value); - return; - } - // Continue to enforce the PDF limits for small floats. - if (value < 1.0f/65536 && value > -1.0f/65536) { - stream->writeDecAsText(0); - return; - } - // SkStrAppendFloat might still use scientific notation, so use snprintf - // directly.. - static const int kFloat_MaxSize = 19; - char buffer[kFloat_MaxSize]; - int len = SNPRINTF(buffer, kFloat_MaxSize, "%#.8f", value); - // %f always prints trailing 0s, so strip them. - for (; buffer[len - 1] == '0' && len > 0; len--) { - buffer[len - 1] = '\0'; - } - if (buffer[len - 1] == '.') { - buffer[len - 1] = '\0'; - } - stream->writeText(buffer); - return; -#endif // SK_ALLOW_LARGE_PDF_SCALARS -} - -//////////////////////////////////////////////////////////////////////////////// - -// static - -SkString SkPDFString::FormatString(const char* cin, size_t len) { - SkASSERT(len <= kMaxLen); - - // 7-bit clean is a heuristic to decide what string format to use; - // a 7-bit clean string should require little escaping. - bool sevenBitClean = true; - size_t characterCount = 2 + len; - for (size_t i = 0; i < len; i++) { - if (cin[i] > '~' || cin[i] < ' ') { - sevenBitClean = false; - break; - } - if (cin[i] == '\\' || cin[i] == '(' || cin[i] == ')') { - ++characterCount; - } - } - SkString result; - if (sevenBitClean) { - result.resize(characterCount); - char* str = result.writable_str(); - *str++ = '('; - for (size_t i = 0; i < len; i++) { - if (cin[i] == '\\' || cin[i] == '(' || cin[i] == ')') { - *str++ = '\\'; - } - *str++ = cin[i]; - } - *str++ = ')'; - } else { - result.resize(2 * len + 2); - char* str = result.writable_str(); - *str++ = '<'; - for (size_t i = 0; i < len; i++) { - uint8_t c = static_cast(cin[i]); - static const char gHex[] = "0123456789ABCDEF"; - *str++ = gHex[(c >> 4) & 0xF]; - *str++ = gHex[(c ) & 0xF]; - } - *str++ = '>'; - } - return result; -} //////////////////////////////////////////////////////////////////////////////// diff --git a/src/pdf/SkPDFTypes.h b/src/pdf/SkPDFTypes.h index ff269b3..35922f8 100644 --- a/src/pdf/SkPDFTypes.h +++ b/src/pdf/SkPDFTypes.h @@ -180,17 +180,7 @@ private: }; #endif // 0 -class SkPDFScalar { -public: - static void Append(SkScalar value, SkWStream* stream); -}; - -class SkPDFString { -public: - static SkString FormatString(const char* input, size_t len); - static const size_t kMaxLen = 65535; -}; - +//////////////////////////////////////////////////////////////////////////////// /** \class SkPDFArray diff --git a/src/pdf/SkPDFUtils.cpp b/src/pdf/SkPDFUtils.cpp index 0a5be3b..fc1bdbe 100644 --- a/src/pdf/SkPDFUtils.cpp +++ b/src/pdf/SkPDFUtils.cpp @@ -1,4 +1,3 @@ - /* * Copyright 2011 Google Inc. * @@ -50,7 +49,7 @@ void SkPDFUtils::AppendTransform(const SkMatrix& matrix, SkWStream* content) { SkMatrix::SetAffineIdentity(values); } for (size_t i = 0; i < SK_ARRAY_COUNT(values); i++) { - SkPDFScalar::Append(values[i], content); + SkPDFUtils::AppendScalar(values[i], content); content->writeText(" "); } content->writeText("cm\n"); @@ -58,17 +57,17 @@ void SkPDFUtils::AppendTransform(const SkMatrix& matrix, SkWStream* content) { // static void SkPDFUtils::MoveTo(SkScalar x, SkScalar y, SkWStream* content) { - SkPDFScalar::Append(x, content); + SkPDFUtils::AppendScalar(x, content); content->writeText(" "); - SkPDFScalar::Append(y, content); + SkPDFUtils::AppendScalar(y, content); content->writeText(" m\n"); } // static void SkPDFUtils::AppendLine(SkScalar x, SkScalar y, SkWStream* content) { - SkPDFScalar::Append(x, content); + SkPDFUtils::AppendScalar(x, content); content->writeText(" "); - SkPDFScalar::Append(y, content); + SkPDFUtils::AppendScalar(y, content); content->writeText(" l\n"); } @@ -77,20 +76,20 @@ void SkPDFUtils::AppendCubic(SkScalar ctl1X, SkScalar ctl1Y, SkScalar ctl2X, SkScalar ctl2Y, SkScalar dstX, SkScalar dstY, SkWStream* content) { SkString cmd("y\n"); - SkPDFScalar::Append(ctl1X, content); + SkPDFUtils::AppendScalar(ctl1X, content); content->writeText(" "); - SkPDFScalar::Append(ctl1Y, content); + SkPDFUtils::AppendScalar(ctl1Y, content); content->writeText(" "); if (ctl2X != dstX || ctl2Y != dstY) { cmd.set("c\n"); - SkPDFScalar::Append(ctl2X, content); + SkPDFUtils::AppendScalar(ctl2X, content); content->writeText(" "); - SkPDFScalar::Append(ctl2Y, content); + SkPDFUtils::AppendScalar(ctl2Y, content); content->writeText(" "); } - SkPDFScalar::Append(dstX, content); + SkPDFUtils::AppendScalar(dstX, content); content->writeText(" "); - SkPDFScalar::Append(dstY, content); + SkPDFUtils::AppendScalar(dstY, content); content->writeText(" "); content->writeText(cmd.c_str()); } @@ -107,13 +106,13 @@ void SkPDFUtils::AppendRectangle(const SkRect& rect, SkWStream* content) { // Skia has 0,0 at top left, pdf at bottom left. Do the right thing. SkScalar bottom = SkMinScalar(rect.fBottom, rect.fTop); - SkPDFScalar::Append(rect.fLeft, content); + SkPDFUtils::AppendScalar(rect.fLeft, content); content->writeText(" "); - SkPDFScalar::Append(bottom, content); + SkPDFUtils::AppendScalar(bottom, content); content->writeText(" "); - SkPDFScalar::Append(rect.width(), content); + SkPDFUtils::AppendScalar(rect.width(), content); content->writeText(" "); - SkPDFScalar::Append(rect.height(), content); + SkPDFUtils::AppendScalar(rect.height(), content); content->writeText(" re\n"); } @@ -252,3 +251,95 @@ void SkPDFUtils::ApplyPattern(int objectIndex, SkWStream* content) { content->writeText(resourceName.c_str()); content->writeText(" scn\n"); } + +void SkPDFUtils::AppendScalar(SkScalar value, SkWStream* stream) { + // The range of reals in PDF/A is the same as SkFixed: +/- 32,767 and + // +/- 1/65,536 (though integers can range from 2^31 - 1 to -2^31). + // When using floats that are outside the whole value range, we can use + // integers instead. + +#if !defined(SK_ALLOW_LARGE_PDF_SCALARS) + if (value > 32767 || value < -32767) { + stream->writeDecAsText(SkScalarRoundToInt(value)); + return; + } + + char buffer[SkStrAppendScalar_MaxSize]; + char* end = SkStrAppendFixed(buffer, SkScalarToFixed(value)); + stream->write(buffer, end - buffer); + return; +#endif // !SK_ALLOW_LARGE_PDF_SCALARS + +#if defined(SK_ALLOW_LARGE_PDF_SCALARS) + // Floats have 24bits of significance, so anything outside that range is + // no more precise than an int. (Plus PDF doesn't support scientific + // notation, so this clamps to SK_Max/MinS32). + if (value > (1 << 24) || value < -(1 << 24)) { + stream->writeDecAsText(value); + return; + } + // Continue to enforce the PDF limits for small floats. + if (value < 1.0f/65536 && value > -1.0f/65536) { + stream->writeDecAsText(0); + return; + } + // SkStrAppendFloat might still use scientific notation, so use snprintf + // directly.. + static const int kFloat_MaxSize = 19; + char buffer[kFloat_MaxSize]; + int len = SNPRINTF(buffer, kFloat_MaxSize, "%#.8f", value); + // %f always prints trailing 0s, so strip them. + for (; buffer[len - 1] == '0' && len > 0; len--) { + buffer[len - 1] = '\0'; + } + if (buffer[len - 1] == '.') { + buffer[len - 1] = '\0'; + } + stream->writeText(buffer); + return; +#endif // SK_ALLOW_LARGE_PDF_SCALARS +} + +SkString SkPDFUtils::FormatString(const char* cin, size_t len) { + SkDEBUGCODE(static const size_t kMaxLen = 65535;) + SkASSERT(len <= kMaxLen); + + // 7-bit clean is a heuristic to decide what string format to use; + // a 7-bit clean string should require little escaping. + bool sevenBitClean = true; + size_t characterCount = 2 + len; + for (size_t i = 0; i < len; i++) { + if (cin[i] > '~' || cin[i] < ' ') { + sevenBitClean = false; + break; + } + if (cin[i] == '\\' || cin[i] == '(' || cin[i] == ')') { + ++characterCount; + } + } + SkString result; + if (sevenBitClean) { + result.resize(characterCount); + char* str = result.writable_str(); + *str++ = '('; + for (size_t i = 0; i < len; i++) { + if (cin[i] == '\\' || cin[i] == '(' || cin[i] == ')') { + *str++ = '\\'; + } + *str++ = cin[i]; + } + *str++ = ')'; + } else { + result.resize(2 * len + 2); + char* str = result.writable_str(); + *str++ = '<'; + for (size_t i = 0; i < len; i++) { + uint8_t c = static_cast(cin[i]); + static const char gHex[] = "0123456789ABCDEF"; + *str++ = gHex[(c >> 4) & 0xF]; + *str++ = gHex[(c ) & 0xF]; + } + *str++ = '>'; + } + return result; +} diff --git a/src/pdf/SkPDFUtils.h b/src/pdf/SkPDFUtils.h index b30821d..38f300a 100644 --- a/src/pdf/SkPDFUtils.h +++ b/src/pdf/SkPDFUtils.h @@ -54,6 +54,8 @@ public: static void DrawFormXObject(int objectIndex, SkWStream* content); static void ApplyGraphicState(int objectIndex, SkWStream* content); static void ApplyPattern(int objectIndex, SkWStream* content); + static void AppendScalar(SkScalar value, SkWStream* stream); + static SkString FormatString(const char* input, size_t len); }; #endif -- 2.7.4