more work on pdf fonts, more to come

experimental/PdfViewer/SkPdfParser.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCanvas.h"
 #include "SkDevice.h"
 #include "SkForceLinking.h"
@@ skipping 16 matching lines @@
 
 
 __SK_FORCE_IMAGE_DECODER_LINKING;
 
 // TODO(edisonn): tool, show what objects were read at least, show the ones not even read
 // keep for each object pos in file
 // plug in for VS? syntax coloring, show selected object ... from the text, or from rendered x,y
 
 // TODO(edisonn): security - validate all the user input, all pdf!
 
+// TODO(edisonn): put drawtext in #ifdefs, so comparations will ignore minor changes in text positioning and font
+// this way, we look more at other features and layout in diffs
 
 #include "SkPdfHeaders_autogen.h"
 #include "SkPdfPodofoMapper_autogen.h"
 #include "SkPdfParser.h"
 
 #include "SkPdfBasics.h"
 #include "SkPdfUtils.h"
 
 #include "SkPdfFont.h"
 
@@ skipping 332 matching lines @@
     // TODO(edisonn): post rotate, skew
     mirror.postTranslate(0, point1.y());
 
     matrix.postConcat(mirror);
 
     canvas->setMatrix(matrix);
 
     SkTraceMatrix(matrix, "mirrored");
 #endif
 
-    skfont->drawText(decoded, &paint, pdfContext, canvas, &pdfContext->fGraphicsState.fMatrixTm);
+    skfont->drawText(decoded, &paint, pdfContext, canvas);
     canvas->restore();
 
     return kPartial_PdfResult;
 }
 
 // TODO(edisonn): create header files with declarations!
 PdfResult PdfOp_q(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper);
 PdfResult PdfOp_Q(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper);
 PdfResult PdfOp_Tw(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper);
 PdfResult PdfOp_Tc(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper);
@@ skipping 1927 matching lines @@
                 setup_bitmap(&bitmap, (int)SkScalarToDouble(rect.width()), (int)SkScalarToDouble(rect.height()));
     #endif
                 SkAutoTUnref<SkDevice> device(SkNEW_ARGS(SkDevice, (bitmap)));
                 SkCanvas canvas(device);
 
                 gDumpBitmap = &bitmap;
 
                 doc.drawPage(pn, &canvas);
 
                 SkString out;
-                out.appendf("%s-%i.png", inputFileName.c_str(), pn);
+                if (doc.pages() > 1) {
+                    out.appendf("%s-%i.png", inputFileName.c_str(), pn);
+                } else {
+                    out = inputFileName;
+                    // .pdf -> .png
+                    out[out.size() - 2] = 'n';
+                    out[out.size() - 1] = 'g';
+                }
                 SkImageEncoder::EncodeFile(out.c_str(), bitmap, SkImageEncoder::kPNG_Type, 100);
             }
             return true;
         }
     }
     catch( PdfError & e )
     {
         std::cout << "ERROR: PDF can't be parsed!" << inputFileName.c_str() << std::endl;
         return false;
     }
 
     return true;
 }