From ff27844d15da7e691d1b4c0adc57af64e108d9fa Mon Sep 17 00:00:00 2001 From: "edisonn@google.com" Date: Fri, 21 Jun 2013 21:03:15 +0000 Subject: load font manually, for now Type0 Review URL: https://codereview.chromium.org/17294008 git-svn-id: http://skia.googlecode.com/svn/trunk@9734 2bbb7eff-a529-9590-31e7-b0007b416f81 --- .../SkPdfALinkAnnotationDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfActionDictionary_autogen.h | 10 +- .../SkPdfAlternateImageDictionary_autogen.h | 16 +- .../SkPdfAnnotationActionsDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfAnnotationDictionary_autogen.h | 10 +- ...dfAppearanceCharacteristicsDictionary_autogen.h | 28 +- .../PdfViewer/SkPdfAppearanceDictionary_autogen.h | 28 +- .../SkPdfApplicationDataDictionary_autogen.h | 10 +- experimental/PdfViewer/SkPdfArray_autogen.h | 16 +- .../PdfViewer/SkPdfArtifactsDictionary_autogen.h | 10 +- .../SkPdfAttributeObjectDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfBeadDictionary_autogen.h | 10 +- ...BlockLevelStructureElementsDictionary_autogen.h | 10 +- experimental/PdfViewer/SkPdfBoolean_autogen.h | 13 +- .../PdfViewer/SkPdfBorderStyleDictionary_autogen.h | 10 +- .../SkPdfBoxColorInformationDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfBoxStyleDictionary_autogen.h | 10 +- .../SkPdfCIDFontDescriptorDictionary_autogen.h | 16 +- .../PdfViewer/SkPdfCIDFontDictionary_autogen.h | 16 +- .../SkPdfCIDSystemInfoDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfCMapDictionary_autogen.h | 16 +- .../SkPdfCalgrayColorSpaceDictionary_autogen.h | 10 +- .../SkPdfCalrgbColorSpaceDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfCatalogDictionary_autogen.h | 16 +- .../SkPdfCcittfaxdecodeFilterDictionary_autogen.h | 10 +- .../SkPdfCheckboxFieldDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfChoiceFieldDictionary_autogen.h | 10 +- ...SkPdfComponentsWithMetadataDictionary_autogen.h | 16 +- .../SkPdfDctdecodeFilterDictionary_autogen.h | 10 +- .../SkPdfDeviceNColorSpaceDictionary_autogen.h | 10 +- experimental/PdfViewer/SkPdfDictionary_autogen.h | 3 + ...SkPdfDocumentCatalogActionsDictionary_autogen.h | 10 +- .../SkPdfDocumentInformationDictionary_autogen.h | 10 +- .../SkPdfEmbeddedFileParameterDictionary_autogen.h | 10 +- .../SkPdfEmbeddedFileStreamDictionary_autogen.h | 10 +- .../SkPdfEmbeddedFontStreamDictionary_autogen.h | 16 +- .../PdfViewer/SkPdfEncodingDictionary_autogen.h | 10 +- ...EncryptedEmbeddedFileStreamDictionary_autogen.h | 10 +- .../SkPdfEncryptionCommonDictionary_autogen.h | 10 +- experimental/PdfViewer/SkPdfEnums_autogen.h | 7 +- .../PdfViewer/SkPdfFDFCatalogDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfFDFDictionary_autogen.h | 16 +- .../PdfViewer/SkPdfFDFFieldDictionary_autogen.h | 10 +- .../SkPdfFDFFileAnnotationDictionary_autogen.h | 10 +- .../SkPdfFDFNamedPageReferenceDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfFDFPageDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfFDFTemplateDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfFDFTrailerDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfFieldDictionary_autogen.h | 10 +- ...PdfFileAttachmentAnnotationDictionary_autogen.h | 10 +- .../SkPdfFileSpecificationDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfFileTrailerDictionary_autogen.h | 10 +- .../SkPdfFontDescriptorDictionary_autogen.h | 28 +- .../SkPdfFormFieldActionsDictionary_autogen.h | 10 +- .../SkPdfFreeTextAnnotationDictionary_autogen.h | 10 +- .../SkPdfFunctionCommonDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfGoToActionDictionary_autogen.h | 10 +- .../SkPdfGraphicsStateDictionary_autogen.h | 16 +- .../SkPdfGroupAttributesDictionary_autogen.h | 10 +- experimental/PdfViewer/SkPdfHeaders_autogen.h | 1 + .../PdfViewer/SkPdfHideActionDictionary_autogen.h | 10 +- .../SkPdfIccProfileStreamDictionary_autogen.h | 16 +- .../PdfViewer/SkPdfIconFitDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfImageDictionary_autogen.h | 18 +- .../SkPdfImportDataActionDictionary_autogen.h | 10 +- .../SkPdfInkAnnotationDictionary_autogen.h | 10 +- ...nlineLevelStructureElementsDictionary_autogen.h | 10 +- experimental/PdfViewer/SkPdfInteger_autogen.h | 13 +- .../SkPdfInteractiveFormDictionary_autogen.h | 10 +- .../SkPdfJavascriptActionDictionary_autogen.h | 16 +- .../PdfViewer/SkPdfJavascriptDictionary_autogen.h | 22 +- .../SkPdfJbig2DecodeFilterDictionary_autogen.h | 16 +- .../SkPdfLabColorSpaceDictionary_autogen.h | 10 +- .../SkPdfLaunchActionDictionary_autogen.h | 10 +- .../SkPdfLineAnnotationDictionary_autogen.h | 10 +- .../SkPdfListAttributeDictionary_autogen.h | 10 +- ...decodeAndFlatedecodeFiltersDictionary_autogen.h | 10 +- .../SkPdfMacOsFileInformationDictionary_autogen.h | 16 +- .../SkPdfMarkInformationDictionary_autogen.h | 10 +- ...SkPdfMarkedContentReferenceDictionary_autogen.h | 16 +- .../SkPdfMarkupAnnotationsDictionary_autogen.h | 10 +- .../SkPdfMetadataStreamDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfMovieActionDictionary_autogen.h | 10 +- .../SkPdfMovieActivationDictionary_autogen.h | 10 +- .../SkPdfMovieAnnotationDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfMovieDictionary_autogen.h | 16 +- .../SkPdfMultiMasterFontDictionary_autogen.h | 3 + .../PdfViewer/SkPdfNameDictionary_autogen.h | 10 +- .../SkPdfNameTreeNodeDictionary_autogen.h | 10 +- experimental/PdfViewer/SkPdfName_autogen.h | 13 +- .../SkPdfNamedActionsDictionary_autogen.h | 10 +- experimental/PdfViewer/SkPdfNull_autogen.h | 13 +- .../SkPdfNumberTreeNodeDictionary_autogen.h | 10 +- .../SkPdfObjectReferenceDictionary_autogen.h | 10 +- experimental/PdfViewer/SkPdfObject_autogen.h | 13 +- .../PdfViewer/SkPdfOpiVersionDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfOutlineDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfOutlineItemDictionary_autogen.h | 10 +- .../SkPdfPDF_XOutputIntentDictionary_autogen.h | 16 +- .../PdfViewer/SkPdfPSXobjectDictionary_autogen.h | 16 +- .../PdfViewer/SkPdfPageLabelDictionary_autogen.h | 10 +- .../SkPdfPageObjectActionsDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfPageObjectDictionary_autogen.h | 28 +- .../PdfViewer/SkPdfPagePieceDictionary_autogen.h | 10 +- .../SkPdfPageTreeNodeDictionary_autogen.h | 10 +- experimental/PdfViewer/SkPdfPodofoMapper_autogen.h | 47 ++- .../SkPdfPopUpAnnotationDictionary_autogen.h | 10 +- .../SkPdfPrinterMarkAnnotationDictionary_autogen.h | 10 +- .../SkPdfPrinterMarkFormDictionary_autogen.h | 10 +- .../SkPdfRadioButtonFieldDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfReferenceDictionary_autogen.h | 10 +- experimental/PdfViewer/SkPdfReference_autogen.h | 13 +- .../SkPdfRemoteGoToActionDictionary_autogen.h | 10 +- .../SkPdfResetFormActionDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfResourceDictionary_autogen.h | 10 +- .../SkPdfRubberStampAnnotationDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfSeparationDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfShadingDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfSignatureDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfSoftMaskDictionary_autogen.h | 16 +- .../SkPdfSoftMaskImageDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfSoundActionDictionary_autogen.h | 16 +- .../SkPdfSoundAnnotationDictionary_autogen.h | 16 +- .../PdfViewer/SkPdfSoundObjectDictionary_autogen.h | 10 +- .../SkPdfSourceInformationDictionary_autogen.h | 10 +- .../SkPdfSquareOrCircleAnnotation_autogen.h | 10 +- ...kPdfStandardSecurityHandlerDictionary_autogen.h | 10 +- .../SkPdfStandardStructureDictionary_autogen.h | 10 +- .../SkPdfStreamCommonDictionary_autogen.h | 10 +- experimental/PdfViewer/SkPdfString_autogen.h | 13 +- ...SkPdfStructureElementAccessDictionary_autogen.h | 10 +- .../SkPdfStructureElementDictionary_autogen.h | 10 +- .../SkPdfStructureTreeRootDictionary_autogen.h | 10 +- .../SkPdfSubmitFormActionDictionary_autogen.h | 10 +- .../SkPdfTableAttributesDictionary_autogen.h | 10 +- .../SkPdfTextAnnotationDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfTextFieldDictionary_autogen.h | 10 +- .../SkPdfThreadActionDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfThreadDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfTransitionDictionary_autogen.h | 10 +- .../SkPdfTransparencyGroupDictionary_autogen.h | 10 +- .../SkPdfTrapNetworkAnnotationDictionary_autogen.h | 10 +- ...TrapNetworkAppearanceStreamDictionary_autogen.h | 10 +- .../SkPdfTrueTypeFontDictionary_autogen.h | 29 +- .../PdfViewer/SkPdfType0FontDictionary_autogen.h | 21 +- .../SkPdfType0FunctionDictionary_autogen.h | 10 +- .../SkPdfType10HalftoneDictionary_autogen.h | 10 +- .../SkPdfType16HalftoneDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfType1FontDictionary_autogen.h | 9 +- .../PdfViewer/SkPdfType1FormDictionary_autogen.h | 6 +- .../SkPdfType1HalftoneDictionary_autogen.h | 10 +- .../SkPdfType1PatternDictionary_autogen.h | 10 +- .../SkPdfType2FunctionDictionary_autogen.h | 10 +- .../SkPdfType2PatternDictionary_autogen.h | 16 +- .../PdfViewer/SkPdfType3FontDictionary_autogen.h | 21 +- .../SkPdfType3FunctionDictionary_autogen.h | 10 +- .../SkPdfType5HalftoneDictionary_autogen.h | 22 +- .../SkPdfType6HalftoneDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfURIActionDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfURIDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfURLAliasDictionary_autogen.h | 10 +- .../SkPdfVariableTextFieldDictionary_autogen.h | 10 +- .../SkPdfViewerPreferencesDictionary_autogen.h | 10 +- .../SkPdfWebCaptureCommandDictionary_autogen.h | 16 +- ...dfWebCaptureCommandSettingsDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfWebCaptureDictionary_autogen.h | 10 +- .../SkPdfWebCaptureImageSetDictionary_autogen.h | 10 +- .../SkPdfWebCaptureInformationDictionary_autogen.h | 10 +- .../SkPdfWebCapturePageSetDictionary_autogen.h | 10 +- .../SkPdfWidgetAnnotationDictionary_autogen.h | 10 +- .../SkPdfWindowsLaunchActionDictionary_autogen.h | 10 +- .../PdfViewer/SkPdfXObjectDictionary_autogen.h | 10 +- experimental/PdfViewer/generate_code.py | 68 ++++- experimental/PdfViewer/pdf_viewer_main.cpp | 331 +++++++++++---------- experimental/PdfViewer/pdfspec_autogen.py | 10 +- experimental/PdfViewer/spec2def.py | 12 +- 176 files changed, 1277 insertions(+), 1174 deletions(-) (limited to 'experimental') diff --git a/experimental/PdfViewer/SkPdfALinkAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfALinkAnnotationDictionary_autogen.h index 65320a4a4d..5cf204758b 100644 --- a/experimental/PdfViewer/SkPdfALinkAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfALinkAnnotationDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfActionDictionary_autogen.h index 7d4b52db4b..7add016b2f 100644 --- a/experimental/PdfViewer/SkPdfActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfActionDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfAlternateImageDictionary_autogen.h b/experimental/PdfViewer/SkPdfAlternateImageDictionary_autogen.h index 1a7ae95548..b2012c343c 100644 --- a/experimental/PdfViewer/SkPdfAlternateImageDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfAlternateImageDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -528,11 +528,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Image", "", NULL)); } - SkPdfStream Image() const { - SkPdfStream ret; + SkPdfStream* Image() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Image", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } /** (Optional) A flag indicating whether this alternate image is the default ver- diff --git a/experimental/PdfViewer/SkPdfAnnotationActionsDictionary_autogen.h b/experimental/PdfViewer/SkPdfAnnotationActionsDictionary_autogen.h index 7d5ebcf726..36e8f0b397 100644 --- a/experimental/PdfViewer/SkPdfAnnotationActionsDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfAnnotationActionsDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfAnnotationDictionary_autogen.h index de92d52fcd..9fb25f09c1 100644 --- a/experimental/PdfViewer/SkPdfAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfAnnotationDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfAppearanceCharacteristicsDictionary_autogen.h b/experimental/PdfViewer/SkPdfAppearanceCharacteristicsDictionary_autogen.h index 8c164375f3..03a506a8c1 100644 --- a/experimental/PdfViewer/SkPdfAppearanceCharacteristicsDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfAppearanceCharacteristicsDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -626,11 +626,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "I", "", NULL)); } - SkPdfStream I() const { - SkPdfStream ret; + SkPdfStream* I() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "I", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } /** (Optional; pushbutton fields only; must be an indirect reference) A form XObject @@ -641,11 +641,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "RI", "", NULL)); } - SkPdfStream RI() const { - SkPdfStream ret; + SkPdfStream* RI() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "RI", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } /** (Optional; pushbutton fields only; must be an indirect reference) A form XObject @@ -656,11 +656,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "IX", "", NULL)); } - SkPdfStream IX() const { - SkPdfStream ret; + SkPdfStream* IX() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "IX", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } /** (Optional; pushbutton fields only) An icon fit dictionary (see Table 8.73 on page diff --git a/experimental/PdfViewer/SkPdfAppearanceDictionary_autogen.h b/experimental/PdfViewer/SkPdfAppearanceDictionary_autogen.h index c73b1fb016..95567b433e 100644 --- a/experimental/PdfViewer/SkPdfAppearanceDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfAppearanceDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -534,11 +534,11 @@ public: return ret->podofo()->HasStream(); } - SkPdfStream getNAsStream() const { - SkPdfStream ret = SkPdfStream(); + SkPdfStream* getNAsStream() const { + SkPdfStream* ret = NULL; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "N", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } bool isNADictionary() const { @@ -567,11 +567,11 @@ public: return ret->podofo()->HasStream(); } - SkPdfStream getRAsStream() const { - SkPdfStream ret = SkPdfStream(); + SkPdfStream* getRAsStream() const { + SkPdfStream* ret = NULL; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "R", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } bool isRADictionary() const { @@ -600,11 +600,11 @@ public: return ret->podofo()->HasStream(); } - SkPdfStream getDAsStream() const { - SkPdfStream ret = SkPdfStream(); + SkPdfStream* getDAsStream() const { + SkPdfStream* ret = NULL; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "D", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } bool isDADictionary() const { diff --git a/experimental/PdfViewer/SkPdfApplicationDataDictionary_autogen.h b/experimental/PdfViewer/SkPdfApplicationDataDictionary_autogen.h index c4526ec97b..1a4618e49e 100644 --- a/experimental/PdfViewer/SkPdfApplicationDataDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfApplicationDataDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfArray_autogen.h b/experimental/PdfViewer/SkPdfArray_autogen.h index 2256f33b2c..a153997f05 100644 --- a/experimental/PdfViewer/SkPdfArray_autogen.h +++ b/experimental/PdfViewer/SkPdfArray_autogen.h @@ -170,20 +170,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -536,6 +536,9 @@ private: virtual SkPdfReference* asReference() {return NULL;} virtual const SkPdfReference* asReference() const {return NULL;} + virtual SkPdfStream* asStream() {return NULL;} + virtual const SkPdfStream* asStream() const {return NULL;} + virtual SkPdfString* asString() {return NULL;} virtual const SkPdfString* asString() const {return NULL;} @@ -544,8 +547,7 @@ private: public: const int size() const {return fPodofoObj->GetArray().GetSize();} - const SkPdfObject operator[](int i) const {return SkPdfObject(fPodofoDoc, &fPodofoObj->GetArray()[i]);} - SkPdfObject operator[](int i) {return SkPdfObject(fPodofoDoc, &fPodofoObj->GetArray()[i]);} + SkPdfObject* operator[](int i) const {return new SkPdfObject(fPodofoDoc, &fPodofoObj->GetArray()[i]);} private: public: SkPdfArray(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfObject(podofoDoc, podofoObj) {} diff --git a/experimental/PdfViewer/SkPdfArtifactsDictionary_autogen.h b/experimental/PdfViewer/SkPdfArtifactsDictionary_autogen.h index b303a88ed0..872b0488d1 100644 --- a/experimental/PdfViewer/SkPdfArtifactsDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfArtifactsDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfAttributeObjectDictionary_autogen.h b/experimental/PdfViewer/SkPdfAttributeObjectDictionary_autogen.h index eff5f27398..b1d0423b3d 100644 --- a/experimental/PdfViewer/SkPdfAttributeObjectDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfAttributeObjectDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfBeadDictionary_autogen.h b/experimental/PdfViewer/SkPdfBeadDictionary_autogen.h index 8d0545214b..1da4af7087 100644 --- a/experimental/PdfViewer/SkPdfBeadDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfBeadDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfBlockLevelStructureElementsDictionary_autogen.h b/experimental/PdfViewer/SkPdfBlockLevelStructureElementsDictionary_autogen.h index 8041c7cb98..78a7de01c7 100644 --- a/experimental/PdfViewer/SkPdfBlockLevelStructureElementsDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfBlockLevelStructureElementsDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfBoolean_autogen.h b/experimental/PdfViewer/SkPdfBoolean_autogen.h index d422501a68..72540e86a1 100644 --- a/experimental/PdfViewer/SkPdfBoolean_autogen.h +++ b/experimental/PdfViewer/SkPdfBoolean_autogen.h @@ -170,20 +170,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -536,6 +536,9 @@ private: virtual SkPdfReference* asReference() {return NULL;} virtual const SkPdfReference* asReference() const {return NULL;} + virtual SkPdfStream* asStream() {return NULL;} + virtual const SkPdfStream* asStream() const {return NULL;} + virtual SkPdfString* asString() {return NULL;} virtual const SkPdfString* asString() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfBorderStyleDictionary_autogen.h b/experimental/PdfViewer/SkPdfBorderStyleDictionary_autogen.h index c7ea5f5354..a4110e1426 100644 --- a/experimental/PdfViewer/SkPdfBorderStyleDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfBorderStyleDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfBoxColorInformationDictionary_autogen.h b/experimental/PdfViewer/SkPdfBoxColorInformationDictionary_autogen.h index ea26ccdcf7..b5148f9b3f 100644 --- a/experimental/PdfViewer/SkPdfBoxColorInformationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfBoxColorInformationDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfBoxStyleDictionary_autogen.h b/experimental/PdfViewer/SkPdfBoxStyleDictionary_autogen.h index e91a7d95e3..bd340e5dbd 100644 --- a/experimental/PdfViewer/SkPdfBoxStyleDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfBoxStyleDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfCIDFontDescriptorDictionary_autogen.h b/experimental/PdfViewer/SkPdfCIDFontDescriptorDictionary_autogen.h index 0be2a828ad..7faf8be283 100644 --- a/experimental/PdfViewer/SkPdfCIDFontDescriptorDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfCIDFontDescriptorDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -582,11 +582,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "CIDSet", "", NULL)); } - SkPdfStream CIDSet() const { - SkPdfStream ret; + SkPdfStream* CIDSet() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "CIDSet", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } }; diff --git a/experimental/PdfViewer/SkPdfCIDFontDictionary_autogen.h b/experimental/PdfViewer/SkPdfCIDFontDictionary_autogen.h index 297e33e355..a25e7147f4 100644 --- a/experimental/PdfViewer/SkPdfCIDFontDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfCIDFontDictionary_autogen.h @@ -15,20 +15,20 @@ public: virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return this;} private: - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} public: private: @@ -194,11 +194,11 @@ public: return ret->podofo()->HasStream(); } - SkPdfStream getCIDToGIDMapAsStream() const { - SkPdfStream ret = SkPdfStream(); + SkPdfStream* getCIDToGIDMapAsStream() const { + SkPdfStream* ret = NULL; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "CIDToGIDMap", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } bool isCIDToGIDMapAName() const { diff --git a/experimental/PdfViewer/SkPdfCIDSystemInfoDictionary_autogen.h b/experimental/PdfViewer/SkPdfCIDSystemInfoDictionary_autogen.h index 192991289c..2aab84dcac 100644 --- a/experimental/PdfViewer/SkPdfCIDSystemInfoDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfCIDSystemInfoDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfCMapDictionary_autogen.h b/experimental/PdfViewer/SkPdfCMapDictionary_autogen.h index d07bbefe83..52723c55c9 100644 --- a/experimental/PdfViewer/SkPdfCMapDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfCMapDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -644,11 +644,11 @@ public: return ret->podofo()->HasStream(); } - SkPdfStream getUseCMapAsStream() const { - SkPdfStream ret = SkPdfStream(); + SkPdfStream* getUseCMapAsStream() const { + SkPdfStream* ret = NULL; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "UseCMap", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } }; diff --git a/experimental/PdfViewer/SkPdfCalgrayColorSpaceDictionary_autogen.h b/experimental/PdfViewer/SkPdfCalgrayColorSpaceDictionary_autogen.h index 8b6fa38ccd..fa99b55ffa 100644 --- a/experimental/PdfViewer/SkPdfCalgrayColorSpaceDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfCalgrayColorSpaceDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfCalrgbColorSpaceDictionary_autogen.h b/experimental/PdfViewer/SkPdfCalrgbColorSpaceDictionary_autogen.h index d204278dce..58888febc7 100644 --- a/experimental/PdfViewer/SkPdfCalrgbColorSpaceDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfCalrgbColorSpaceDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfCatalogDictionary_autogen.h b/experimental/PdfViewer/SkPdfCatalogDictionary_autogen.h index 7737435dd3..1f9ca32303 100644 --- a/experimental/PdfViewer/SkPdfCatalogDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfCatalogDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -817,11 +817,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Metadata", "", NULL)); } - SkPdfStream Metadata() const { - SkPdfStream ret; + SkPdfStream* Metadata() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Metadata", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } /** (Optional; PDF 1.3) The document's structure tree root dictionary (see diff --git a/experimental/PdfViewer/SkPdfCcittfaxdecodeFilterDictionary_autogen.h b/experimental/PdfViewer/SkPdfCcittfaxdecodeFilterDictionary_autogen.h index b5f9e11da3..91ce1bada1 100644 --- a/experimental/PdfViewer/SkPdfCcittfaxdecodeFilterDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfCcittfaxdecodeFilterDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfCheckboxFieldDictionary_autogen.h b/experimental/PdfViewer/SkPdfCheckboxFieldDictionary_autogen.h index 2902e4744e..9f39499b19 100644 --- a/experimental/PdfViewer/SkPdfCheckboxFieldDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfCheckboxFieldDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfChoiceFieldDictionary_autogen.h b/experimental/PdfViewer/SkPdfChoiceFieldDictionary_autogen.h index db81967655..7054e7a5f7 100644 --- a/experimental/PdfViewer/SkPdfChoiceFieldDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfChoiceFieldDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfComponentsWithMetadataDictionary_autogen.h b/experimental/PdfViewer/SkPdfComponentsWithMetadataDictionary_autogen.h index 8c9122f074..dbf256ec68 100644 --- a/experimental/PdfViewer/SkPdfComponentsWithMetadataDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfComponentsWithMetadataDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -528,11 +528,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Metadata", "", NULL)); } - SkPdfStream Metadata() const { - SkPdfStream ret; + SkPdfStream* Metadata() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Metadata", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } }; diff --git a/experimental/PdfViewer/SkPdfDctdecodeFilterDictionary_autogen.h b/experimental/PdfViewer/SkPdfDctdecodeFilterDictionary_autogen.h index 9cdb5bccb7..8e42fd240a 100644 --- a/experimental/PdfViewer/SkPdfDctdecodeFilterDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfDctdecodeFilterDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfDeviceNColorSpaceDictionary_autogen.h b/experimental/PdfViewer/SkPdfDeviceNColorSpaceDictionary_autogen.h index 8234f81ff2..b9cda4bbc3 100644 --- a/experimental/PdfViewer/SkPdfDeviceNColorSpaceDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfDeviceNColorSpaceDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfDictionary_autogen.h b/experimental/PdfViewer/SkPdfDictionary_autogen.h index 0fda48dd4b..07fcd3b23b 100644 --- a/experimental/PdfViewer/SkPdfDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfDictionary_autogen.h @@ -35,6 +35,9 @@ private: virtual SkPdfReference* asReference() {return NULL;} virtual const SkPdfReference* asReference() const {return NULL;} + virtual SkPdfStream* asStream() {return NULL;} + virtual const SkPdfStream* asStream() const {return NULL;} + virtual SkPdfString* asString() {return NULL;} virtual const SkPdfString* asString() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfDocumentCatalogActionsDictionary_autogen.h b/experimental/PdfViewer/SkPdfDocumentCatalogActionsDictionary_autogen.h index 0cd2734edb..1fea0253c0 100644 --- a/experimental/PdfViewer/SkPdfDocumentCatalogActionsDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfDocumentCatalogActionsDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfDocumentInformationDictionary_autogen.h b/experimental/PdfViewer/SkPdfDocumentInformationDictionary_autogen.h index 71c81fae1c..2a065745d2 100644 --- a/experimental/PdfViewer/SkPdfDocumentInformationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfDocumentInformationDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfEmbeddedFileParameterDictionary_autogen.h b/experimental/PdfViewer/SkPdfEmbeddedFileParameterDictionary_autogen.h index ee48af86d5..b1524508a6 100644 --- a/experimental/PdfViewer/SkPdfEmbeddedFileParameterDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfEmbeddedFileParameterDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfEmbeddedFileStreamDictionary_autogen.h b/experimental/PdfViewer/SkPdfEmbeddedFileStreamDictionary_autogen.h index 1de81c8b46..c90d693bb8 100644 --- a/experimental/PdfViewer/SkPdfEmbeddedFileStreamDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfEmbeddedFileStreamDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfEmbeddedFontStreamDictionary_autogen.h b/experimental/PdfViewer/SkPdfEmbeddedFontStreamDictionary_autogen.h index f131d8fb78..fad070eb34 100644 --- a/experimental/PdfViewer/SkPdfEmbeddedFontStreamDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfEmbeddedFontStreamDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -591,11 +591,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Metadata", "", NULL)); } - SkPdfStream Metadata() const { - SkPdfStream ret; + SkPdfStream* Metadata() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Metadata", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } }; diff --git a/experimental/PdfViewer/SkPdfEncodingDictionary_autogen.h b/experimental/PdfViewer/SkPdfEncodingDictionary_autogen.h index 86b295ddc1..3c92f280b0 100644 --- a/experimental/PdfViewer/SkPdfEncodingDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfEncodingDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfEncryptedEmbeddedFileStreamDictionary_autogen.h b/experimental/PdfViewer/SkPdfEncryptedEmbeddedFileStreamDictionary_autogen.h index d87123b7ec..008fb32374 100644 --- a/experimental/PdfViewer/SkPdfEncryptedEmbeddedFileStreamDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfEncryptedEmbeddedFileStreamDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfEncryptionCommonDictionary_autogen.h b/experimental/PdfViewer/SkPdfEncryptionCommonDictionary_autogen.h index eefdc397bb..4539b26623 100644 --- a/experimental/PdfViewer/SkPdfEncryptionCommonDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfEncryptionCommonDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfEnums_autogen.h b/experimental/PdfViewer/SkPdfEnums_autogen.h index 8c196421bd..1e0e87961f 100644 --- a/experimental/PdfViewer/SkPdfEnums_autogen.h +++ b/experimental/PdfViewer/SkPdfEnums_autogen.h @@ -56,12 +56,13 @@ enum SkPdfObjectType { kFontDescriptorDictionary_SkPdfObjectType, kFontDictionary_SkPdfObjectType, kCIDFontDictionary_SkPdfObjectType, - kTrueTypeFontDictionary_SkPdfObjectType, kType0FontDictionary_SkPdfObjectType, + kType3FontDictionary_SkPdfObjectType, + kType0FontDictionary__End_SkPdfObjectType, kType1FontDictionary_SkPdfObjectType, kMultiMasterFontDictionary_SkPdfObjectType, + kTrueTypeFontDictionary_SkPdfObjectType, kType1FontDictionary__End_SkPdfObjectType, - kType3FontDictionary_SkPdfObjectType, kFontDictionary__End_SkPdfObjectType, kFormFieldActionsDictionary_SkPdfObjectType, kFreeTextAnnotationDictionary_SkPdfObjectType, @@ -184,6 +185,7 @@ enum SkPdfObjectType { kName_SkPdfObjectType, kNull_SkPdfObjectType, kReference_SkPdfObjectType, + kStream_SkPdfObjectType, kString_SkPdfObjectType, kHexString_SkPdfObjectType, kString__End_SkPdfObjectType, @@ -201,6 +203,7 @@ class SkPdfArray; class SkPdfString; class SkPdfHexString; class SkPdfDictionary; +class SkPdfStream; class SkPdfXObjectDictionary; class SkPdfFontDictionary; class SkPdfTrueTypeFontDictionary; diff --git a/experimental/PdfViewer/SkPdfFDFCatalogDictionary_autogen.h b/experimental/PdfViewer/SkPdfFDFCatalogDictionary_autogen.h index 4f793a25f7..c7b19d4447 100644 --- a/experimental/PdfViewer/SkPdfFDFCatalogDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFDFCatalogDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfFDFDictionary_autogen.h b/experimental/PdfViewer/SkPdfFDFDictionary_autogen.h index 680d467fbe..ae36857be7 100644 --- a/experimental/PdfViewer/SkPdfFDFDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFDFDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -657,11 +657,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Differences", "", NULL)); } - SkPdfStream Differences() const { - SkPdfStream ret; + SkPdfStream* Differences() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Differences", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } /** (Optional; PDF 1.4) The name of a browser frame in which the un- diff --git a/experimental/PdfViewer/SkPdfFDFFieldDictionary_autogen.h b/experimental/PdfViewer/SkPdfFDFFieldDictionary_autogen.h index 9daada82e1..2ce38bea87 100644 --- a/experimental/PdfViewer/SkPdfFDFFieldDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFDFFieldDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfFDFFileAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfFDFFileAnnotationDictionary_autogen.h index c46deb73dc..19df322ec6 100644 --- a/experimental/PdfViewer/SkPdfFDFFileAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFDFFileAnnotationDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfFDFNamedPageReferenceDictionary_autogen.h b/experimental/PdfViewer/SkPdfFDFNamedPageReferenceDictionary_autogen.h index dab7a307e0..9be142d6ee 100644 --- a/experimental/PdfViewer/SkPdfFDFNamedPageReferenceDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFDFNamedPageReferenceDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfFDFPageDictionary_autogen.h b/experimental/PdfViewer/SkPdfFDFPageDictionary_autogen.h index 28a197cfee..bc5a546044 100644 --- a/experimental/PdfViewer/SkPdfFDFPageDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFDFPageDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfFDFTemplateDictionary_autogen.h b/experimental/PdfViewer/SkPdfFDFTemplateDictionary_autogen.h index 10b7d5527d..75c5be1d42 100644 --- a/experimental/PdfViewer/SkPdfFDFTemplateDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFDFTemplateDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfFDFTrailerDictionary_autogen.h b/experimental/PdfViewer/SkPdfFDFTrailerDictionary_autogen.h index 058a5e8e5a..c35a9fa0a5 100644 --- a/experimental/PdfViewer/SkPdfFDFTrailerDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFDFTrailerDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfFieldDictionary_autogen.h b/experimental/PdfViewer/SkPdfFieldDictionary_autogen.h index 809cc43d01..4ae49fbbbb 100644 --- a/experimental/PdfViewer/SkPdfFieldDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFieldDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfFileAttachmentAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfFileAttachmentAnnotationDictionary_autogen.h index 6e803d75e4..d0e08cd0e4 100644 --- a/experimental/PdfViewer/SkPdfFileAttachmentAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFileAttachmentAnnotationDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfFileSpecificationDictionary_autogen.h b/experimental/PdfViewer/SkPdfFileSpecificationDictionary_autogen.h index 8eb25d6a91..c2e8a052e5 100644 --- a/experimental/PdfViewer/SkPdfFileSpecificationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFileSpecificationDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfFileTrailerDictionary_autogen.h b/experimental/PdfViewer/SkPdfFileTrailerDictionary_autogen.h index 460fe78467..81d6cb9991 100644 --- a/experimental/PdfViewer/SkPdfFileTrailerDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFileTrailerDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfFontDescriptorDictionary_autogen.h b/experimental/PdfViewer/SkPdfFontDescriptorDictionary_autogen.h index f67241ad13..9e62f487ea 100644 --- a/experimental/PdfViewer/SkPdfFontDescriptorDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFontDescriptorDictionary_autogen.h @@ -162,20 +162,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -745,11 +745,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "FontFile", "", NULL)); } - SkPdfStream FontFile() const { - SkPdfStream ret; + SkPdfStream* FontFile() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "FontFile", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } /** (Optional; PDF 1.1) A stream containing a TrueType font program (see Sec- @@ -759,11 +759,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "FontFile2", "", NULL)); } - SkPdfStream FontFile2() const { - SkPdfStream ret; + SkPdfStream* FontFile2() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "FontFile2", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } /** (Optional; PDF 1.2) A stream containing a font program other than Type 1 or @@ -777,11 +777,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "FontFile3", "", NULL)); } - SkPdfStream FontFile3() const { - SkPdfStream ret; + SkPdfStream* FontFile3() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "FontFile3", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } /** (Optional; meaningful only in Type 1 fonts; PDF 1.1) A string listing the char- diff --git a/experimental/PdfViewer/SkPdfFormFieldActionsDictionary_autogen.h b/experimental/PdfViewer/SkPdfFormFieldActionsDictionary_autogen.h index 9523052a03..51b794552e 100644 --- a/experimental/PdfViewer/SkPdfFormFieldActionsDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFormFieldActionsDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFreeTextAnnotationDictionary* asFreeTextAnnotationDictionary() {return NULL;} virtual const SkPdfFreeTextAnnotationDictionary* asFreeTextAnnotationDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfFreeTextAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfFreeTextAnnotationDictionary_autogen.h index 8b2a7dbc76..22aa69f642 100644 --- a/experimental/PdfViewer/SkPdfFreeTextAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFreeTextAnnotationDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfFunctionCommonDictionary_autogen.h b/experimental/PdfViewer/SkPdfFunctionCommonDictionary_autogen.h index 4b182527e4..d1788aac92 100644 --- a/experimental/PdfViewer/SkPdfFunctionCommonDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFunctionCommonDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfGoToActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfGoToActionDictionary_autogen.h index 133912cd9c..62216e1767 100644 --- a/experimental/PdfViewer/SkPdfGoToActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfGoToActionDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfGraphicsStateDictionary_autogen.h b/experimental/PdfViewer/SkPdfGraphicsStateDictionary_autogen.h index 6734c0d1fc..209551c23d 100644 --- a/experimental/PdfViewer/SkPdfGraphicsStateDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfGraphicsStateDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -906,11 +906,11 @@ public: return ret->podofo()->HasStream(); } - SkPdfStream getHTAsStream() const { - SkPdfStream ret = SkPdfStream(); + SkPdfStream* getHTAsStream() const { + SkPdfStream* ret = NULL; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "HT", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } bool isHTAName() const { diff --git a/experimental/PdfViewer/SkPdfGroupAttributesDictionary_autogen.h b/experimental/PdfViewer/SkPdfGroupAttributesDictionary_autogen.h index c1f7e7fa1a..915752a207 100644 --- a/experimental/PdfViewer/SkPdfGroupAttributesDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfGroupAttributesDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfHeaders_autogen.h b/experimental/PdfViewer/SkPdfHeaders_autogen.h index 049762d0da..089719837f 100644 --- a/experimental/PdfViewer/SkPdfHeaders_autogen.h +++ b/experimental/PdfViewer/SkPdfHeaders_autogen.h @@ -78,6 +78,7 @@ #include "SkPdfFDFCatalogDictionary_autogen.h" #include "SkPdfALinkAnnotationDictionary_autogen.h" #include "SkPdfAppearanceCharacteristicsDictionary_autogen.h" +#include "SkPdfStream_autogen.h" #include "SkPdfTransitionDictionary_autogen.h" #include "SkPdfApplicationDataDictionary_autogen.h" #include "SkPdfFileAttachmentAnnotationDictionary_autogen.h" diff --git a/experimental/PdfViewer/SkPdfHideActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfHideActionDictionary_autogen.h index 47b9bfd64d..3cb56a5cd2 100644 --- a/experimental/PdfViewer/SkPdfHideActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfHideActionDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfIccProfileStreamDictionary_autogen.h b/experimental/PdfViewer/SkPdfIccProfileStreamDictionary_autogen.h index 5fc6e2ca25..32ec6b82c6 100644 --- a/experimental/PdfViewer/SkPdfIccProfileStreamDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfIccProfileStreamDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -602,11 +602,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Metadata", "", NULL)); } - SkPdfStream Metadata() const { - SkPdfStream ret; + SkPdfStream* Metadata() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Metadata", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } }; diff --git a/experimental/PdfViewer/SkPdfIconFitDictionary_autogen.h b/experimental/PdfViewer/SkPdfIconFitDictionary_autogen.h index 1946aadb21..371f67328d 100644 --- a/experimental/PdfViewer/SkPdfIconFitDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfIconFitDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfImageDictionary_autogen.h b/experimental/PdfViewer/SkPdfImageDictionary_autogen.h index b7e4c5d0a3..209d121cab 100644 --- a/experimental/PdfViewer/SkPdfImageDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfImageDictionary_autogen.h @@ -187,11 +187,11 @@ public: return ret->podofo()->HasStream(); } - SkPdfStream getMaskAsStream() const { - SkPdfStream ret = SkPdfStream(); + SkPdfStream* getMaskAsStream() const { + SkPdfStream* ret = NULL; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Mask", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } bool isMaskAArray() const { @@ -222,11 +222,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "SMask", "", NULL)); } - SkPdfStream SMask() const { - SkPdfStream ret; + SkPdfStream* SMask() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "SMask", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } /** (Optional) An array of numbers describing how to map image samples @@ -346,11 +346,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Metadata", "", NULL)); } - SkPdfStream Metadata() const { - SkPdfStream ret; + SkPdfStream* Metadata() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Metadata", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } }; diff --git a/experimental/PdfViewer/SkPdfImportDataActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfImportDataActionDictionary_autogen.h index e299942f8f..96f307dda1 100644 --- a/experimental/PdfViewer/SkPdfImportDataActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfImportDataActionDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfInkAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfInkAnnotationDictionary_autogen.h index fa67791f11..fc8f72c1f9 100644 --- a/experimental/PdfViewer/SkPdfInkAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfInkAnnotationDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfInlineLevelStructureElementsDictionary_autogen.h b/experimental/PdfViewer/SkPdfInlineLevelStructureElementsDictionary_autogen.h index 5d80f16011..bc10fd5cbb 100644 --- a/experimental/PdfViewer/SkPdfInlineLevelStructureElementsDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfInlineLevelStructureElementsDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfInteger_autogen.h b/experimental/PdfViewer/SkPdfInteger_autogen.h index 7ccfa90031..624e1b8590 100644 --- a/experimental/PdfViewer/SkPdfInteger_autogen.h +++ b/experimental/PdfViewer/SkPdfInteger_autogen.h @@ -173,20 +173,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -533,6 +533,9 @@ private: virtual SkPdfReference* asReference() {return NULL;} virtual const SkPdfReference* asReference() const {return NULL;} + virtual SkPdfStream* asStream() {return NULL;} + virtual const SkPdfStream* asStream() const {return NULL;} + virtual SkPdfString* asString() {return NULL;} virtual const SkPdfString* asString() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfInteractiveFormDictionary_autogen.h b/experimental/PdfViewer/SkPdfInteractiveFormDictionary_autogen.h index f52cddabf4..180bb3f3c0 100644 --- a/experimental/PdfViewer/SkPdfInteractiveFormDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfInteractiveFormDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfJavascriptActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfJavascriptActionDictionary_autogen.h index 9d7f06d54f..91fe460c3d 100644 --- a/experimental/PdfViewer/SkPdfJavascriptActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfJavascriptActionDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -564,11 +564,11 @@ public: return ret->podofo()->HasStream(); } - SkPdfStream getJSAsStream() const { - SkPdfStream ret = SkPdfStream(); + SkPdfStream* getJSAsStream() const { + SkPdfStream* ret = NULL; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "JS", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } }; diff --git a/experimental/PdfViewer/SkPdfJavascriptDictionary_autogen.h b/experimental/PdfViewer/SkPdfJavascriptDictionary_autogen.h index f033bf6f5a..2e4892dfa1 100644 --- a/experimental/PdfViewer/SkPdfJavascriptDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfJavascriptDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -548,11 +548,11 @@ public: return ret->podofo()->HasStream(); } - SkPdfStream getBeforeAsStream() const { - SkPdfStream ret = SkPdfStream(); + SkPdfStream* getBeforeAsStream() const { + SkPdfStream* ret = NULL; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Before", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } /** (Optional) A string or stream containing a JavaScript script to be executed @@ -581,11 +581,11 @@ public: return ret->podofo()->HasStream(); } - SkPdfStream getAfterAsStream() const { - SkPdfStream ret = SkPdfStream(); + SkPdfStream* getAfterAsStream() const { + SkPdfStream* ret = NULL; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "After", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } /** (Optional) An array defining additional JavaScript scripts to be added to diff --git a/experimental/PdfViewer/SkPdfJbig2DecodeFilterDictionary_autogen.h b/experimental/PdfViewer/SkPdfJbig2DecodeFilterDictionary_autogen.h index 610c5ed77f..6adfae82ab 100644 --- a/experimental/PdfViewer/SkPdfJbig2DecodeFilterDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfJbig2DecodeFilterDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -530,11 +530,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "JBIG2Globals", "", NULL)); } - SkPdfStream JBIG2Globals() const { - SkPdfStream ret; + SkPdfStream* JBIG2Globals() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "JBIG2Globals", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } }; diff --git a/experimental/PdfViewer/SkPdfLabColorSpaceDictionary_autogen.h b/experimental/PdfViewer/SkPdfLabColorSpaceDictionary_autogen.h index 12dfe62d3a..57cc98d4f2 100644 --- a/experimental/PdfViewer/SkPdfLabColorSpaceDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfLabColorSpaceDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfLaunchActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfLaunchActionDictionary_autogen.h index c8a5ffbb79..1a373cc3ea 100644 --- a/experimental/PdfViewer/SkPdfLaunchActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfLaunchActionDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfLineAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfLineAnnotationDictionary_autogen.h index 4ad697b2da..94777ba7da 100644 --- a/experimental/PdfViewer/SkPdfLineAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfLineAnnotationDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfListAttributeDictionary_autogen.h b/experimental/PdfViewer/SkPdfListAttributeDictionary_autogen.h index 6935b69404..7dee0312cb 100644 --- a/experimental/PdfViewer/SkPdfListAttributeDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfListAttributeDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_autogen.h b/experimental/PdfViewer/SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_autogen.h index 4863a7a4d0..3a04693256 100644 --- a/experimental/PdfViewer/SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfMacOsFileInformationDictionary_autogen.h b/experimental/PdfViewer/SkPdfMacOsFileInformationDictionary_autogen.h index e476173a90..4d58b49920 100644 --- a/experimental/PdfViewer/SkPdfMacOsFileInformationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfMacOsFileInformationDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -554,11 +554,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "ResFork", "", NULL)); } - SkPdfStream ResFork() const { - SkPdfStream ret; + SkPdfStream* ResFork() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "ResFork", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } }; diff --git a/experimental/PdfViewer/SkPdfMarkInformationDictionary_autogen.h b/experimental/PdfViewer/SkPdfMarkInformationDictionary_autogen.h index 1a15e22420..468f26ba0e 100644 --- a/experimental/PdfViewer/SkPdfMarkInformationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfMarkInformationDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfMarkedContentReferenceDictionary_autogen.h b/experimental/PdfViewer/SkPdfMarkedContentReferenceDictionary_autogen.h index 3ada571a53..8dcc349404 100644 --- a/experimental/PdfViewer/SkPdfMarkedContentReferenceDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfMarkedContentReferenceDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -563,11 +563,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Stm", "", NULL)); } - SkPdfStream Stm() const { - SkPdfStream ret; + SkPdfStream* Stm() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Stm", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } /** (Optional; must be an indirect reference) The PDF object owning the stream diff --git a/experimental/PdfViewer/SkPdfMarkupAnnotationsDictionary_autogen.h b/experimental/PdfViewer/SkPdfMarkupAnnotationsDictionary_autogen.h index 77f4460f24..711fad4648 100644 --- a/experimental/PdfViewer/SkPdfMarkupAnnotationsDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfMarkupAnnotationsDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfMetadataStreamDictionary_autogen.h b/experimental/PdfViewer/SkPdfMetadataStreamDictionary_autogen.h index d861ef8c8f..d5faf30941 100644 --- a/experimental/PdfViewer/SkPdfMetadataStreamDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfMetadataStreamDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfMovieActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfMovieActionDictionary_autogen.h index 32fab6ffb1..d307c1b0b1 100644 --- a/experimental/PdfViewer/SkPdfMovieActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfMovieActionDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfMovieActivationDictionary_autogen.h b/experimental/PdfViewer/SkPdfMovieActivationDictionary_autogen.h index d917e5c185..608c821570 100644 --- a/experimental/PdfViewer/SkPdfMovieActivationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfMovieActivationDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfMovieAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfMovieAnnotationDictionary_autogen.h index 2b200f6068..725b1fae19 100644 --- a/experimental/PdfViewer/SkPdfMovieAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfMovieAnnotationDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfMovieDictionary_autogen.h b/experimental/PdfViewer/SkPdfMovieDictionary_autogen.h index 2362b683a0..59bf5e0d34 100644 --- a/experimental/PdfViewer/SkPdfMovieDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfMovieDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -595,11 +595,11 @@ public: return ret->podofo()->HasStream(); } - SkPdfStream getPosterAsStream() const { - SkPdfStream ret = SkPdfStream(); + SkPdfStream* getPosterAsStream() const { + SkPdfStream* ret = NULL; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Poster", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } }; diff --git a/experimental/PdfViewer/SkPdfMultiMasterFontDictionary_autogen.h b/experimental/PdfViewer/SkPdfMultiMasterFontDictionary_autogen.h index 2f67bdf098..3a9fc91964 100644 --- a/experimental/PdfViewer/SkPdfMultiMasterFontDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfMultiMasterFontDictionary_autogen.h @@ -14,6 +14,9 @@ public: virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return this;} private: + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} + public: private: public: diff --git a/experimental/PdfViewer/SkPdfNameDictionary_autogen.h b/experimental/PdfViewer/SkPdfNameDictionary_autogen.h index 154c05924e..0c517aaf73 100644 --- a/experimental/PdfViewer/SkPdfNameDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfNameDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfNameTreeNodeDictionary_autogen.h b/experimental/PdfViewer/SkPdfNameTreeNodeDictionary_autogen.h index f480b4a5d6..8c807f2fab 100644 --- a/experimental/PdfViewer/SkPdfNameTreeNodeDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfNameTreeNodeDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfName_autogen.h b/experimental/PdfViewer/SkPdfName_autogen.h index 66dac804d1..6d23ce496a 100644 --- a/experimental/PdfViewer/SkPdfName_autogen.h +++ b/experimental/PdfViewer/SkPdfName_autogen.h @@ -173,20 +173,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -536,6 +536,9 @@ private: virtual SkPdfReference* asReference() {return NULL;} virtual const SkPdfReference* asReference() const {return NULL;} + virtual SkPdfStream* asStream() {return NULL;} + virtual const SkPdfStream* asStream() const {return NULL;} + virtual SkPdfString* asString() {return NULL;} virtual const SkPdfString* asString() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfNamedActionsDictionary_autogen.h b/experimental/PdfViewer/SkPdfNamedActionsDictionary_autogen.h index 63ccbe2bd8..26043a5546 100644 --- a/experimental/PdfViewer/SkPdfNamedActionsDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfNamedActionsDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfNull_autogen.h b/experimental/PdfViewer/SkPdfNull_autogen.h index d0e11a318a..cb90aff86e 100644 --- a/experimental/PdfViewer/SkPdfNull_autogen.h +++ b/experimental/PdfViewer/SkPdfNull_autogen.h @@ -173,20 +173,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -536,6 +536,9 @@ private: virtual SkPdfReference* asReference() {return NULL;} virtual const SkPdfReference* asReference() const {return NULL;} + virtual SkPdfStream* asStream() {return NULL;} + virtual const SkPdfStream* asStream() const {return NULL;} + virtual SkPdfString* asString() {return NULL;} virtual const SkPdfString* asString() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfNumberTreeNodeDictionary_autogen.h b/experimental/PdfViewer/SkPdfNumberTreeNodeDictionary_autogen.h index 083a968a3d..bc24b3f555 100644 --- a/experimental/PdfViewer/SkPdfNumberTreeNodeDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfNumberTreeNodeDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfObjectReferenceDictionary_autogen.h b/experimental/PdfViewer/SkPdfObjectReferenceDictionary_autogen.h index de91beeaeb..57fc29de09 100644 --- a/experimental/PdfViewer/SkPdfObjectReferenceDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfObjectReferenceDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfObject_autogen.h b/experimental/PdfViewer/SkPdfObject_autogen.h index 859a217acd..8d9c0a1e1f 100644 --- a/experimental/PdfViewer/SkPdfObject_autogen.h +++ b/experimental/PdfViewer/SkPdfObject_autogen.h @@ -171,20 +171,20 @@ public: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -537,6 +537,9 @@ public: virtual SkPdfReference* asReference() {return NULL;} virtual const SkPdfReference* asReference() const {return NULL;} + virtual SkPdfStream* asStream() {return NULL;} + virtual const SkPdfStream* asStream() const {return NULL;} + virtual SkPdfString* asString() {return NULL;} virtual const SkPdfString* asString() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfOpiVersionDictionary_autogen.h b/experimental/PdfViewer/SkPdfOpiVersionDictionary_autogen.h index 3d23d0f1fe..38281ac0c6 100644 --- a/experimental/PdfViewer/SkPdfOpiVersionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfOpiVersionDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfOutlineDictionary_autogen.h b/experimental/PdfViewer/SkPdfOutlineDictionary_autogen.h index 1add0b5d6f..e25b08864d 100644 --- a/experimental/PdfViewer/SkPdfOutlineDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfOutlineDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfOutlineItemDictionary_autogen.h b/experimental/PdfViewer/SkPdfOutlineItemDictionary_autogen.h index 4021f0d62a..46cfb8f28a 100644 --- a/experimental/PdfViewer/SkPdfOutlineItemDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfOutlineItemDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfPDF_XOutputIntentDictionary_autogen.h b/experimental/PdfViewer/SkPdfPDF_XOutputIntentDictionary_autogen.h index 31fc50300a..cc310becb1 100644 --- a/experimental/PdfViewer/SkPdfPDF_XOutputIntentDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfPDF_XOutputIntentDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -640,11 +640,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "DestOutputProfile", "", NULL)); } - SkPdfStream DestOutputProfile() const { - SkPdfStream ret; + SkPdfStream* DestOutputProfile() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "DestOutputProfile", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } }; diff --git a/experimental/PdfViewer/SkPdfPSXobjectDictionary_autogen.h b/experimental/PdfViewer/SkPdfPSXobjectDictionary_autogen.h index 5715f0f94b..a194adbf69 100644 --- a/experimental/PdfViewer/SkPdfPSXobjectDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfPSXobjectDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -558,11 +558,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Level1", "", NULL)); } - SkPdfStream Level1() const { - SkPdfStream ret; + SkPdfStream* Level1() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Level1", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } }; diff --git a/experimental/PdfViewer/SkPdfPageLabelDictionary_autogen.h b/experimental/PdfViewer/SkPdfPageLabelDictionary_autogen.h index 9fe1462e62..3053a7db55 100644 --- a/experimental/PdfViewer/SkPdfPageLabelDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfPageLabelDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfPageObjectActionsDictionary_autogen.h b/experimental/PdfViewer/SkPdfPageObjectActionsDictionary_autogen.h index 849f12dc72..527aa370ad 100644 --- a/experimental/PdfViewer/SkPdfPageObjectActionsDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfPageObjectActionsDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfPageObjectDictionary_autogen.h b/experimental/PdfViewer/SkPdfPageObjectDictionary_autogen.h index fb7f2889fd..54ba3dbdd2 100644 --- a/experimental/PdfViewer/SkPdfPageObjectDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfPageObjectDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -706,11 +706,11 @@ public: return ret->podofo()->HasStream(); } - SkPdfStream getContentsAsStream() const { - SkPdfStream ret = SkPdfStream(); + SkPdfStream* getContentsAsStream() const { + SkPdfStream* ret = NULL; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Contents", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } bool isContentsAArray() const { @@ -763,11 +763,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Thumb", "", NULL)); } - SkPdfStream Thumb() const { - SkPdfStream ret; + SkPdfStream* Thumb() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Thumb", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } /** (Optional; PDF 1.1; recommended if the page contains article beads) An ar- @@ -854,11 +854,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Metadata", "", NULL)); } - SkPdfStream Metadata() const { - SkPdfStream ret; + SkPdfStream* Metadata() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Metadata", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } /** (Optional; PDF 1.3) A page-piece dictionary associated with the page (see diff --git a/experimental/PdfViewer/SkPdfPagePieceDictionary_autogen.h b/experimental/PdfViewer/SkPdfPagePieceDictionary_autogen.h index e59ce8fe70..5a734b7930 100644 --- a/experimental/PdfViewer/SkPdfPagePieceDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfPagePieceDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfPageTreeNodeDictionary_autogen.h b/experimental/PdfViewer/SkPdfPageTreeNodeDictionary_autogen.h index 4c60c6c24a..2395385333 100644 --- a/experimental/PdfViewer/SkPdfPageTreeNodeDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfPageTreeNodeDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfPodofoMapper_autogen.h b/experimental/PdfViewer/SkPdfPodofoMapper_autogen.h index 533f6fecf9..e45468696a 100644 --- a/experimental/PdfViewer/SkPdfPodofoMapper_autogen.h +++ b/experimental/PdfViewer/SkPdfPodofoMapper_autogen.h @@ -19,6 +19,7 @@ public: if (map(podofoDoc, podofoObj, (SkPdfNull**)out)) return true; if (map(podofoDoc, podofoObj, (SkPdfReference**)out)) return true; if (map(podofoDoc, podofoObj, (SkPdfString**)out)) return true; + if (map(podofoDoc, podofoObj, (SkPdfStream**)out)) return true; *out = new SkPdfObject(&podofoDoc, &podofoObj); return true; @@ -299,6 +300,18 @@ public: return true; } + static bool map(const SkPdfObject& in, SkPdfStream** out) { + return map(*in.doc(), *in.podofo(), out); + } + + static bool map(const PdfMemDocument& podofoDoc, const PdfObject& podofoObj, SkPdfStream** out) { + if (!isStream(podofoDoc, podofoObj)) return false; + + + *out = new SkPdfStream(&podofoDoc, &podofoObj); + return true; + } + static bool map(const SkPdfObject& in, SkPdfXObjectDictionary** out) { return map(*in.doc(), *in.podofo(), out); } @@ -321,10 +334,8 @@ public: if (!isFontDictionary(podofoDoc, podofoObj)) return false; if (map(podofoDoc, podofoObj, (SkPdfCIDFontDictionary**)out)) return true; - if (map(podofoDoc, podofoObj, (SkPdfTrueTypeFontDictionary**)out)) return true; if (map(podofoDoc, podofoObj, (SkPdfType0FontDictionary**)out)) return true; if (map(podofoDoc, podofoObj, (SkPdfType1FontDictionary**)out)) return true; - if (map(podofoDoc, podofoObj, (SkPdfType3FontDictionary**)out)) return true; *out = new SkPdfFontDictionary(&podofoDoc, &podofoObj); return true; @@ -884,6 +895,7 @@ public: if (!isType1FontDictionary(podofoDoc, podofoObj)) return false; if (map(podofoDoc, podofoObj, (SkPdfMultiMasterFontDictionary**)out)) return true; + if (map(podofoDoc, podofoObj, (SkPdfTrueTypeFontDictionary**)out)) return true; *out = new SkPdfType1FontDictionary(&podofoDoc, &podofoObj); return true; @@ -956,6 +968,7 @@ public: static bool map(const PdfMemDocument& podofoDoc, const PdfObject& podofoObj, SkPdfType0FontDictionary** out) { if (!isType0FontDictionary(podofoDoc, podofoObj)) return false; + if (map(podofoDoc, podofoObj, (SkPdfType3FontDictionary**)out)) return true; *out = new SkPdfType0FontDictionary(&podofoDoc, &podofoObj); return true; @@ -2361,6 +2374,10 @@ public: return podofoObj.GetDataType() == ePdfDataType_Dictionary; } + static bool isStream(const PdfMemDocument& podofoDoc, const PdfObject& podofoObj) { + return true; + } + static bool isXObjectDictionary(const PdfMemDocument& podofoDoc, const PdfObject& podofoObj) { return true; } @@ -2370,6 +2387,10 @@ public: } static bool isTrueTypeFontDictionary(const PdfMemDocument& podofoDoc, const PdfObject& podofoObj) { + std::string Subtype; + if (!NameFromDictionary(&podofoDoc, podofoObj.GetDictionary(), "Subtype", "", &Subtype)) return false; + if ((Subtype != "TrueType")) return false; + return true; } @@ -2528,7 +2549,7 @@ public: static bool isImageDictionary(const PdfMemDocument& podofoDoc, const PdfObject& podofoObj) { std::string Subtype; if (!NameFromDictionary(&podofoDoc, podofoObj.GetDictionary(), "Subtype", "", &Subtype)) return false; - if (Subtype != "Image") return false; + if ((Subtype != "Image")) return false; return true; } @@ -2540,7 +2561,7 @@ public: static bool isType1FormDictionary(const PdfMemDocument& podofoDoc, const PdfObject& podofoObj) { std::string Subtype; if (!NameFromDictionary(&podofoDoc, podofoObj.GetDictionary(), "Subtype", "", &Subtype)) return false; - if (Subtype != "Form") return false; + if ((Subtype != "Form")) return false; return true; } @@ -2558,10 +2579,18 @@ public: } static bool isType1FontDictionary(const PdfMemDocument& podofoDoc, const PdfObject& podofoObj) { + std::string Subtype; + if (!NameFromDictionary(&podofoDoc, podofoObj.GetDictionary(), "Subtype", "", &Subtype)) return false; + if ((Subtype != "MMType1") && (Subtype != "TrueType") && (Subtype != "Type1")) return false; + return true; } static bool isType3FontDictionary(const PdfMemDocument& podofoDoc, const PdfObject& podofoObj) { + std::string Subtype; + if (!NameFromDictionary(&podofoDoc, podofoObj.GetDictionary(), "Subtype", "", &Subtype)) return false; + if ((Subtype != "Type3")) return false; + return true; } @@ -2574,6 +2603,10 @@ public: } static bool isCIDFontDictionary(const PdfMemDocument& podofoDoc, const PdfObject& podofoObj) { + std::string Subtype; + if (!NameFromDictionary(&podofoDoc, podofoObj.GetDictionary(), "Subtype", "", &Subtype)) return false; + if ((Subtype != "CIDFontType0") && (Subtype != "CIDFontType2")) return false; + return true; } @@ -2582,6 +2615,10 @@ public: } static bool isType0FontDictionary(const PdfMemDocument& podofoDoc, const PdfObject& podofoObj) { + std::string Subtype; + if (!NameFromDictionary(&podofoDoc, podofoObj.GetDictionary(), "Subtype", "", &Subtype)) return false; + if ((Subtype != "Type3") && (Subtype != "Type0")) return false; + return true; } @@ -3036,7 +3073,7 @@ public: static bool isMultiMasterFontDictionary(const PdfMemDocument& podofoDoc, const PdfObject& podofoObj) { std::string Subtype; if (!NameFromDictionary(&podofoDoc, podofoObj.GetDictionary(), "Subtype", "", &Subtype)) return false; - if (Subtype != "MMType1") return false; + if ((Subtype != "MMType1")) return false; return true; } diff --git a/experimental/PdfViewer/SkPdfPopUpAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfPopUpAnnotationDictionary_autogen.h index 6aeb014fb7..0352180c9c 100644 --- a/experimental/PdfViewer/SkPdfPopUpAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfPopUpAnnotationDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfPrinterMarkAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfPrinterMarkAnnotationDictionary_autogen.h index af614b95b4..150c6c5159 100644 --- a/experimental/PdfViewer/SkPdfPrinterMarkAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfPrinterMarkAnnotationDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfPrinterMarkFormDictionary_autogen.h b/experimental/PdfViewer/SkPdfPrinterMarkFormDictionary_autogen.h index 9029834ed9..93fe3c74d4 100644 --- a/experimental/PdfViewer/SkPdfPrinterMarkFormDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfPrinterMarkFormDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfRadioButtonFieldDictionary_autogen.h b/experimental/PdfViewer/SkPdfRadioButtonFieldDictionary_autogen.h index 5b6b0ed2eb..67afa60c13 100644 --- a/experimental/PdfViewer/SkPdfRadioButtonFieldDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfRadioButtonFieldDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfReferenceDictionary_autogen.h b/experimental/PdfViewer/SkPdfReferenceDictionary_autogen.h index d84896256c..4197670a79 100644 --- a/experimental/PdfViewer/SkPdfReferenceDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfReferenceDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfReference_autogen.h b/experimental/PdfViewer/SkPdfReference_autogen.h index 629592890a..2c3aa27663 100644 --- a/experimental/PdfViewer/SkPdfReference_autogen.h +++ b/experimental/PdfViewer/SkPdfReference_autogen.h @@ -173,20 +173,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -536,6 +536,9 @@ private: virtual SkPdfNull* asNull() {return NULL;} virtual const SkPdfNull* asNull() const {return NULL;} + virtual SkPdfStream* asStream() {return NULL;} + virtual const SkPdfStream* asStream() const {return NULL;} + virtual SkPdfString* asString() {return NULL;} virtual const SkPdfString* asString() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfRemoteGoToActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfRemoteGoToActionDictionary_autogen.h index 7471ba53ba..b2f79f7ee4 100644 --- a/experimental/PdfViewer/SkPdfRemoteGoToActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfRemoteGoToActionDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfResetFormActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfResetFormActionDictionary_autogen.h index 529fa83e44..4211da85e9 100644 --- a/experimental/PdfViewer/SkPdfResetFormActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfResetFormActionDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfResourceDictionary_autogen.h b/experimental/PdfViewer/SkPdfResourceDictionary_autogen.h index 6bed6c0af7..94dd8a471f 100644 --- a/experimental/PdfViewer/SkPdfResourceDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfResourceDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfRubberStampAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfRubberStampAnnotationDictionary_autogen.h index ec7a746bce..131d7bbbce 100644 --- a/experimental/PdfViewer/SkPdfRubberStampAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfRubberStampAnnotationDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfSeparationDictionary_autogen.h b/experimental/PdfViewer/SkPdfSeparationDictionary_autogen.h index d8dc459047..26d0301e62 100644 --- a/experimental/PdfViewer/SkPdfSeparationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfSeparationDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfShadingDictionary_autogen.h b/experimental/PdfViewer/SkPdfShadingDictionary_autogen.h index 01e62ff571..b843104f55 100644 --- a/experimental/PdfViewer/SkPdfShadingDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfShadingDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfSignatureDictionary_autogen.h b/experimental/PdfViewer/SkPdfSignatureDictionary_autogen.h index 994c6ff385..aaf9fe5183 100644 --- a/experimental/PdfViewer/SkPdfSignatureDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfSignatureDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfSoftMaskDictionary_autogen.h b/experimental/PdfViewer/SkPdfSoftMaskDictionary_autogen.h index 43ebc8c171..59b011a4a8 100644 --- a/experimental/PdfViewer/SkPdfSoftMaskDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfSoftMaskDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -565,11 +565,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "G", "", NULL)); } - SkPdfStream G() const { - SkPdfStream ret; + SkPdfStream* G() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "G", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } /** (Optional) An array of component values specifying the color to be used as diff --git a/experimental/PdfViewer/SkPdfSoftMaskImageDictionary_autogen.h b/experimental/PdfViewer/SkPdfSoftMaskImageDictionary_autogen.h index d2122b11b6..61aadd1169 100644 --- a/experimental/PdfViewer/SkPdfSoftMaskImageDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfSoftMaskImageDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfSoundActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfSoundActionDictionary_autogen.h index 83e3194ec6..dccc190fd3 100644 --- a/experimental/PdfViewer/SkPdfSoundActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfSoundActionDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -543,11 +543,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Sound", "", NULL)); } - SkPdfStream Sound() const { - SkPdfStream ret; + SkPdfStream* Sound() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Sound", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } /** (Optional) The volume at which to play the sound, in the range -1.0 to 1.0. diff --git a/experimental/PdfViewer/SkPdfSoundAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfSoundAnnotationDictionary_autogen.h index 1cb53527e3..cca1b9928e 100644 --- a/experimental/PdfViewer/SkPdfSoundAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfSoundAnnotationDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -543,11 +543,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Sound", "", NULL)); } - SkPdfStream Sound() const { - SkPdfStream ret; + SkPdfStream* Sound() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Sound", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } /** (Optional) Text to be displayed in a pop-up window for the annotation in place diff --git a/experimental/PdfViewer/SkPdfSoundObjectDictionary_autogen.h b/experimental/PdfViewer/SkPdfSoundObjectDictionary_autogen.h index 358688cb06..0ce66f161b 100644 --- a/experimental/PdfViewer/SkPdfSoundObjectDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfSoundObjectDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfSourceInformationDictionary_autogen.h b/experimental/PdfViewer/SkPdfSourceInformationDictionary_autogen.h index af723cbb8b..61a2426045 100644 --- a/experimental/PdfViewer/SkPdfSourceInformationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfSourceInformationDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfSquareOrCircleAnnotation_autogen.h b/experimental/PdfViewer/SkPdfSquareOrCircleAnnotation_autogen.h index 89a800f10e..aab9fb29a9 100644 --- a/experimental/PdfViewer/SkPdfSquareOrCircleAnnotation_autogen.h +++ b/experimental/PdfViewer/SkPdfSquareOrCircleAnnotation_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfStandardSecurityHandlerDictionary_autogen.h b/experimental/PdfViewer/SkPdfStandardSecurityHandlerDictionary_autogen.h index 1cf0d6543e..5d7b28d06f 100644 --- a/experimental/PdfViewer/SkPdfStandardSecurityHandlerDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfStandardSecurityHandlerDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfStandardStructureDictionary_autogen.h b/experimental/PdfViewer/SkPdfStandardStructureDictionary_autogen.h index 2899804539..b842f17f89 100644 --- a/experimental/PdfViewer/SkPdfStandardStructureDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfStandardStructureDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfStreamCommonDictionary_autogen.h b/experimental/PdfViewer/SkPdfStreamCommonDictionary_autogen.h index fa65bb1722..a969b99abd 100644 --- a/experimental/PdfViewer/SkPdfStreamCommonDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfStreamCommonDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfString_autogen.h b/experimental/PdfViewer/SkPdfString_autogen.h index 2d018101ce..29a6505c90 100644 --- a/experimental/PdfViewer/SkPdfString_autogen.h +++ b/experimental/PdfViewer/SkPdfString_autogen.h @@ -173,20 +173,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -539,6 +539,9 @@ private: virtual SkPdfReference* asReference() {return NULL;} virtual const SkPdfReference* asReference() const {return NULL;} + virtual SkPdfStream* asStream() {return NULL;} + virtual const SkPdfStream* asStream() const {return NULL;} + public: const std::string& value() const {return fPodofoObj->GetString().GetStringUtf8();} private: diff --git a/experimental/PdfViewer/SkPdfStructureElementAccessDictionary_autogen.h b/experimental/PdfViewer/SkPdfStructureElementAccessDictionary_autogen.h index a0da30adbb..e7ae7451b0 100644 --- a/experimental/PdfViewer/SkPdfStructureElementAccessDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfStructureElementAccessDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfStructureElementDictionary_autogen.h b/experimental/PdfViewer/SkPdfStructureElementDictionary_autogen.h index 05fe253e41..98987f4b53 100644 --- a/experimental/PdfViewer/SkPdfStructureElementDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfStructureElementDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfStructureTreeRootDictionary_autogen.h b/experimental/PdfViewer/SkPdfStructureTreeRootDictionary_autogen.h index 694bc17297..184848f085 100644 --- a/experimental/PdfViewer/SkPdfStructureTreeRootDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfStructureTreeRootDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfSubmitFormActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfSubmitFormActionDictionary_autogen.h index fd43c9fe36..a6c6a91858 100644 --- a/experimental/PdfViewer/SkPdfSubmitFormActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfSubmitFormActionDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfTableAttributesDictionary_autogen.h b/experimental/PdfViewer/SkPdfTableAttributesDictionary_autogen.h index 96a7b0bdbf..8ec03a9dc8 100644 --- a/experimental/PdfViewer/SkPdfTableAttributesDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfTableAttributesDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfTextAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfTextAnnotationDictionary_autogen.h index e68b292b59..7e94e46313 100644 --- a/experimental/PdfViewer/SkPdfTextAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfTextAnnotationDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfTextFieldDictionary_autogen.h b/experimental/PdfViewer/SkPdfTextFieldDictionary_autogen.h index ab19e21023..fb07aab34d 100644 --- a/experimental/PdfViewer/SkPdfTextFieldDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfTextFieldDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfThreadActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfThreadActionDictionary_autogen.h index 507b25de29..997d30fe4f 100644 --- a/experimental/PdfViewer/SkPdfThreadActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfThreadActionDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfThreadDictionary_autogen.h b/experimental/PdfViewer/SkPdfThreadDictionary_autogen.h index 8dc4a8d0b5..1fcbb1746d 100644 --- a/experimental/PdfViewer/SkPdfThreadDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfThreadDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfTransitionDictionary_autogen.h b/experimental/PdfViewer/SkPdfTransitionDictionary_autogen.h index 552ba4545f..4cdee7f3c9 100644 --- a/experimental/PdfViewer/SkPdfTransitionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfTransitionDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfTransparencyGroupDictionary_autogen.h b/experimental/PdfViewer/SkPdfTransparencyGroupDictionary_autogen.h index 6560cbe2b0..efcc411434 100644 --- a/experimental/PdfViewer/SkPdfTransparencyGroupDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfTransparencyGroupDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfTrapNetworkAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfTrapNetworkAnnotationDictionary_autogen.h index 6cc7a85a6e..838f71360d 100644 --- a/experimental/PdfViewer/SkPdfTrapNetworkAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfTrapNetworkAnnotationDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfTrapNetworkAppearanceStreamDictionary_autogen.h b/experimental/PdfViewer/SkPdfTrapNetworkAppearanceStreamDictionary_autogen.h index 46798d0e17..10f5d88b4f 100644 --- a/experimental/PdfViewer/SkPdfTrapNetworkAppearanceStreamDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfTrapNetworkAppearanceStreamDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfTrueTypeFontDictionary_autogen.h b/experimental/PdfViewer/SkPdfTrueTypeFontDictionary_autogen.h index 5055165bb1..6684b30e6e 100644 --- a/experimental/PdfViewer/SkPdfTrueTypeFontDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfTrueTypeFontDictionary_autogen.h @@ -3,9 +3,9 @@ #include "SkPdfEnums_autogen.h" #include "SkPdfArray_autogen.h" -#include "SkPdfFontDictionary_autogen.h" +#include "SkPdfType1FontDictionary_autogen.h" -class SkPdfTrueTypeFontDictionary : public SkPdfFontDictionary { +class SkPdfTrueTypeFontDictionary : public SkPdfType1FontDictionary { public: virtual SkPdfObjectType getType() const { return kTrueTypeFontDictionary_SkPdfObjectType;} virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kTrueTypeFontDictionary_SkPdfObjectType + 1);} @@ -14,30 +14,29 @@ public: virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return this;} private: - virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} - virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} - virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} - - virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} - virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} - virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} - public: private: public: - SkPdfTrueTypeFontDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfFontDictionary(podofoDoc, podofoObj) {} + SkPdfTrueTypeFontDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfType1FontDictionary(podofoDoc, podofoObj) {} virtual bool valid() const {return true;} SkPdfTrueTypeFontDictionary& operator=(const SkPdfTrueTypeFontDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;} + bool has_Subtype() const { + return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Subtype", "", NULL)); + } + + std::string Subtype() const { + std::string ret; + if (NameFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Subtype", "", &ret)) return ret; + // TODO(edisonn): warn about missing required field, assert for known good pdfs + return ""; + } + }; #endif // __DEFINED__SkPdfTrueTypeFontDictionary diff --git a/experimental/PdfViewer/SkPdfType0FontDictionary_autogen.h b/experimental/PdfViewer/SkPdfType0FontDictionary_autogen.h index 22be44a60b..f11d3d3f99 100644 --- a/experimental/PdfViewer/SkPdfType0FontDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType0FontDictionary_autogen.h @@ -9,7 +9,7 @@ class SkPdfType0FontDictionary : public SkPdfFontDictionary { public: virtual SkPdfObjectType getType() const { return kType0FontDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kType0FontDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getTypeEnd() const { return kType0FontDictionary__End_SkPdfObjectType;} public: virtual SkPdfType0FontDictionary* asType0FontDictionary() {return this;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return this;} @@ -18,17 +18,14 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} public: private: @@ -116,11 +113,11 @@ public: return ret->podofo()->HasStream(); } - SkPdfStream getEncodingAsStream() const { - SkPdfStream ret = SkPdfStream(); + SkPdfStream* getEncodingAsStream() const { + SkPdfStream* ret = NULL; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Encoding", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } /** (Required) An array specifying one or more fonts or CIDFonts that are @@ -148,11 +145,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "ToUnicode", "", NULL)); } - SkPdfStream ToUnicode() const { - SkPdfStream ret; + SkPdfStream* ToUnicode() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "ToUnicode", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } }; diff --git a/experimental/PdfViewer/SkPdfType0FunctionDictionary_autogen.h b/experimental/PdfViewer/SkPdfType0FunctionDictionary_autogen.h index 6a75e47dc9..d9f9382d03 100644 --- a/experimental/PdfViewer/SkPdfType0FunctionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType0FunctionDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfType10HalftoneDictionary_autogen.h b/experimental/PdfViewer/SkPdfType10HalftoneDictionary_autogen.h index ba6e042e60..9d64741de5 100644 --- a/experimental/PdfViewer/SkPdfType10HalftoneDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType10HalftoneDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfType16HalftoneDictionary_autogen.h b/experimental/PdfViewer/SkPdfType16HalftoneDictionary_autogen.h index a965edd283..ebd863e3be 100644 --- a/experimental/PdfViewer/SkPdfType16HalftoneDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType16HalftoneDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfType1FontDictionary_autogen.h b/experimental/PdfViewer/SkPdfType1FontDictionary_autogen.h index 680e7c8bfa..88a85ec9df 100644 --- a/experimental/PdfViewer/SkPdfType1FontDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType1FontDictionary_autogen.h @@ -18,9 +18,6 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} @@ -210,11 +207,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "ToUnicode", "", NULL)); } - SkPdfStream ToUnicode() const { - SkPdfStream ret; + SkPdfStream* ToUnicode() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "ToUnicode", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } }; diff --git a/experimental/PdfViewer/SkPdfType1FormDictionary_autogen.h b/experimental/PdfViewer/SkPdfType1FormDictionary_autogen.h index 8fdb8e654c..b04c539999 100644 --- a/experimental/PdfViewer/SkPdfType1FormDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType1FormDictionary_autogen.h @@ -205,11 +205,11 @@ public: return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Metadata", "", NULL)); } - SkPdfStream Metadata() const { - SkPdfStream ret; + SkPdfStream* Metadata() const { + SkPdfStream* ret; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Metadata", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } /** (Optional; PDF 1.3) A page-piece dictionary associated with the form diff --git a/experimental/PdfViewer/SkPdfType1HalftoneDictionary_autogen.h b/experimental/PdfViewer/SkPdfType1HalftoneDictionary_autogen.h index 07e768e2a1..097ed46208 100644 --- a/experimental/PdfViewer/SkPdfType1HalftoneDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType1HalftoneDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfType1PatternDictionary_autogen.h b/experimental/PdfViewer/SkPdfType1PatternDictionary_autogen.h index 320c673af4..fc4700fc02 100644 --- a/experimental/PdfViewer/SkPdfType1PatternDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType1PatternDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfType2FunctionDictionary_autogen.h b/experimental/PdfViewer/SkPdfType2FunctionDictionary_autogen.h index c9d359d69b..609e0b30d5 100644 --- a/experimental/PdfViewer/SkPdfType2FunctionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType2FunctionDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfType2PatternDictionary_autogen.h b/experimental/PdfViewer/SkPdfType2PatternDictionary_autogen.h index cca506ca1d..2814fe1dc3 100644 --- a/experimental/PdfViewer/SkPdfType2PatternDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType2PatternDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -577,11 +577,11 @@ public: return ret->podofo()->HasStream(); } - SkPdfStream getShadingAsStream() const { - SkPdfStream ret = SkPdfStream(); + SkPdfStream* getShadingAsStream() const { + SkPdfStream* ret = NULL; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Shading", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } /** (Optional) An array of six numbers specifying the pattern matrix (see Section diff --git a/experimental/PdfViewer/SkPdfType3FontDictionary_autogen.h b/experimental/PdfViewer/SkPdfType3FontDictionary_autogen.h index 4f54a19a75..83c5b32649 100644 --- a/experimental/PdfViewer/SkPdfType3FontDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType3FontDictionary_autogen.h @@ -3,10 +3,10 @@ #include "SkPdfEnums_autogen.h" #include "SkPdfArray_autogen.h" -#include "SkPdfFontDictionary_autogen.h" +#include "SkPdfType0FontDictionary_autogen.h" // Entries in a Type 3 font dictionary -class SkPdfType3FontDictionary : public SkPdfFontDictionary { +class SkPdfType3FontDictionary : public SkPdfType0FontDictionary { public: virtual SkPdfObjectType getType() const { return kType3FontDictionary_SkPdfObjectType;} virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kType3FontDictionary_SkPdfObjectType + 1);} @@ -15,25 +15,10 @@ public: virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return this;} private: - virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} - virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} - virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} - - virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} - virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} - - virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} - virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - public: private: public: - SkPdfType3FontDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfFontDictionary(podofoDoc, podofoObj) {} + SkPdfType3FontDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfType0FontDictionary(podofoDoc, podofoObj) {} virtual bool valid() const {return true;} diff --git a/experimental/PdfViewer/SkPdfType3FunctionDictionary_autogen.h b/experimental/PdfViewer/SkPdfType3FunctionDictionary_autogen.h index 01e3eda7fc..cc8feedc8f 100644 --- a/experimental/PdfViewer/SkPdfType3FunctionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType3FunctionDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfType5HalftoneDictionary_autogen.h b/experimental/PdfViewer/SkPdfType5HalftoneDictionary_autogen.h index 9c540890d3..4f54d0554d 100644 --- a/experimental/PdfViewer/SkPdfType5HalftoneDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType5HalftoneDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -592,11 +592,11 @@ public: return ret->podofo()->HasStream(); } - SkPdfStream get[any_colorant_name]AsStream() const { - SkPdfStream ret = SkPdfStream(); + SkPdfStream* get[any_colorant_name]AsStream() const { + SkPdfStream* ret = NULL; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "[any_colorant_name]", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } */ @@ -628,11 +628,11 @@ public: return ret->podofo()->HasStream(); } - SkPdfStream getDefaultAsStream() const { - SkPdfStream ret = SkPdfStream(); + SkPdfStream* getDefaultAsStream() const { + SkPdfStream* ret = NULL; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Default", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } }; diff --git a/experimental/PdfViewer/SkPdfType6HalftoneDictionary_autogen.h b/experimental/PdfViewer/SkPdfType6HalftoneDictionary_autogen.h index 69623f2519..d2017a603e 100644 --- a/experimental/PdfViewer/SkPdfType6HalftoneDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType6HalftoneDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfURIActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfURIActionDictionary_autogen.h index 75afbcce65..73af47f2b4 100644 --- a/experimental/PdfViewer/SkPdfURIActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfURIActionDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfURIDictionary_autogen.h b/experimental/PdfViewer/SkPdfURIDictionary_autogen.h index 4196424d0c..d9631b6dc8 100644 --- a/experimental/PdfViewer/SkPdfURIDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfURIDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfURLAliasDictionary_autogen.h b/experimental/PdfViewer/SkPdfURLAliasDictionary_autogen.h index 2dfe11819d..e46f4a6e32 100644 --- a/experimental/PdfViewer/SkPdfURLAliasDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfURLAliasDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfVariableTextFieldDictionary_autogen.h b/experimental/PdfViewer/SkPdfVariableTextFieldDictionary_autogen.h index e27e173e08..2225ea0de6 100644 --- a/experimental/PdfViewer/SkPdfVariableTextFieldDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfVariableTextFieldDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfViewerPreferencesDictionary_autogen.h b/experimental/PdfViewer/SkPdfViewerPreferencesDictionary_autogen.h index 5f0816a802..45edd5062c 100644 --- a/experimental/PdfViewer/SkPdfViewerPreferencesDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfViewerPreferencesDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfWebCaptureCommandDictionary_autogen.h b/experimental/PdfViewer/SkPdfWebCaptureCommandDictionary_autogen.h index 89d8a5c067..b6de61de07 100644 --- a/experimental/PdfViewer/SkPdfWebCaptureCommandDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfWebCaptureCommandDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} @@ -588,11 +588,11 @@ public: return ret->podofo()->HasStream(); } - SkPdfStream getPAsStream() const { - SkPdfStream ret = SkPdfStream(); + SkPdfStream* getPAsStream() const { + SkPdfStream* ret = NULL; if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "P", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } /** (Optional) A content type describing the data posted to the URL. Default value: diff --git a/experimental/PdfViewer/SkPdfWebCaptureCommandSettingsDictionary_autogen.h b/experimental/PdfViewer/SkPdfWebCaptureCommandSettingsDictionary_autogen.h index 88f7f9a01f..99c34b6463 100644 --- a/experimental/PdfViewer/SkPdfWebCaptureCommandSettingsDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfWebCaptureCommandSettingsDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfWebCaptureDictionary_autogen.h b/experimental/PdfViewer/SkPdfWebCaptureDictionary_autogen.h index d0050032c5..ef2924d554 100644 --- a/experimental/PdfViewer/SkPdfWebCaptureDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfWebCaptureDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfWebCaptureImageSetDictionary_autogen.h b/experimental/PdfViewer/SkPdfWebCaptureImageSetDictionary_autogen.h index 3bf4466457..2866896e1f 100644 --- a/experimental/PdfViewer/SkPdfWebCaptureImageSetDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfWebCaptureImageSetDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfWebCaptureInformationDictionary_autogen.h b/experimental/PdfViewer/SkPdfWebCaptureInformationDictionary_autogen.h index 7f75f40c8e..38d9986cf2 100644 --- a/experimental/PdfViewer/SkPdfWebCaptureInformationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfWebCaptureInformationDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfWebCapturePageSetDictionary_autogen.h b/experimental/PdfViewer/SkPdfWebCapturePageSetDictionary_autogen.h index 822533ff13..cc9d05f04f 100644 --- a/experimental/PdfViewer/SkPdfWebCapturePageSetDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfWebCapturePageSetDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfWidgetAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfWidgetAnnotationDictionary_autogen.h index 6f6486d1cc..bb687f2802 100644 --- a/experimental/PdfViewer/SkPdfWidgetAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfWidgetAnnotationDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfWindowsLaunchActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfWindowsLaunchActionDictionary_autogen.h index a996f9016e..201fe25cda 100644 --- a/experimental/PdfViewer/SkPdfWindowsLaunchActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfWindowsLaunchActionDictionary_autogen.h @@ -165,20 +165,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfXObjectDictionary_autogen.h b/experimental/PdfViewer/SkPdfXObjectDictionary_autogen.h index d68325f330..f0dda14504 100644 --- a/experimental/PdfViewer/SkPdfXObjectDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfXObjectDictionary_autogen.h @@ -164,20 +164,20 @@ private: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} + virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} + virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} + virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} + virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} diff --git a/experimental/PdfViewer/generate_code.py b/experimental/PdfViewer/generate_code.py index 9cc3e22cd0..6c78937fb8 100644 --- a/experimental/PdfViewer/generate_code.py +++ b/experimental/PdfViewer/generate_code.py @@ -20,7 +20,7 @@ knowTypes = { 'tree': ['SkPdfTree*', 'TreeFromDictionary', datatypes.CppNull(), 'ret->podofo()->GetDataType() == ePdfDataType_Reference'], 'number': ['double', 'DoubleFromDictionary', datatypes.PdfNumber(0), 'ret->podofo()->GetDataType() == ePdfDataType_Real || ret->podofo()->GetDataType() == ePdfDataType_Number'], 'rectangle': ['SkRect', 'SkRectFromDictionary', datatypes.PdfEmptyRect(), 'ret->podofo()->GetDataType() == ePdfDataType_Array'], -'stream': ['SkPdfStream', 'StreamFromDictionary', datatypes.PdfEmptyStream(), 'ret->podofo()->HasStream()'], +'stream': ['SkPdfStream*', 'StreamFromDictionary', datatypes.CppNull(), 'ret->podofo()->HasStream()'], 'string': ['std::string', 'StringFromDictionary', datatypes.PdfString('""'), 'ret->podofo()->GetDataType() == ePdfDataType_String || ret->podofo()->GetDataType() == ePdfDataType_HexString'], 'text': ['std::string', 'StringFromDictionary', datatypes.PdfString('""'), 'ret->podofo()->GetDataType() == ePdfDataType_String || ret->podofo()->GetDataType() == ePdfDataType_HexString'], 'text string': ['std::string', 'StringFromDictionary', datatypes.PdfString('""'), 'ret->podofo()->GetDataType() == ePdfDataType_String || ret->podofo()->GetDataType() == ePdfDataType_HexString'], @@ -38,7 +38,7 @@ class PdfField: self.fCppName = '' self.fEnumValues = [] self.fHasMust = False - self.fMustBe = '' + self.fMustBe = [] self.fComment = '' def must(self, value): @@ -212,6 +212,23 @@ class PdfClassManager: cnt = cnt + 1 + def determineAllMustBe(self, cls, field, enumToCls): + mustBe = [] + for sub in cls.fEnumSubclasses: + mustBe = mustBe + self.determineAllMustBe(enumToCls[sub], field, enumToCls) + + for subField in cls.fFields: + if subField.fProp.fName == field.fProp.fName: + mustBe = mustBe + subField.fProp.fMustBe + +# while cls.fBase != '': +# cls = self.fClasses[cls.fBase] +# # TODO(edisonn): bad perf +# for subField in cls.fFields: +# if subField.fProp.fName == field.fProp.fName: +# mustBe = mustBe + subField.fProp.fMustBe + + return mustBe def write(self): global fileHeaders @@ -414,9 +431,18 @@ class PdfClassManager: fileMapper.write(' static bool map(const PdfMemDocument& podofoDoc, const PdfObject& podofoObj, SkPdf' + name + '** out) {\n') fileMapper.write(' if (!is' + name + '(podofoDoc, podofoObj)) return false;\n') fileMapper.write('\n') - + + # stream must be last one + hasStream = False for sub in cls.fEnumSubclasses: - fileMapper.write(' if (map(podofoDoc, podofoObj, (SkPdf' + enumToCls[sub].fName + '**)out)) return true;\n') + if cls.fName == 'Object' and enumToCls[sub].fName == 'Stream': + hasStream = True + else: + fileMapper.write(' if (map(podofoDoc, podofoObj, (SkPdf' + enumToCls[sub].fName + '**)out)) return true;\n') + + if hasStream: + fileMapper.write(' if (map(podofoDoc, podofoObj, (SkPdfStream**)out)) return true;\n') + fileMapper.write('\n') @@ -440,8 +466,21 @@ class PdfClassManager: cntMust = cntMust + 1 fileMapper.write(' ' + knowTypes[prop.fTypes.strip()][0] + ' ' + prop.fCppName + ';\n') fileMapper.write(' if (!' + knowTypes[prop.fTypes.strip()][1] + '(&podofoDoc, podofoObj.GetDictionary(), \"' + prop.fName + '\", \"' + prop.fAbr + '\", &' + prop.fCppName + ')) return false;\n') - fileMapper.write(' if (' + prop.fCppName + ' != ' + prop.fMustBe.toCpp() + ') return false;\n') - fileMapper.write('\n') + + eval = ''; + # TODO(edisonn): this could get out of hand, and could have poor performance if continued on this path + # but if we would write our parser, then best thing would be to create a map of (key, value) -> to bits + # and at each (key, value) we do an and with the bits existent, then we check what bits are left, which would tell the posible types of this dictionary + # and for non unique posinilities (if any) based on context, or the requester of dictionry we can determine fast the dictionary type + mustBe = self.determineAllMustBe(cls, field, enumToCls) + if len(mustBe) > 0: + for cnd in mustBe: + if eval == '': + eval = '(' + prop.fCppName + ' != ' + cnd.toCpp() + ')' + else: + eval = eval + ' && ' + '(' + prop.fCppName + ' != ' + cnd.toCpp() + ')' + fileMapper.write(' if (' + eval + ') return false;\n') + fileMapper.write('\n') fileMapper.write(' return true;\n') @@ -483,13 +522,11 @@ def generateCode(): manager.addClass('Name').check('podofoObj.GetDataType() == ePdfDataType_Name')\ .carbonCopyPublic('const std::string& value() const {return fPodofoObj->GetName().GetName();}') - #manager.addClass('Stream') - attached to a dictionary manager.addClass('Reference').check('podofoObj.GetDataType() == ePdfDataType_Reference') manager.addClass('Array').check('podofoObj.GetDataType() == ePdfDataType_Array')\ .carbonCopyPublic('const int size() const {return fPodofoObj->GetArray().GetSize();}')\ - .carbonCopyPublic('const SkPdfObject operator[](int i) const {return SkPdfObject(fPodofoDoc, &fPodofoObj->GetArray()[i]);}')\ - .carbonCopyPublic('SkPdfObject operator[](int i) {return SkPdfObject(fPodofoDoc, &fPodofoObj->GetArray()[i]);}') + .carbonCopyPublic('SkPdfObject* operator[](int i) const {return new SkPdfObject(fPodofoDoc, &fPodofoObj->GetArray()[i]);}')\ manager.addClass('String').check('podofoObj.GetDataType() == ePdfDataType_String || podofoObj.GetDataType() == ePdfDataType_HexString')\ .carbonCopyPublic('const std::string& value() const {return fPodofoObj->GetString().GetStringUtf8();}') @@ -500,6 +537,8 @@ def generateCode(): manager.addClass('Dictionary').check('podofoObj.GetDataType() == ePdfDataType_Dictionary')\ .carbonCopyPublic('const SkPdfObject get(const char* dictionaryKeyName) const {return SkPdfObject(fPodofoDoc, resolveReferenceObject(fPodofoDoc, fPodofoObj->GetDictionary().GetKey(PdfName(dictionaryKeyName))));}')\ .carbonCopyPublic('SkPdfObject get(const char* dictionaryKeyName) {return SkPdfObject(fPodofoDoc, resolveReferenceObject(fPodofoDoc, fPodofoObj->GetDictionary().GetKey(PdfName(dictionaryKeyName))));}')\ + + manager.addClass('Stream') # attached to a dictionary in podofo # these classes are not explicitely backed by a table in the pdf spec @@ -507,7 +546,14 @@ def generateCode(): manager.addClass('FontDictionary', 'Dictionary') - manager.addClass('TrueTypeFontDictionary', 'FontDictionary') + manager.addClass('TrueTypeFontDictionary', 'Type1FontDictionary')\ + .required('NULL')\ + .field('Subtype')\ + .name('Subtype')\ + .type('name')\ + .comment('')\ + .must([datatypes.PdfName('TrueType')])\ + .done().done()\ pdfspec_autogen.buildPdfSpec(manager) @@ -517,7 +563,7 @@ def generateCode(): .name('Subtype')\ .type('name')\ .comment('')\ - .must(datatypes.PdfName('MMType1'))\ + .must([datatypes.PdfName('MMType1')])\ .done().done()\ diff --git a/experimental/PdfViewer/pdf_viewer_main.cpp b/experimental/PdfViewer/pdf_viewer_main.cpp index d2d0ff3590..39d93ef9a0 100644 --- a/experimental/PdfViewer/pdf_viewer_main.cpp +++ b/experimental/PdfViewer/pdf_viewer_main.cpp @@ -25,8 +25,17 @@ #include "podofo.h" using namespace PoDoFo; + __SK_FORCE_IMAGE_DECODER_LINKING; + +//#define PDF_TRACE +//#define PDF_TRACE_DIFF_IN_PNG +//#define PDF_DEBUG_NO_CLIPING +//#define PDF_DEBUG_NO_PAGE_CLIPING +//#define PDF_DEBUG_3X + + const PdfObject* resolveReferenceObject(const PdfMemDocument* pdfDoc, const PdfObject* obj, bool resolveOneElementArrays = false); @@ -85,7 +94,7 @@ bool ObjectFromDictionary(const PdfMemDocument* pdfDoc, struct SkPdfFileSpec {}; class SkPdfArray; -struct SkPdfStream {}; +class SkPdfStream; struct SkPdfDate {}; struct SkPdfTree {}; struct SkPdfFunction {}; @@ -108,7 +117,7 @@ bool StreamFromDictionary(const PdfMemDocument* pdfDoc, const PdfDictionary& dict, const char* key, const char* abr, - SkPdfStream* data); + SkPdfStream** data); bool TreeFromDictionary(const PdfMemDocument* pdfDoc, const PdfDictionary& dict, @@ -138,6 +147,10 @@ bool FunctionFromDictionary(const PdfMemDocument* pdfDoc, #include "SkPdfHeaders_autogen.h" #include "SkPdfPodofoMapper_autogen.h" #include "SkPdfParser.h" +#include "SkPdfFont.h" + +// TODO(edisonn): fix the mess with the files. +#include "SkPdfFont.cpp" bool ArrayFromDictionary(const PdfMemDocument* pdfDoc, const PdfDictionary& dict, @@ -155,7 +168,7 @@ bool StreamFromDictionary(const PdfMemDocument* pdfDoc, const PdfDictionary& dict, const char* key, const char* abr, - SkPdfStream* data) {return false;} + SkPdfStream** data); bool TreeFromDictionary(const PdfMemDocument* pdfDoc, const PdfDictionary& dict, @@ -179,14 +192,14 @@ bool FunctionFromDictionary(const PdfMemDocument* pdfDoc, /* * TODO(edisonn): - * - encapsulate podofo in the pdf api so the skpdf does not know anything about podofo ... in progress - * - ASAP so skp -> pdf -> png looks great - * - load gs/ especially smask and already known prop (skp)... * - all font types and all ppdf font features * - word spacing * - load font for baidu.pdf * - load font for youtube.pdf * - parser for pdf from the definition already available in pdfspec_autogen.py + * - all docs from ~/work + * - encapsulate podofo in the pdf api so the skpdf does not know anything about podofo ... in progress + * - load gs/ especially smask and already known prop (skp) ... in progress * - wrapper on classes for customizations? e.g. * SkPdfPageObjectVanila - has only the basic loaders/getters * SkPdfPageObject : public SkPdfPageObjectVanila, extends, and I can add customizations here @@ -195,11 +208,6 @@ bool FunctionFromDictionary(const PdfMemDocument* pdfDoc, * - deal with specific type in spec directly, add all dictionary types to known types */ -//#define PDF_TRACE -//#define PDF_TRACE_DIFF_IN_PNG -//#define PDF_DEBUG_NO_CLIPING -//#define PDF_DEBUG_NO_PAGE_CLIPING -//#define PDF_DEBUG_3X // TODO(edisonn): move in trace util. #ifdef PDF_TRACE @@ -307,6 +315,7 @@ struct PdfGraphicsState { double fCurFontSize; bool fTextBlock; PdfFont* fCurFont; + SkPdfFont* fSkFont; SkPath fPath; bool fPathClosed; @@ -342,6 +351,7 @@ struct PdfGraphicsState { fCharSpace = 0; fHasClipPathToApply = false; fResources = NULL; + fSkFont = NULL; } void applyGraphicsState(SkPaint* paint, bool stroking) { @@ -415,8 +425,8 @@ bool hasVisualEffect(const char* pdfOp) { } // TODO(edisonn): Pass PdfContext and SkCanvasd only with the define for instrumentation. -static bool readToken(SkPdfTokenizer fTokenizer, PdfToken* token) { - bool ret = fTokenizer.readToken(token); +static bool readToken(SkPdfTokenizer* fTokenizer, PdfToken* token) { + bool ret = fTokenizer->readToken(token); gReadOp++; @@ -510,13 +520,13 @@ static bool readToken(SkPdfTokenizer fTokenizer, PdfToken* token) { class PdfTokenLooper { protected: PdfTokenLooper* fParent; - SkPdfTokenizer fTokenizer; + SkPdfTokenizer* fTokenizer; PdfContext* fPdfContext; SkCanvas* fCanvas; public: PdfTokenLooper(PdfTokenLooper* parent, - SkPdfTokenizer tokenizer, + SkPdfTokenizer* tokenizer, PdfContext* pdfContext, SkCanvas* canvas) : fParent(parent), fTokenizer(tokenizer), fPdfContext(pdfContext), fCanvas(canvas) {} @@ -535,7 +545,7 @@ public: class PdfMainLooper : public PdfTokenLooper { public: PdfMainLooper(PdfTokenLooper* parent, - SkPdfTokenizer tokenizer, + SkPdfTokenizer* tokenizer, PdfContext* pdfContext, SkCanvas* canvas) : PdfTokenLooper(parent, tokenizer, pdfContext, canvas) {} @@ -547,7 +557,7 @@ public: class PdfInlineImageLooper : public PdfTokenLooper { public: PdfInlineImageLooper() - : PdfTokenLooper(NULL, SkPdfTokenizer(), NULL, NULL) {} + : PdfTokenLooper(NULL, NULL, NULL, NULL) {} virtual PdfResult consumeToken(PdfToken& token); virtual void loop(); @@ -557,7 +567,7 @@ public: class PdfCompatibilitySectionLooper : public PdfTokenLooper { public: PdfCompatibilitySectionLooper() - : PdfTokenLooper(NULL, SkPdfTokenizer(), NULL, NULL) {} + : PdfTokenLooper(NULL, NULL, NULL, NULL) {} virtual PdfResult consumeToken(PdfToken& token); virtual void loop(); @@ -578,104 +588,11 @@ char* gRenderStatsNames[kCount_PdfResult] = { "Unsupported/Unknown" }; -struct SkPdfStandardFont { - const char* fName; - bool fIsBold; - bool fIsItalic; -}; - -static map& getStandardFonts() { - static std::map gPdfStandardFonts; - - // TODO (edisonn): , vs - ? what does it mean? - // TODO (edisonn): MT, PS, Oblique=italic?, ... what does it mean? - if (gPdfStandardFonts.empty()) { - gPdfStandardFonts["Arial"] = {"Arial", false, false}; - gPdfStandardFonts["Arial,Bold"] = {"Arial", true, false}; - gPdfStandardFonts["Arial,BoldItalic"] = {"Arial", true, true}; - gPdfStandardFonts["Arial,Italic"] = {"Arial", false, true}; - gPdfStandardFonts["Arial-Bold"] = {"Arial", true, false}; - gPdfStandardFonts["Arial-BoldItalic"] = {"Arial", true, true}; - gPdfStandardFonts["Arial-BoldItalicMT"] = {"Arial", true, true}; - gPdfStandardFonts["Arial-BoldMT"] = {"Arial", true, false}; - gPdfStandardFonts["Arial-Italic"] = {"Arial", false, true}; - gPdfStandardFonts["Arial-ItalicMT"] = {"Arial", false, true}; - gPdfStandardFonts["ArialMT"] = {"Arial", false, false}; - gPdfStandardFonts["Courier"] = {"Courier New", false, false}; - gPdfStandardFonts["Courier,Bold"] = {"Courier New", true, false}; - gPdfStandardFonts["Courier,BoldItalic"] = {"Courier New", true, true}; - gPdfStandardFonts["Courier,Italic"] = {"Courier New", false, true}; - gPdfStandardFonts["Courier-Bold"] = {"Courier New", true, false}; - gPdfStandardFonts["Courier-BoldOblique"] = {"Courier New", true, true}; - gPdfStandardFonts["Courier-Oblique"] = {"Courier New", false, true}; - gPdfStandardFonts["CourierNew"] = {"Courier New", false, false}; - gPdfStandardFonts["CourierNew,Bold"] = {"Courier New", true, false}; - gPdfStandardFonts["CourierNew,BoldItalic"] = {"Courier New", true, true}; - gPdfStandardFonts["CourierNew,Italic"] = {"Courier New", false, true}; - gPdfStandardFonts["CourierNew-Bold"] = {"Courier New", true, false}; - gPdfStandardFonts["CourierNew-BoldItalic"] = {"Courier New", true, true}; - gPdfStandardFonts["CourierNew-Italic"] = {"Courier New", false, true}; - gPdfStandardFonts["CourierNewPS-BoldItalicMT"] = {"Courier New", true, true}; - gPdfStandardFonts["CourierNewPS-BoldMT"] = {"Courier New", true, false}; - gPdfStandardFonts["CourierNewPS-ItalicMT"] = {"Courier New", false, true}; - gPdfStandardFonts["CourierNewPSMT"] = {"Courier New", false, false}; - gPdfStandardFonts["Helvetica"] = {"Helvetica", false, false}; - gPdfStandardFonts["Helvetica,Bold"] = {"Helvetica", true, false}; - gPdfStandardFonts["Helvetica,BoldItalic"] = {"Helvetica", true, true}; - gPdfStandardFonts["Helvetica,Italic"] = {"Helvetica", false, true}; - gPdfStandardFonts["Helvetica-Bold"] = {"Helvetica", true, false}; - gPdfStandardFonts["Helvetica-BoldItalic"] = {"Helvetica", true, true}; - gPdfStandardFonts["Helvetica-BoldOblique"] = {"Helvetica", true, true}; - gPdfStandardFonts["Helvetica-Italic"] = {"Helvetica", false, true}; - gPdfStandardFonts["Helvetica-Oblique"] = {"Helvetica", false, true}; - gPdfStandardFonts["Times-Bold"] = {"Times", true, false}; - gPdfStandardFonts["Times-BoldItalic"] = {"Times", true, true}; - gPdfStandardFonts["Times-Italic"] = {"Times", false, true}; - gPdfStandardFonts["Times-Roman"] = {"Times New Roman", false, false}; - gPdfStandardFonts["TimesNewRoman"] = {"Times New Roman", false, false}; - gPdfStandardFonts["TimesNewRoman,Bold"] = {"Times New Roman", true, false}; - gPdfStandardFonts["TimesNewRoman,BoldItalic"] = {"Times New Roman", true, true}; - gPdfStandardFonts["TimesNewRoman,Italic"] = {"Times New Roman", false, true}; - gPdfStandardFonts["TimesNewRoman-Bold"] = {"Times New Roman", true, false}; - gPdfStandardFonts["TimesNewRoman-BoldItalic"] = {"Times New Roman", true, true}; - gPdfStandardFonts["TimesNewRoman-Italic"] = {"Times New Roman", false, true}; - gPdfStandardFonts["TimesNewRomanPS"] = {"Times New Roman", false, false}; - gPdfStandardFonts["TimesNewRomanPS-Bold"] = {"Times New Roman", true, false}; - gPdfStandardFonts["TimesNewRomanPS-BoldItalic"] = {"Times New Roman", true, true}; - gPdfStandardFonts["TimesNewRomanPS-BoldItalicMT"] = {"Times New Roman", true, true}; - gPdfStandardFonts["TimesNewRomanPS-BoldMT"] = {"Times New Roman", true, false}; - gPdfStandardFonts["TimesNewRomanPS-Italic"] = {"Times New Roman", false, true}; - gPdfStandardFonts["TimesNewRomanPS-ItalicMT"] = {"Times New Roman", false, true}; - gPdfStandardFonts["TimesNewRomanPSMT"] = {"Times New Roman", false, false}; - } - - return gPdfStandardFonts; -} - -static SkTypeface* SkTypefaceFromPdfStandardFont(const char* fontName, bool bold, bool italic) { - map& standardFontMap = getStandardFonts(); - - if (standardFontMap.find(fontName) != standardFontMap.end()) { - SkPdfStandardFont fontData = standardFontMap[fontName]; - - // TODO(edisonn): How does the bold/italic specified in standard definition combines with - // the one in /font key? use OR for now. - bold = bold || fontData.fIsBold; - italic = italic || fontData.fIsItalic; - - SkTypeface* typeface = SkTypeface::CreateFromName( - fontData.fName, - SkTypeface::Style((bold ? SkTypeface::kBold : 0) | - (italic ? SkTypeface::kItalic : 0))); - if (typeface) { - typeface->ref(); - } - return typeface; +static SkTypeface* SkTypefaceFromPdfFont(PdfFont* font) { + if (font == NULL) { + return SkTypeface::CreateFromName("Times New Roman", SkTypeface::kNormal); } - return NULL; -} -static SkTypeface* SkTypefaceFromPdfFont(PdfFont* font) { PdfObject* fontObject = font->GetObject(); PdfObject* pBaseFont = NULL; @@ -728,6 +645,7 @@ static SkTypeface* SkTypefaceFromPdfFont(PdfFont* font) { (font->IsItalic() ? SkTypeface::kItalic : 0))); } + // TODO(edisonn): move this code in podofo, so we don't have to fix the font. // This logic needs to be moved in PdfEncodingObjectFactory::CreateEncoding std::map gFontsFixed; @@ -751,23 +669,85 @@ PdfEncoding* FixPdfFont(PdfContext* pdfContext, PdfFont* fCurFont) { } PdfResult DrawText(PdfContext* pdfContext, - PdfFont* fCurFont, - const PdfString& rString, + const SkPdfObject* str, SkCanvas* canvas) { + + SkPdfFont* skfont = pdfContext->fGraphicsState.fSkFont; + if (skfont == NULL) { + skfont = SkPdfFont::Default(); + } + + SkUnencodedText binary(str); + + SkDecodedText decoded; + skfont->encoding()->decodeText(binary, &decoded); + + SkUnicodeText unicode; + skfont->ToUnicode(decoded, &unicode); + + SkPaint paint; + // TODO(edisonn): when should fCurFont->GetFontSize() used? When cur is fCurFontSize == 0? + // Or maybe just not call setTextSize at all? + if (pdfContext->fGraphicsState.fCurFontSize != 0) { + paint.setTextSize(SkDoubleToScalar(pdfContext->fGraphicsState.fCurFontSize)); + } + +// if (fCurFont && fCurFont->GetFontScale() != 0) { +// paint.setTextScaleX(SkFloatToScalar(fCurFont->GetFontScale() / 100.0)); +// } + + pdfContext->fGraphicsState.applyGraphicsState(&paint, false); + + canvas->save(); + +#if 1 + SkMatrix matrix = pdfContext->fGraphicsState.fMatrixTm; + + SkPoint point1; + pdfContext->fGraphicsState.fMatrixTm.mapXY(SkIntToScalar(0), SkIntToScalar(0), &point1); + + SkMatrix mirror; + mirror.setTranslate(0, -point1.y()); + // TODO(edisonn): fix rotated text, and skewed too + mirror.postScale(SK_Scalar1, -SK_Scalar1); + // TODO(edisonn): post rotate, skew + mirror.postTranslate(0, point1.y()); + + matrix.postConcat(mirror); + + canvas->setMatrix(matrix); + + SkTraceMatrix(matrix, "mirrored"); +#endif + + skfont->drawText(unicode, &paint, canvas, &pdfContext->fGraphicsState.fMatrixTm); + canvas->restore(); + +/* + PdfString& rString = str->podofo()->GetString(); + + //pdfContext->fGraphicsState.fSkFont->GetDecoding()->ToUnicode(rString); + //void* text; + //int len; + //SkPaint paint; + //pdfContext->fGraphicsState.fSkFont->drawText(text, len, paint, canvas, &pdfContext->fGraphicsState.fMatrixTm); + + PdfFont* fCurFont = pdfContext->fGraphicsState.fCurFont; + if (!fCurFont) { // TODO(edisonn): ignore the error, use the default font? - return kError_PdfResult; + // return kError_PdfResult; } - const PdfEncoding* enc = FixPdfFont(pdfContext, fCurFont); + const PdfEncoding* enc = fCurFont ? FixPdfFont(pdfContext, fCurFont) : NULL; bool cMapUnicodeFont = enc != NULL; - if (!enc) enc = fCurFont->GetEncoding(); + if (!enc) enc = fCurFont ? fCurFont->GetEncoding() : NULL; if (!enc) { // TODO(edisonn): Can we recover from this error? - return kError_PdfResult; + //return kError_PdfResult; } PdfString r2 = rString; @@ -777,7 +757,7 @@ PdfResult DrawText(PdfContext* pdfContext, r2 = PdfString((pdf_utf16be*)rString.GetString(), rString.GetLength() / 2); } - unicode = enc->ConvertToUnicode( r2, fCurFont ); + unicode = enc ? enc->ConvertToUnicode( r2, fCurFont ) : r2.ToUnicode(); #ifdef PDF_TRACE printf("%i %i ? %c rString.len = %i\n", (int)rString.GetString()[0], (int)rString.GetString()[1], (int)rString.GetString()[1], rString.GetLength()); @@ -790,7 +770,7 @@ PdfResult DrawText(PdfContext* pdfContext, if (pdfContext->fGraphicsState.fCurFontSize != 0) { paint.setTextSize(SkDoubleToScalar(pdfContext->fGraphicsState.fCurFontSize)); } - if (fCurFont->GetFontScale() != 0) { + if (fCurFont && fCurFont->GetFontScale() != 0) { paint.setTextScaleX(SkFloatToScalar(fCurFont->GetFontScale() / 100.0)); } @@ -798,9 +778,6 @@ PdfResult DrawText(PdfContext* pdfContext, paint.setTypeface(SkTypefaceFromPdfFont(fCurFont)); - paint.setAntiAlias(true); - // TODO(edisonn): paint.setStyle(...); - canvas->save(); SkMatrix matrix = pdfContext->fGraphicsState.fMatrixTm; @@ -892,7 +869,7 @@ PdfResult DrawText(PdfContext* pdfContext, canvas->restore(); - +*/ return kPartial_PdfResult; } @@ -1128,6 +1105,31 @@ bool ObjectFromDictionary(const PdfMemDocument* pdfDoc, return ObjectFromDictionary(pdfDoc, dict, abr, data); } +bool StreamFromDictionary(const PdfMemDocument* pdfDoc, + const PdfDictionary& dict, + const char* key, + SkPdfStream** data) { + const PdfObject* value = resolveReferenceObject(pdfDoc, + dict.GetKey(PdfName(key)), + true); + if (value == NULL) { + return false; + } + if (data == NULL) { + return true; + } + return PodofoMapper::map(*pdfDoc, *value, data); +} + +bool StreamFromDictionary(const PdfMemDocument* pdfDoc, + const PdfDictionary& dict, + const char* key, + const char* abr, + SkPdfStream** data) { + if (StreamFromDictionary(pdfDoc, dict, key, data)) return true; + if (abr == NULL || *abr == '\0') return false; + return StreamFromDictionary(pdfDoc, dict, abr, data); +} // TODO(edisonn): perf!!! @@ -1499,23 +1501,10 @@ PdfResult doXObject_Form(PdfContext* pdfContext, SkCanvas* canvas, SkPdfType1For // TODO(edisonn): iterate smart on the stream even if it is compressed, tokenize it as we go. // For this PdfContentsTokenizer needs to be extended. - char* uncompressedStream = NULL; - pdf_long uncompressedStreamLength = 0; - PdfResult ret = kPartial_PdfResult; - - // TODO(edisonn): get rid of try/catch exceptions! We should not throw on user data! - try { - skobj->podofo()->GetStream()->GetFilteredCopy(&uncompressedStream, &uncompressedStreamLength); - if (uncompressedStream != NULL && uncompressedStreamLength != 0) { - SkPdfTokenizer tokenizer = pdfContext->fPdfDoc.tokenizerOfStream(uncompressedStream, uncompressedStreamLength); - PdfMainLooper looper(NULL, tokenizer, pdfContext, canvas); - looper.loop(); - } - free(uncompressedStream); - } catch (PdfError& e) { - ret = kIgnoreError_PdfResult; - } + SkPdfTokenizer tokenizer(skobj); + PdfMainLooper looper(NULL, &tokenizer, pdfContext, canvas); + looper.loop(); // TODO(edisonn): should we restore the variable stack at the same state? // There could be operands left, that could be consumed by a parent tokenizer when we pop. @@ -1970,9 +1959,31 @@ PdfResult PdfOp_Tf(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** lo printf("font name: %s\n", fontName.c_str()); std::string str; pdfContext->fGraphicsState.fResources->podofo()->ToString(str); - printf("Print Tf font Resources: %s\n", str.c_str()); + printf("Print Tf Resources: %s\n", str.c_str()); + pdfContext->fGraphicsState.fResources->Font()->podofo()->ToString(str); + printf("Print Tf Resources/Font: %s\n", str.c_str()); #endif + SkPdfFontDictionary* fd = NULL; + if (pdfContext->fGraphicsState.fResources->Font()) { + SkPdfObject objFont = pdfContext->fGraphicsState.fResources->Font()->get(fontName.c_str()); + PodofoMapper::map(objFont, &fd); + +#ifdef PDF_TRACE + objFont.podofo()->ToString(str); + printf("Print Font loaded: %s\n", str.c_str()); + fd->podofo()->ToString(str); + printf("Print Font loaded and resolved and upgraded: %s\n", str.c_str()); +#endif + + } + + SkPdfFont* skfont = SkPdfFont::fontFromPdfDictionary(fd); + + if (skfont) { + pdfContext->fGraphicsState.fSkFont = skfont; + } + // TODO(edisonn): Load font from pdfContext->fGraphicsState.fObjectWithResources ? const PdfObject* pFont = resolveReferenceObject(&pdfContext->fPdfDoc.podofo(), pdfContext->fGraphicsState.fResources->Font()->get(fontName.c_str()).podofo()); @@ -1982,9 +1993,10 @@ PdfResult PdfOp_Tf(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** lo return kIgnoreError_PdfResult; } - pdfContext->fGraphicsState.fCurFont = pdfContext->fPdfDoc.podofo().GetFont( (PdfObject*)pFont ); - if( !pdfContext->fGraphicsState.fCurFont ) - { + PdfFont* font = pdfContext->fPdfDoc.podofo().GetFont( (PdfObject*)pFont ); + if (font) { + pdfContext->fGraphicsState.fCurFont = font; + } else { // TODO(edisonn): check ~/crasing, for one of the files PoDoFo throws exception // when calling pFont->Reference(), with Linked list corruption. return kIgnoreError_PdfResult; @@ -2000,8 +2012,7 @@ PdfResult PdfOp_Tj(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** lo } PdfResult ret = DrawText(pdfContext, - pdfContext->fGraphicsState.fCurFont, - pdfContext->fObjectStack.top()->podofo()->GetString(), + pdfContext->fObjectStack.top(), canvas); pdfContext->fObjectStack.pop(); @@ -2052,13 +2063,13 @@ PdfResult PdfOp_TJ(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** lo for( int i=0; i(array->size()); i++ ) { - if( (*array)[i].asString()) { + if( (*array)[i]->asString()) { + SkPdfObject* obj = (*array)[i]; DrawText(pdfContext, - pdfContext->fGraphicsState.fCurFont, - (*array)[i].podofo()->GetString(), - canvas); - } else if ((*array)[i].asInteger() || (*array)[i].asNumber()) { - double dx = (*array)[i].asNumber()->value(); + obj, + canvas); + } else if ((*array)[i]->asInteger() || (*array)[i]->asNumber()) { + double dx = (*array)[i]->asNumber()->value(); SkMatrix matrix; matrix.setAll(SkDoubleToScalar(1), SkDoubleToScalar(0), @@ -2617,9 +2628,6 @@ PdfResult PdfMainLooper::consumeToken(PdfToken& token) { if (token.fType == kKeyword_TokenType) { // TODO(edisonn): log trace flag (verbose, error, info, warning, ...) -#ifdef PDF_TRACE - printf("KEYWORD: %s\n", token.fKeyword); -#endif PdfOperatorRenderer pdfOperatorRenderer = gPdfOps[token.fKeyword]; if (pdfOperatorRenderer) { // caller, main work is done by pdfOperatorRenderer(...) @@ -2637,11 +2645,6 @@ PdfResult PdfMainLooper::consumeToken(PdfToken& token) { } else if (token.fType == kObject_TokenType) { -#ifdef PDF_TRACE - std::string _var; - token.fObject->podofo()->ToString(_var); - printf("var: %s\n", _var.c_str()); -#endif fPdfContext->fObjectStack.push( token.fObject ); } else if ( token.fType == kImageData_TokenType) { @@ -2777,7 +2780,7 @@ public: SkAutoTUnref device(SkNEW_ARGS(SkDevice, (bitmap))); SkCanvas canvas(device); - SkPdfTokenizer tokenizer = doc.tokenizerOfPage(pn); + SkPdfTokenizer* tokenizer = doc.tokenizerOfPage(pn); PdfContext pdfContext(doc); pdfContext.fOriginalMatrix = SkMatrix::I(); @@ -2834,6 +2837,8 @@ public: PdfMainLooper looper(NULL, tokenizer, &pdfContext, &canvas); looper.loop(); + delete tokenizer; + canvas.flush(); SkString out; diff --git a/experimental/PdfViewer/pdfspec_autogen.py b/experimental/PdfViewer/pdfspec_autogen.py index 38ff5d3ddf..1c31384e30 100644 --- a/experimental/PdfViewer/pdfspec_autogen.py +++ b/experimental/PdfViewer/pdfspec_autogen.py @@ -1459,7 +1459,7 @@ def buildPdfSpec(pdfspec): .name('Subtype')\ .type('name')\ .comment('(Required) The type of XObject that this dictionary describes; must be\nImage for an image XObject.')\ - .must(datatypes.PdfName('Image'))\ + .must([datatypes.PdfName('Image')])\ .done().done()\ .required('NULL')\ .field('Width')\ @@ -1586,7 +1586,7 @@ def buildPdfSpec(pdfspec): .name('Subtype')\ .type('name')\ .comment('(Required) The type of XObject that this dictionary describes; must be Form\nfor a form XObject.')\ - .must(datatypes.PdfName('Form'))\ + .must([datatypes.PdfName('Form')])\ .done().done()\ .optional()\ .field('FormType')\ @@ -1737,6 +1737,7 @@ def buildPdfSpec(pdfspec): .name('Subtype')\ .type('name')\ .comment('(Required) The type of font; must be Type1 for a Type 1 font.')\ + .must([datatypes.PdfName('Type1')])\ .done().done()\ .optional()\ .field('Name')\ @@ -1788,7 +1789,7 @@ def buildPdfSpec(pdfspec): .done().done()\ .done() - pdfspec.addClass('Type3FontDictionary', 'FontDictionary', 'Entries in a Type 3 font dictionary')\ + pdfspec.addClass('Type3FontDictionary', 'Type0FontDictionary', 'Entries in a Type 3 font dictionary')\ .required('NULL')\ .field('Type')\ .name('Type')\ @@ -1800,6 +1801,7 @@ def buildPdfSpec(pdfspec): .name('Subtype')\ .type('name')\ .comment('(Required) The type of font; must be Type3 for a Type 3 font.')\ + .must([datatypes.PdfName('Type3')])\ .done().done()\ .optional()\ .field('Name')\ @@ -1875,6 +1877,7 @@ def buildPdfSpec(pdfspec): .name('Subtype')\ .type('name')\ .comment('(Required) The type of CIDFont; CIDFontType0 or CIDFontType2.')\ + .must([datatypes.PdfName('CIDFontType0'), datatypes.PdfName('CIDFontType2')])\ .done().done()\ .required('NULL')\ .field('BaseFont')\ @@ -1971,6 +1974,7 @@ def buildPdfSpec(pdfspec): .name('Subtype')\ .type('name')\ .comment('(Required) The type of font; must be Type0 for a Type 0 font.')\ + .must([datatypes.PdfName('Type0')])\ .done().done()\ .required('NULL')\ .field('BaseFont')\ diff --git a/experimental/PdfViewer/spec2def.py b/experimental/PdfViewer/spec2def.py index c5f96e80b9..f524d855ac 100644 --- a/experimental/PdfViewer/spec2def.py +++ b/experimental/PdfViewer/spec2def.py @@ -95,19 +95,19 @@ tableToClassName = { 'TABLE 4.29': ['Type4ShadingDictionary', 'Additional entries specific to a type 4 shading dictionary', 'ShadingDictionary'], 'TABLE 4.30': ['Type5ShadingDictionary', 'Additional entries specific to a type 5 shading dictionary', 'ShadingDictionary'], 'TABLE 4.31': ['Type6ShadingDictionary', 'Additional entries specific to a type 6 shading dictionary', 'ShadingDictionary'], -'TABLE 4.35': ['ImageDictionary', 'Additional entries specific to an image dictionary', 'XObjectDictionary', {'Subtype': 'datatypes.PdfName(\'Image\')'}], +'TABLE 4.35': ['ImageDictionary', 'Additional entries specific to an image dictionary', 'XObjectDictionary', {'Subtype': '[datatypes.PdfName(\'Image\')]'}], 'TABLE 4.37': ['AlternateImageDictionary', 'Entries in an alternate image dictionary'], -'TABLE 4.41': ['Type1FormDictionary', 'Additional entries specific to a type 1 form dictionary', 'XObjectDictionary', {'Subtype': 'datatypes.PdfName(\'Form\')'}], +'TABLE 4.41': ['Type1FormDictionary', 'Additional entries specific to a type 1 form dictionary', 'XObjectDictionary', {'Subtype': '[datatypes.PdfName(\'Form\')]'}], 'TABLE 4.42': ['GroupAttributesDictionary', 'Entries common to all group attributes dictionaries'], 'TABLE 4.43': ['ReferenceDictionary', 'Entries in a reference dictionary'], 'TABLE 4.44': ['PSXobjectDictionary', 'Additional entries specific to a PostScript XObject dictionary'], -'TABLE 5.8': ['Type1FontDictionary', 'Entries in a Type 1 font dictionary', 'FontDictionary'], -'TABLE 5.9': ['Type3FontDictionary', 'Entries in a Type 3 font dictionary', 'FontDictionary'], +'TABLE 5.8': ['Type1FontDictionary', 'Entries in a Type 1 font dictionary', 'FontDictionary', {'Subtype': '[datatypes.PdfName(\'Type1\')]'}], +'TABLE 5.9': ['Type3FontDictionary', 'Entries in a Type 3 font dictionary', 'Type0FontDictionary', {'Subtype': '[datatypes.PdfName(\'Type3\')]'}], 'TABLE 5.11': ['EncodingDictionary', 'Entries in an encoding dictionary'], 'TABLE 5.12': ['CIDSystemInfoDictionary', 'Entries in a CIDSystemInfo dictionary'], -'TABLE 5.13': ['CIDFontDictionary', 'Entries in a CIDFont dictionary', 'FontDictionary'], +'TABLE 5.13': ['CIDFontDictionary', 'Entries in a CIDFont dictionary', 'FontDictionary', {'Subtype': '[datatypes.PdfName(\'CIDFontType0\'), datatypes.PdfName(\'CIDFontType2\')]'}], 'TABLE 5.16': ['CMapDictionary', 'Additional entries in a CMap dictionary'], -'TABLE 5.17': ['Type0FontDictionary', 'Entries in a Type 0 font dictionary', 'FontDictionary'], +'TABLE 5.17': ['Type0FontDictionary', 'Entries in a Type 0 font dictionary', 'FontDictionary', {'Subtype': '[datatypes.PdfName(\'Type0\')]'}], 'TABLE 5.18': ['FontDescriptorDictionary', 'Entries common to all font descriptors'], 'TABLE 5.20': ['CIDFontDescriptorDictionary', 'Additional font descriptor entries for CIDFonts'], 'TABLE 5.23': ['EmbeddedFontStreamDictionary', 'Additional entries in an embedded font stream dictionary'], -- cgit v1.2.3