SkPDF: fix PDF/A

src/pdf/SkPDFMetadata.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkMilestone.h"
 #include "SkPDFMetadata.h"
 #include "SkPDFTypes.h"
@@ skipping 34 matching lines @@
     dict->insertString("Producer", "Skia/PDF m" SKPDF_STRING(SK_MILESTONE));
     if (fCreation) {
         dict->insertString("CreationDate", pdf_date(*fCreation.get()));
     }
     if (fModified) {
         dict->insertString("ModDate", pdf_date(*fModified.get()));
     }
     return dict.release();
 }
 
-#undef SKPDF_STRING
-#undef SKPDF_STRING_IMPL
-
 #ifdef SK_PDF_GENERATE_PDFA
 SkPDFMetadata::UUID SkPDFMetadata::uuid() const {
     // The main requirement is for the UUID to be unique; the exact
     // format of the data that will be hashed is not important.
     SkMD5 md5;
     const char uuidNamespace[] = "org.skia.pdf\n";
     md5.write(uuidNamespace, strlen(uuidNamespace));
     double msec = SkTime::GetMSecs();
     md5.write(&msec, sizeof(msec));
     SkTime::DateTime dateTime;
@@ skipping 222 matching lines @@
             "%s"  // CreateDate
             "%s"  // MetadataDate
             "%s"  // xmp:CreatorTool
             "<dc:format>application/pdf</dc:format>\n"
             "%s"  // dc:title
             "%s"  // dc:description
             "%s"  // author
             "%s"  // keywords
             "<xmpMM:DocumentID>uuid:%s</xmpMM:DocumentID>\n"
             "<xmpMM:InstanceID>uuid:%s</xmpMM:InstanceID>\n"
-            "<pdf:Producer>Skia/PDF</pdf:Producer>\n"
+            "<pdf:Producer>Skia/PDF m" SKPDF_STRING(SK_MILESTONE) "</pdf:Producer>\n"
             "%s"  // pdf:Keywords
             "</rdf:Description>\n"
             "</rdf:RDF>\n"
             "</x:xmpmeta>\n"  // Note:  the standard suggests 4k of padding.
             "<?xpacket end=\"w\"?>\n";
 
     SkString creationDate;
     SkString modificationDate;
     SkString metadataDate;
     if (fCreation) {
@@ skipping 38 matching lines @@
     SkString instanceID = uuid_to_string(instance);
     SkASSERT(0 == count_xml_escape_size(instanceID));
     return new PDFXMLObject(sk_string_printf(
             templateString, modificationDate.c_str(), creationDate.c_str(),
             metadataDate.c_str(), creator.c_str(), title.c_str(),
             subject.c_str(), author.c_str(), keywords1.c_str(),
             documentID.c_str(), instanceID.c_str(), keywords2.c_str()));
 }
 
 #endif  // SK_PDF_GENERATE_PDFA
+
+#undef SKPDF_STRING
+#undef SKPDF_STRING_IMPL
+