SkPDF: re-work SkPDFUtils::FloatToDecimal

tests/PDFPrimitivesTest.cpp

 /*
  * Copyright 2010 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Resources.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkData.h"
 #include "SkDocument.h"
 #include "SkDeflate.h"
 #include "SkImageEncoder.h"
 #include "SkMatrix.h"
 #include "SkPDFCanon.h"
 #include "SkPDFDevice.h"
 #include "SkPDFFont.h"
 #include "SkPDFStream.h"
 #include "SkPDFTypes.h"
 #include "SkPDFUtils.h"
 #include "SkReadBuffer.h"
 #include "SkScalar.h"
 #include "SkSpecialImage.h"
 #include "SkStream.h"
 #include "SkTypes.h"
 #include "Test.h"
 #include "sk_tool_utils.h"
 
+#include <cstdlib>
+#include <cmath>
+
 #define DUMMY_TEXT "DCT compessed stream."
 
 namespace {
 struct Catalog {
     SkPDFSubstituteMap substitutes;
     SkPDFObjNumMap numbers;
 };
 }  // namespace
 
 template <typename T>
 static SkString emit_to_string(T& obj, Catalog* catPtr = nullptr) {
     Catalog catalog;
     SkDynamicMemoryWStream buffer;
     if (!catPtr) {
         catPtr = &catalog;
     }
     obj.emitObject(&buffer, catPtr->numbers, catPtr->substitutes);
-    SkAutoTDelete<SkStreamAsset> asset(buffer.detachAsStream());
-    SkString tmp(asset->getLength());
-    asset->read(tmp.writable_str(), asset->getLength());
+    SkString tmp(buffer.bytesWritten());
+    buffer.copyTo(tmp.writable_str());
     return tmp;
 }
 
 static bool eq(const SkString& str, const char* strPtr, size_t len) {
     return len == str.size() && 0 == memcmp(str.c_str(), strPtr, len);
 }
 
-#define ASSERT_EQL(REPORTER, SKSTRING, STRING, LEN)                     \
-    do {                                                                \
-        const char* strptr = STRING;                                    \
-        const SkString& sks = SKSTRING;                                 \
-        if (!eq(sks, strptr, LEN)) {                                    \
-            REPORT_FAILURE(                                             \
-                    REPORTER,                                           \
-                    "",                                                 \
-                    SkStringPrintf("'%s' != '%s'", strptr, sks.c_str()));  \
-        }                                                               \
-    } while (false)
+static void assert_eql(skiatest::Reporter* reporter,
+                       const SkString& skString,
+                       const char* str,
+                       size_t len) {
+    if (!eq(skString, str, len)) {
+        REPORT_FAILURE(reporter, "", SkStringPrintf(
+                "'%*s' != '%s'", len, str, skString.c_str()));
+    }
+}
 
-#define ASSERT_EQ(REPORTER, SKSTRING, STRING)             \
-    do {                                                  \
-        const char* str = STRING;                         \
-        ASSERT_EQL(REPORTER, SKSTRING, str, strlen(str)); \
-    } while (false)
-
-#define ASSERT_EMIT_EQ(REPORTER, OBJECT, STRING)          \
-    do {                                                  \
-        SkString result = emit_to_string(OBJECT);         \
-        ASSERT_EQ(REPORTER, result, STRING);              \
-    } while (false)
+static void assert_eq(skiatest::Reporter* reporter,
+                      const SkString& skString,
+                      const char* str) {
+    assert_eql(reporter, skString, str, strlen(str));
+}
 
 
+template <typename T>
+static void assert_emit_eq(skiatest::Reporter* reporter,
+                           T& object,
+                           const char* string) {
+    SkString result = emit_to_string(object);
+    assert_eq(reporter, result, string);
+}
 
 static void TestPDFStream(skiatest::Reporter* reporter) {
     char streamBytes[] = "Test\nFoo\tBar";
     SkAutoTDelete<SkMemoryStream> streamData(new SkMemoryStream(
         streamBytes, strlen(streamBytes), true));
     sk_sp<SkPDFStream> stream(new SkPDFStream(streamData.get()));
-    ASSERT_EMIT_EQ(reporter,
+    assert_emit_eq(reporter,
                    *stream,
                    "<</Length 12>> stream\nTest\nFoo\tBar\nendstream");
     stream->insertInt("Attribute", 42);
-    ASSERT_EMIT_EQ(reporter,
+    assert_emit_eq(reporter,
                    *stream,
                    "<</Length 12\n/Attribute 42>> stream\n"
                    "Test\nFoo\tBar\nendstream");
 
     {
         char streamBytes2[] = "This is a longer string, so that compression "
                               "can do something with it. With shorter strings, "
                               "the short circuit logic cuts in and we end up "
                               "with an uncompressed string.";
         SkAutoDataUnref streamData2(SkData::NewWithCopy(streamBytes2,
                                                         strlen(streamBytes2)));
         sk_sp<SkPDFStream> stream(new SkPDFStream(streamData2.get()));
 
         SkDynamicMemoryWStream compressedByteStream;
         SkDeflateWStream deflateWStream(&compressedByteStream);
         deflateWStream.write(streamBytes2, strlen(streamBytes2));
         deflateWStream.finalize();
 
         SkDynamicMemoryWStream expected;
         expected.writeText("<</Filter /FlateDecode\n/Length 116>> stream\n");
         compressedByteStream.writeToStream(&expected);
         compressedByteStream.reset();
         expected.writeText("\nendstream");
         SkAutoDataUnref expectedResultData2(expected.copyToData());
         SkString result = emit_to_string(*stream);
-        ASSERT_EQL(reporter,
+        assert_eql(reporter,
                    result,
                    (const char*)expectedResultData2->data(),
                    expectedResultData2->size());
     }
 }
 
 static void TestObjectNumberMap(skiatest::Reporter* reporter) {
     SkPDFObjNumMap objNumMap;
     sk_sp<SkPDFArray> a1(new SkPDFArray);
     sk_sp<SkPDFArray> a2(new SkPDFArray);
@@ skipping 18 matching lines @@
     sk_sp<SkPDFArray> a2(new SkPDFArray);
     a2->appendObjRef(a1);
 
     Catalog catalog;
     catalog.numbers.addObject(a1.get());
     REPORTER_ASSERT(reporter, catalog.numbers.getObjectNumber(a1.get()) == 1);
 
     SkString result = emit_to_string(*a2, &catalog);
     // If appendObjRef misbehaves, then the result would
     // be [[]], not [1 0 R].
-    ASSERT_EQ(reporter, result, "[1 0 R]");
+    assert_eq(reporter, result, "[1 0 R]");
 }
 
 static void TestSubstitute(skiatest::Reporter* reporter) {
     sk_sp<SkPDFDict> proxy(new SkPDFDict());
     sk_sp<SkPDFDict> stub(new SkPDFDict());
 
     proxy->insertInt("Value", 33);
     stub->insertInt("Value", 44);
 
     SkPDFSubstituteMap substituteMap;
@@ skipping 15 matching lines @@
     SkCanvas* canvas = doc->beginPage(100.0f, 100.0f);
     SkPaint paint;
     paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
 
     uint16_t glyphID = 65000;
     canvas->drawText(&glyphID, 2, 0, 0, paint);
 
     doc->close();
 }
 
+static void assert_emit_eq_number(skiatest::Reporter* reporter, float number) {
+    SkPDFUnion pdfUnion = SkPDFUnion::Scalar(number);
+    SkString result = emit_to_string(pdfUnion);
+    float value = static_cast<float>(std::atof(result.c_str()));
+    if (value != number) {
+        ERRORF(reporter, "%.9g != %s", number, result.c_str());
+    }
+}
+
+
 static void TestPDFUnion(skiatest::Reporter* reporter) {
     SkPDFUnion boolTrue = SkPDFUnion::Bool(true);
-    ASSERT_EMIT_EQ(reporter, boolTrue, "true");
+    assert_emit_eq(reporter, boolTrue, "true");
 
     SkPDFUnion boolFalse = SkPDFUnion::Bool(false);
-    ASSERT_EMIT_EQ(reporter, boolFalse, "false");
+    assert_emit_eq(reporter, boolFalse, "false");
 
     SkPDFUnion int42 = SkPDFUnion::Int(42);
-    ASSERT_EMIT_EQ(reporter, int42, "42");
+    assert_emit_eq(reporter, int42, "42");
 
-    SkPDFUnion realHalf = SkPDFUnion::Scalar(SK_ScalarHalf);
-    ASSERT_EMIT_EQ(reporter, realHalf, ".5");
-
-    SkPDFUnion bigScalar = SkPDFUnion::Scalar(110999.75f);
-    ASSERT_EMIT_EQ(reporter, bigScalar, "110999.75");
-
-    SkPDFUnion biggerScalar = SkPDFUnion::Scalar(50000000.1f);
-    ASSERT_EMIT_EQ(reporter, biggerScalar, "50000000");
-
-    SkPDFUnion smallestScalar = SkPDFUnion::Scalar(1.0f / 65536);
-    ASSERT_EMIT_EQ(reporter, smallestScalar, ".0000152587890");
+    assert_emit_eq_number(reporter, SK_ScalarHalf);
+    assert_emit_eq_number(reporter, 110999.75f);  // bigScalar
+    assert_emit_eq_number(reporter, 50000000.1f);  // biggerScalar
+    assert_emit_eq_number(reporter, 1.0f / 65536);  // smallScalar
 
     SkPDFUnion stringSimple = SkPDFUnion::String("test ) string ( foo");
-    ASSERT_EMIT_EQ(reporter, stringSimple, "(test \\) string \\( foo)");
+    assert_emit_eq(reporter, stringSimple, "(test \\) string \\( foo)");
 
     SkString stringComplexInput("\ttest ) string ( foo");
     SkPDFUnion stringComplex = SkPDFUnion::String(stringComplexInput);
-    ASSERT_EMIT_EQ(reporter, stringComplex, "(\\011test \\) string \\( foo)");
+    assert_emit_eq(reporter, stringComplex, "(\\011test \\) string \\( foo)");
 
     SkString binaryStringInput("\1\2\3\4\5\6\7\10\11\12\13\14\15\16\17\20");
     SkPDFUnion binaryString = SkPDFUnion::String(binaryStringInput);
-    ASSERT_EMIT_EQ(reporter, binaryString, "<0102030405060708090A0B0C0D0E0F10>");
+    assert_emit_eq(reporter, binaryString, "<0102030405060708090A0B0C0D0E0F10>");
 
     SkString nameInput("Test name\twith#tab");
     SkPDFUnion name = SkPDFUnion::Name(nameInput);
-    ASSERT_EMIT_EQ(reporter, name, "/Test#20name#09with#23tab");
+    assert_emit_eq(reporter, name, "/Test#20name#09with#23tab");
 
     SkString nameInput2("A#/%()<>[]{}B");
     SkPDFUnion name2 = SkPDFUnion::Name(nameInput2);
-    ASSERT_EMIT_EQ(reporter, name2, "/A#23#2F#25#28#29#3C#3E#5B#5D#7B#7DB");
+    assert_emit_eq(reporter, name2, "/A#23#2F#25#28#29#3C#3E#5B#5D#7B#7DB");
 
     SkPDFUnion name3 = SkPDFUnion::Name("SimpleNameWithOnlyPrintableASCII");
-    ASSERT_EMIT_EQ(reporter, name3, "/SimpleNameWithOnlyPrintableASCII");
+    assert_emit_eq(reporter, name3, "/SimpleNameWithOnlyPrintableASCII");
 
     // Test that we correctly handle characters with the high-bit set.
     SkString highBitString("\xDE\xAD" "be\xEF");
     SkPDFUnion highBitName = SkPDFUnion::Name(highBitString);
-    ASSERT_EMIT_EQ(reporter, highBitName, "/#DE#ADbe#EF");
+    assert_emit_eq(reporter, highBitName, "/#DE#ADbe#EF");
 }
 
 static void TestPDFArray(skiatest::Reporter* reporter) {
     sk_sp<SkPDFArray> array(new SkPDFArray);
-    ASSERT_EMIT_EQ(reporter, *array, "[]");
+    assert_emit_eq(reporter, *array, "[]");
 
     array->appendInt(42);
-    ASSERT_EMIT_EQ(reporter, *array, "[42]");
+    assert_emit_eq(reporter, *array, "[42]");
 
     array->appendScalar(SK_ScalarHalf);
-    ASSERT_EMIT_EQ(reporter, *array, "[42 .5]");
+    assert_emit_eq(reporter, *array, "[42 .5]");
 
     array->appendInt(0);
-    ASSERT_EMIT_EQ(reporter, *array, "[42 .5 0]");
+    assert_emit_eq(reporter, *array, "[42 .5 0]");
 
     array->appendBool(true);
-    ASSERT_EMIT_EQ(reporter, *array, "[42 .5 0 true]");
+    assert_emit_eq(reporter, *array, "[42 .5 0 true]");
 
     array->appendName("ThisName");
-    ASSERT_EMIT_EQ(reporter, *array, "[42 .5 0 true /ThisName]");
+    assert_emit_eq(reporter, *array, "[42 .5 0 true /ThisName]");
 
     array->appendName(SkString("AnotherName"));
-    ASSERT_EMIT_EQ(reporter, *array, "[42 .5 0 true /ThisName /AnotherName]");
+    assert_emit_eq(reporter, *array, "[42 .5 0 true /ThisName /AnotherName]");
 
     array->appendString("This String");
-    ASSERT_EMIT_EQ(reporter, *array,
+    assert_emit_eq(reporter, *array,
                    "[42 .5 0 true /ThisName /AnotherName (This String)]");
 
     array->appendString(SkString("Another String"));
-    ASSERT_EMIT_EQ(reporter, *array,
+    assert_emit_eq(reporter, *array,
                    "[42 .5 0 true /ThisName /AnotherName (This String) "
                    "(Another String)]");
 
     sk_sp<SkPDFArray> innerArray(new SkPDFArray);
     innerArray->appendInt(-1);
     array->appendObject(std::move(innerArray));
-    ASSERT_EMIT_EQ(reporter, *array,
+    assert_emit_eq(reporter, *array,
                    "[42 .5 0 true /ThisName /AnotherName (This String) "
                    "(Another String) [-1]]");
 
     sk_sp<SkPDFArray> referencedArray(new SkPDFArray);
     Catalog catalog;
     catalog.numbers.addObject(referencedArray.get());
     REPORTER_ASSERT(reporter, catalog.numbers.getObjectNumber(
                             referencedArray.get()) == 1);
     array->appendObjRef(std::move(referencedArray));
 
     SkString result = emit_to_string(*array, &catalog);
-    ASSERT_EQ(reporter, result,
+    assert_eq(reporter, result,
               "[42 .5 0 true /ThisName /AnotherName (This String) "
               "(Another String) [-1] 1 0 R]");
 }
 
 static void TestPDFDict(skiatest::Reporter* reporter) {
     sk_sp<SkPDFDict> dict(new SkPDFDict);
-    ASSERT_EMIT_EQ(reporter, *dict, "<<>>");
+    assert_emit_eq(reporter, *dict, "<<>>");
 
     dict->insertInt("n1", SkToSizeT(42));
-    ASSERT_EMIT_EQ(reporter, *dict, "<</n1 42>>");
+    assert_emit_eq(reporter, *dict, "<</n1 42>>");
 
     dict.reset(new SkPDFDict);
-    ASSERT_EMIT_EQ(reporter, *dict, "<<>>");
+    assert_emit_eq(reporter, *dict, "<<>>");
 
     dict->insertInt("n1", 42);
-    ASSERT_EMIT_EQ(reporter, *dict, "<</n1 42>>");
+    assert_emit_eq(reporter, *dict, "<</n1 42>>");
 
     dict->insertScalar("n2", SK_ScalarHalf);
 
     SkString n3("n3");
     sk_sp<SkPDFArray> innerArray(new SkPDFArray);
     innerArray->appendInt(-100);
     dict->insertObject(n3, std::move(innerArray));
-    ASSERT_EMIT_EQ(reporter, *dict, "<</n1 42\n/n2 .5\n/n3 [-100]>>");
+    assert_emit_eq(reporter, *dict, "<</n1 42\n/n2 .5\n/n3 [-100]>>");
 
     dict.reset(new SkPDFDict);
-    ASSERT_EMIT_EQ(reporter, *dict, "<<>>");
+    assert_emit_eq(reporter, *dict, "<<>>");
 
     dict->insertInt("n1", 24);
-    ASSERT_EMIT_EQ(reporter, *dict, "<</n1 24>>");
+    assert_emit_eq(reporter, *dict, "<</n1 24>>");
 
     dict->insertInt("n2", SkToSizeT(99));
-    ASSERT_EMIT_EQ(reporter, *dict, "<</n1 24\n/n2 99>>");
+    assert_emit_eq(reporter, *dict, "<</n1 24\n/n2 99>>");
 
     dict->insertScalar("n3", SK_ScalarHalf);
-    ASSERT_EMIT_EQ(reporter, *dict, "<</n1 24\n/n2 99\n/n3 .5>>");
+    assert_emit_eq(reporter, *dict, "<</n1 24\n/n2 99\n/n3 .5>>");
 
     dict->insertName("n4", "AName");
-    ASSERT_EMIT_EQ(reporter, *dict, "<</n1 24\n/n2 99\n/n3 .5\n/n4 /AName>>");
+    assert_emit_eq(reporter, *dict, "<</n1 24\n/n2 99\n/n3 .5\n/n4 /AName>>");
 
     dict->insertName("n5", SkString("AnotherName"));
-    ASSERT_EMIT_EQ(reporter, *dict, "<</n1 24\n/n2 99\n/n3 .5\n/n4 /AName\n"
+    assert_emit_eq(reporter, *dict, "<</n1 24\n/n2 99\n/n3 .5\n/n4 /AName\n"
                    "/n5 /AnotherName>>");
 
     dict->insertString("n6", "A String");
-    ASSERT_EMIT_EQ(reporter, *dict, "<</n1 24\n/n2 99\n/n3 .5\n/n4 /AName\n"
+    assert_emit_eq(reporter, *dict, "<</n1 24\n/n2 99\n/n3 .5\n/n4 /AName\n"
                    "/n5 /AnotherName\n/n6 (A String)>>");
 
     dict->insertString("n7", SkString("Another String"));
-    ASSERT_EMIT_EQ(reporter, *dict, "<</n1 24\n/n2 99\n/n3 .5\n/n4 /AName\n"
+    assert_emit_eq(reporter, *dict, "<</n1 24\n/n2 99\n/n3 .5\n/n4 /AName\n"
                    "/n5 /AnotherName\n/n6 (A String)\n/n7 (Another String)>>");
 
     dict.reset(new SkPDFDict("DType"));
-    ASSERT_EMIT_EQ(reporter, *dict, "<</Type /DType>>");
+    assert_emit_eq(reporter, *dict, "<</Type /DType>>");
 
     sk_sp<SkPDFArray> referencedArray(new SkPDFArray);
     Catalog catalog;
     catalog.numbers.addObject(referencedArray.get());
     REPORTER_ASSERT(reporter, catalog.numbers.getObjectNumber(
                             referencedArray.get()) == 1);
     dict->insertObjRef("n1", std::move(referencedArray));
     SkString result = emit_to_string(*dict, &catalog);
-    ASSERT_EQ(reporter, result, "<</Type /DType\n/n1 1 0 R>>");
+    assert_eq(reporter, result, "<</Type /DType\n/n1 1 0 R>>");
 }
 
 DEF_TEST(PDFPrimitives, reporter) {
     TestPDFUnion(reporter);
     TestPDFArray(reporter);
     TestPDFDict(reporter);
     TestPDFStream(reporter);
     TestObjectNumberMap(reporter);
     TestObjectRef(reporter);
     TestSubstitute(reporter);
@@ skipping 95 matching lines @@
         return;  // The terminator is needed for sscanf().
     }
     if (reporter->verbose()) {
         SkDebugf("%15.9g = \"%s\"\n", inputFloat, floatString);
     }
     float roundTripFloat;
     if (1 != sscanf(floatString, "%f", &roundTripFloat)) {
         ERRORF(reporter, "unscannable result: %s", floatString);
         return;
     }
-    if (isfinite(inputFloat) && roundTripFloat != inputFloat) {
+    if (std::isfinite(inputFloat) && roundTripFloat != inputFloat) {
         ERRORF(reporter, "roundTripFloat (%.9g) != inputFloat (%.9g)",
                roundTripFloat, inputFloat);
     }
 }
 
 // Test SkPDFUtils::AppendScalar for accuracy.
 DEF_TEST(PDFPrimitives_Scalar, reporter) {
     SkRandom random(0x5EED);
     int iterationCount = 512;
     while (iterationCount-- > 0) {
@@ skipping 18 matching lines @@
     char buffer[5];
     for (int i = 0; i < 256; ++i) {
         size_t len = SkPDFUtils::ColorToDecimal(i, buffer);
         REPORTER_ASSERT(reporter, len == strlen(buffer));
         float f;
         REPORTER_ASSERT(reporter, 1 == sscanf(buffer, "%f", &f));
         int roundTrip = (int)(0.5 + f * 255);
         REPORTER_ASSERT(reporter, roundTrip == i);
     }
 }