#include <stdlib.h>
#include <stddef.h>
#include <string.h>
+#include <unistd.h>
//xpdf header files
#include "GString.h"
#include "gmem.h"
#include "../lib/log.h"
}
-static char* filename = 0;
+static char* swffilename = 0;
static void printInfoString(Dict *infoDict, char *key, char *fmt);
static void printInfoDate(Dict *infoDict, char *key, char *fmt);
int clippos;
int setT1Font(char*name,FontEncoding*enc);
- int initT1Font(int id, FontEncoding*encoding);
int t1id;
};
char*name;
gstr = font->getName();
Ref r=font->getID();
- logf("%s=========== %s (ID:%d) ==========\n", loglevel, gstr?gstr->getCString():"(unknown font)", r.num);
+ logf("%s=========== %s (ID:%d,%d) ==========\n", loglevel, gstr?gstr->getCString():"(unknown font)", r.num,r.gen);
gstr = font->getTag();
if(gstr)
logf("%sType: TrueType\n",loglevel);
break;
}
+
+ Ref embRef;
+ GBool embedded = font->getEmbeddedFontID(&embRef);
name = font->getEmbeddedFontName();
- if(name)
- logf("%sEmbedded name: %s\n",loglevel, name);
+ if(embedded)
+ logf("%sEmbedded name: %s id: %d\n",loglevel, name, embRef.num);
gstr = font->getExtFontFile();
if(gstr)
y1 = y;
state->transform(x, y, &x1, &y1);
- swfoutput_drawchar(&output, x1, y1, c);
+ swfoutput_drawchar(&output, x1, y1, enc->getCharName(c));
}
}
state->transform(state->getX1(),state->getY1(),&x1,&y1);
state->transform(state->getX2(),state->getY2(),&x2,&y2);
if(!outputstarted) {
- swfoutput_init(&output, filename, abs((int)(x2-x1)),abs((int)(y2-y1)));
+ swfoutput_init(&output, swffilename, abs((int)(x2-x1)),abs((int)(y2-y1)));
outputstarted = 1;
}
else
if(id<0)
return 0;
- initT1Font(id, encoding);
-}
-
-int SWFOutputDev::initT1Font(int id, FontEncoding*encoding)
-{
- int encStrSize;
- char *encPtr;
- int i;
- T1_DeleteFont(id);
- T1_LoadFont(id);
- /* reencode the font:
- * This is the only way to get the unmapped characters
- * from t1lib
- */
- encStrSize = 0;
- for (i = 0; i < 256 && i < encoding->getSize(); ++i) {
- if (encoding->getCharName(i)) {
- encStrSize += strlen(encoding->getCharName(i)) + 1;
- }
- }
- char**enc = (char **)gmalloc(257 * sizeof(char *));
- char*encStr = (char *)gmalloc(encStrSize * sizeof(char));
- encPtr = encStr;
- for (i = 0; i < 256 && i < encoding->getSize(); ++i) {
- if (encoding->getCharName(i)) {
- strcpy(encPtr, encoding->getCharName(i));
- enc[i] = encPtr;
- encPtr += strlen(encPtr) + 1;
- } else {
- enc[i] = ".notdef";
- }
- }
- for (; i < 256; ++i) {
- enc[i] = ".notdef";
- }
- enc[256] = "custom";
- int ret=T1_ReencodeFont(id, enc);
- t1id = id;
- return 1;
+ this->t1id = id;
}
void SWFOutputDev::updateLineWidth(GfxState *state)
(char)(rgb.b*255), (char)(opaq*255));
}
-void SWFOutputDev::updateFont(GfxState *state)
+char*writeEmbeddedFontToFile(GfxFont*font)
{
- double m11, m12, m21, m22;
- char * fontname = 0;
- GfxFont*gfxFont = state->getFont();
- char * filename;
-
- if (!gfxFont) {
- return;
- }
- // look for Type 3 font
- if (!type3Warning && gfxFont->getType() == fontType3) {
- type3Warning = gTrue;
- showFontError(gfxFont, 2);
- }
- //dumpFontInfo (gfxFont);
-
+ char*tmpFileName = NULL;
+ char*fileName = NULL;
+ FILE *f;
+ int c;
+ char *fontBuf;
+ int fontLen;
+ Type1CFontConverter *cvt;
+ Ref embRef;
+ Object refObj, strObj;
+ tmpFileName = "/tmp/tmpfont";
+ font->getEmbeddedFontID(&embRef);
- Ref embRef;
- GBool embedded = gfxFont->getEmbeddedFontID(&embRef);
- if(embedded) {
- char*tmpFileName = NULL;
- char*fileName = NULL;
- FILE *f;
- char *fontBuf;
- int fontLen;
- Type1CFontConverter *cvt;
- Ref embRef;
- Object refObj, strObj;
- int c;
- if (!gfxFont->is16Bit() &&
- (gfxFont->getType() == fontType1 ||
- gfxFont->getType() == fontType1C) &&
- gfxFont->getEmbeddedFontID(&embRef)) {
- tmpFileName = "tmpfont";
f = fopen(tmpFileName, "wb");
if (!f) {
logf("<error> Couldn't create temporary Type 1 font file");
- return;
+ return 0;
}
- if (gfxFont->getType() == fontType1C) {
- if (!(fontBuf = gfxFont->readEmbFontFile(&fontLen))) {
+ if (font->getType() == fontType1C) {
+ if (!(fontBuf = font->readEmbFontFile(&fontLen))) {
fclose(f);
logf("<error> Couldn't read embedded font file");
- return ;
+ return 0;
}
cvt = new Type1CFontConverter(fontBuf, fontLen, f);
cvt->convert();
delete cvt;
gfree(fontBuf);
} else {
- gfxFont->getEmbeddedFontID(&embRef);
+ font->getEmbeddedFontID(&embRef);
refObj.initRef(embRef.num, embRef.gen);
refObj.fetch(&strObj);
refObj.free();
fileName = tmpFileName;
if(!fileName) {
logf("<error> Embedded font writer didn't create a file");
- return ;
+ return 0;
}
+ return fileName;
+}
+
+char* gfxFontName(GfxFont* gfxFont)
+{
+ GString *gstr;
+ gstr = gfxFont->getName();
+ if(gstr) {
+ return gstr->getCString();
+ }
+ else {
+ char buf[32];
+ Ref r=gfxFont->getID();
+ sprintf(buf, "UFONT%d", r.num);
+ return strdup(buf);
+ }
+}
+
+void SWFOutputDev::updateFont(GfxState *state)
+{
+ double m11, m12, m21, m22;
+ char * fontname = 0;
+ GfxFont*gfxFont = state->getFont();
+ char * fileName = 0;
+
+ if (!gfxFont) {
+ return;
+ }
+
+ if(swfoutput_queryfont(&output, gfxFontName(gfxFont)))
+ {
+ swfoutput_setfont(&output, gfxFontName(gfxFont), -1, 0);
+ return;
+ }
+
+ // look for Type 3 font
+ if (!type3Warning && gfxFont->getType() == fontType3) {
+ type3Warning = gTrue;
+ showFontError(gfxFont, 2);
+ }
+ //dumpFontInfo ("<notice>", gfxFont);
+
+ Ref embRef;
+ GBool embedded = gfxFont->getEmbeddedFontID(&embRef);
+ if(embedded) {
+ if (!gfxFont->is16Bit() &&
+ (gfxFont->getType() == fontType1 ||
+ gfxFont->getType() == fontType1C)) {
+
+ fileName = writeEmbeddedFontToFile(gfxFont);
+ if(!fileName)
+ return ;
}
else {
showFontError(gfxFont,0);
return ;
}
+
t1id = T1_AddFont(fileName);
- initT1Font(t1id, gfxFont->getEncoding());
} else {
fontname = NULL;
if(gfxFont->getName()) {
}
}
- swfoutput_setfont(&output,gfxFont->getID().num,t1id);
+ swfoutput_setfont(&output,gfxFontName(gfxFont),t1id, fileName);
+ if(fileName)
+ unlink(fileName);
}
void SWFOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
fputc(c, fi);
fclose(fi);
swfoutput_drawimagefile(&output, fileName, width, height, x1,y1,x2,y2,x3,y3,x4,y4);
+ unlink(fileName);
} else {
logf("<notice> File contains pbm pictures.");
}
fputc(c, fi);
fclose(fi);
swfoutput_drawimagefile(&output, fileName, width, height, x1,y1,x2,y2,x3,y3,x4,y4);
+ unlink(fileName);
} else {
logf("<notice> File contains pbm pictures.");
}
void pdfswf_setoutputfilename(char*_filename)
{
- filename = _filename;
+ swffilename = _filename;
}
void pdfswf_convertpage(int page)
git.asbjorn.biz / swftools.git / blobdiff