| Index: src/pdf/SkPDFCatalog.cpp
|
| diff --git a/src/pdf/SkPDFCatalog.cpp b/src/pdf/SkPDFCatalog.cpp
|
| index adb466c859e020a62c4932074290edb68604482b..5fd0f7619c94de36402b9392978232db86727bca 100644
|
| --- a/src/pdf/SkPDFCatalog.cpp
|
| +++ b/src/pdf/SkPDFCatalog.cpp
|
| @@ -38,13 +38,11 @@ SkPDFObject* SkPDFCatalog::addObject(SkPDFObject* obj, bool onFirstPage) {
|
| return obj;
|
| }
|
|
|
| -size_t SkPDFCatalog::setFileOffset(SkPDFObject* obj, off_t offset) {
|
| +void SkPDFCatalog::setFileOffset(SkPDFObject* obj, off_t offset) {
|
| int objIndex = assignObjNum(obj) - 1;
|
| SkASSERT(fCatalog[objIndex].fObjNumAssigned);
|
| SkASSERT(fCatalog[objIndex].fFileOffset == 0);
|
| fCatalog[objIndex].fFileOffset = offset;
|
| -
|
| - return getSubstituteObject(obj)->getOutputSize(this, true);
|
| }
|
|
|
| void SkPDFCatalog::emitObjectNumber(SkWStream* stream, SkPDFObject* obj) {
|
| @@ -192,23 +190,6 @@ SkPDFObject* SkPDFCatalog::getSubstituteObject(SkPDFObject* object) {
|
| return object;
|
| }
|
|
|
| -off_t SkPDFCatalog::setSubstituteResourcesOffsets(off_t fileOffset,
|
| - bool firstPage) {
|
| - SkTSet<SkPDFObject*>* targetSet = getSubstituteList(firstPage);
|
| - off_t offsetSum = fileOffset;
|
| - for (int i = 0; i < targetSet->count(); ++i) {
|
| - offsetSum += SkToOffT(setFileOffset((*targetSet)[i], offsetSum));
|
| - }
|
| - return offsetSum - fileOffset;
|
| -}
|
| -
|
| -void SkPDFCatalog::emitSubstituteResources(SkWStream *stream, bool firstPage) {
|
| - SkTSet<SkPDFObject*>* targetSet = getSubstituteList(firstPage);
|
| - for (int i = 0; i < targetSet->count(); ++i) {
|
| - (*targetSet)[i]->emit(stream, this, true);
|
| - }
|
| -}
|
| -
|
| SkTSet<SkPDFObject*>* SkPDFCatalog::getSubstituteList(bool firstPage) {
|
| return firstPage ? &fSubstituteResourcesFirstPage :
|
| &fSubstituteResourcesRemaining;
|
|
|