X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2FSWFOutputDev.cc;h=950f4eba709d83df8f391d78e793e4b580c0144d;hb=896e80b8dc2307cd8da448aca79c362609243091;hp=b447a7e58113ec37de611449dedb5bdfd8da5ba1;hpb=3c35bf20441ec1fec554a085e1b29a1dadf8b46d;p=swftools.git diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc index b447a7e..950f4eb 100644 --- a/pdf2swf/SWFOutputDev.cc +++ b/pdf2swf/SWFOutputDev.cc @@ -1226,6 +1226,9 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y, Unicode u=0; char*name=0; + if(uLen) + u = _u[0]; + if(font->isCIDFont()) { GfxCIDFont*cfont = (GfxCIDFont*)font; @@ -2271,7 +2274,7 @@ void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str, ncomps = colorMap->getNumPixelComps(); bits = colorMap->getBits(); } - + if(maskStr) { int x,y; unsigned char buf[8]; @@ -2307,8 +2310,9 @@ void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str, } delete imgMaskStr; } + maskStr->close(); } - + imgStr = new ImageStream(str, width, ncomps,bits); imgStr->reset(); @@ -2332,6 +2336,7 @@ void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str, state->transform(1, 0, &x3, &y3); x3 += user_movex; y3 += user_movey; state->transform(1, 1, &x4, &y4); x4 += user_movex; y4 += user_movey; + if(!pbminfo && !(str->getKind()==strDCT)) { if(!type3active) { msg(" file contains pbm pictures %s",mask?"(masked)":"");