Index: src/pdf/SkPDFBitmap.cpp |
diff --git a/src/pdf/SkPDFBitmap.cpp b/src/pdf/SkPDFBitmap.cpp |
index 1978040ec93309a4527912f55dea7d0ce5b32421..52b65c01d460d2701b0d59113ccd1ae45938940e 100644 |
--- a/src/pdf/SkPDFBitmap.cpp |
+++ b/src/pdf/SkPDFBitmap.cpp |
@@ -364,19 +364,17 @@ private: |
namespace { |
class PDFDefaultBitmap : public SkPDFObject { |
public: |
- void emitObject(SkWStream* stream, |
+ void emitObject(SkWStream* stream, |
const SkPDFObjNumMap& objNumMap, |
- const SkPDFSubstituteMap& substitutes) const override { |
- emit_image_xobject(stream, fImage, false, fSMask, objNumMap, substitutes); |
+ const SkPDFSubstituteMap& subs) const override { |
+ emit_image_xobject(stream, fImage, false, fSMask, objNumMap, subs); |
} |
void addResources(SkPDFObjNumMap* catalog, |
- const SkPDFSubstituteMap& substitutes) const override { |
+ const SkPDFSubstituteMap& subs) const override { |
if (fSMask.get()) { |
- SkPDFObject* obj = substitutes.getSubstitute(fSMask.get()); |
+ SkPDFObject* obj = subs.getSubstitute(fSMask.get()); |
SkASSERT(obj); |
- if (catalog->addObject(obj)) { |
- obj->addResources(catalog, substitutes); |
- } |
+ catalog->addObjectRecursively(obj, subs); |
} |
} |
PDFDefaultBitmap(const SkImage* image, SkPDFObject* smask) |