#include <stdarg.h>
#include <stddef.h>
#include <string.h>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
#include "../../config.h"
#include "../os.h"
#ifdef HAVE_DIRENT_H
#include "GHash.h"
#include "GFXOutputDev.h"
-//swftools header files
+// swftools header files
#include "../log.h"
#include "../gfxdevice.h"
#include "../gfxtools.h"
#include "../devices/render.h"
#include "../art/libart.h"
-#include "../devices/artsutils.c"
+#include "../devices/artsutils.h"
#include "../png.h"
#include "fonts.h"
this->config_remapunicode=0;
this->config_transparent=0;
this->config_extrafontdata = 0;
+ this->config_fontquality = 10;
this->gfxfontlist = gfxfontlist_create();
this->config_transparent = atoi(value);
} else if(!strcmp(key,"extrafontdata")) {
this->config_extrafontdata = atoi(value);
+ } else if(!strcmp(key,"fontquality")) {
+ this->config_fontquality = atof(value);
+ if(this->config_fontquality<=1)
+ this->config_fontquality=1;
} else if(!strcmp(key,"help")) {
printf("\nPDF layer options:\n");
printf("breakonwarning=0/1 Abort conversion if graphic objects are found which\n");
printf(" are not 100%% supported\n");
printf("transparent=0/1 Make PDF transparent (alpha background)\n");
printf("extrafontdata=0/1 Store Type3 characters and capture characters\n");
+ printf("fontquality=1..100 Curve approximation quality of the fonts\n");
}
}
msg("<trace> %d dashes", dashnum);
msg("<trace> | phase: %f", dashphase);
for(t=0;t<dashnum;t++) {
- dash[t] = ldash[t];
+ dash[t] = (float)ldash[t];
msg("<trace> | d%-3d: %f", t, ldash[t]);
}
dash[dashnum] = -1;
dump_outline(line);
}
- line2 = gfxtool_dash_line(line, dash, dashphase);
+ line2 = gfxtool_dash_line(line, dash, (float)dashphase);
line = line2;
free(dash);
msg("<trace> After dashing:");
CharCode charid, int nBytes, Unicode *_u, int uLen)
{
if(!current_fontinfo || (unsigned)charid >= current_fontinfo->num_glyphs || !current_fontinfo->glyphs[charid]) {
- msg("<error> Invalid charid %d for font %s", charid, current_font_id);
+ msg("<error> Invalid charid %d for font (%d characters)", charid, current_fontinfo?current_fontinfo->num_glyphs:0);
return;
}
m.ty += user_movey + clipmovey;
if(!current_fontinfo || (unsigned)charid >= current_fontinfo->num_glyphs || !current_fontinfo->glyphs[charid]) {
- msg("<error> Invalid charid %d for font %s", charid, current_font_id);
+ msg("<error> Invalid charid %d for font", charid);
return gFalse;
}
gfxcolor_t col={0,0,0,0};
this->currentpage = pageNum;
double x1,y1,x2,y2;
int rot = doc->getPageRotate(1);
- gfxcolor_t white;
+ gfxcolor_t white = {255,255,255,255};
+ gfxcolor_t black = {255,0,0,0};
laststate = state;
gfxline_t clippath[5];
- white.r = white.g = white.b = white.a = 255;
-
/* state->transform(state->getX1(),state->getY1(),&x1,&y1);
state->transform(state->getX2(),state->getY2(),&x2,&y2);
Use CropBox, not MediaBox, as page size
void GFXOutputDev::processLink(Link *link, Catalog *catalog)
{
- double x1, y1, x2, y2, w;
+ double x1, y1, x2, y2;
gfxline_t points[5];
int x, y;
}
-gfxfont_t* createGfxFont(GfxFont*xpdffont, FontInfo*src)
+gfxfont_t* createGfxFont(GfxFont*xpdffont, FontInfo*src, double config_fontquality)
{
gfxfont_t*font = (gfxfont_t*)malloc(sizeof(gfxfont_t));
memset(font, 0, sizeof(gfxfont_t));
memset(font->glyphs, 0, sizeof(gfxglyph_t)*src->num_glyphs);
font->id = strdup(getFontID(xpdffont));
int t;
- double quality = (INTERNAL_FONT_SIZE * 20) / src->max_size;
+
+ double quality = (INTERNAL_FONT_SIZE * 200 / config_fontquality) / src->max_size;
double scale = 1;
//printf("%d glyphs\n", font->num_glyphs);
font->num_glyphs = 0;
this->current_fontinfo = this->info->getFont(id);
if(!this->current_fontinfo) {
msg("<error> Internal Error: no fontinfo for font %s\n", id);
+ return;
}
if(!this->current_fontinfo->seen) {
dumpFontInfo("<verbose>", gfxFont);
gfxfont_t*font = gfxfontlist_findfont(this->gfxfontlist,id);
if(!font) {
- font = createGfxFont(gfxFont, current_fontinfo);
+ font = createGfxFont(gfxFont, current_fontinfo, this->config_fontquality);
font->id = strdup(id);
this->gfxfontlist = gfxfontlist_addfont(this->gfxfontlist, font);
device->addfont(device, font);
unsigned char*newdata;
int x,y;
newdata= (unsigned char*)malloc(newwidth*newheight);
- int t;
double fx = (double)(width)/newwidth;
double fy = (double)(height)/newheight;
double px = 0;
p5.y = (int)(p5.y*20)/20.0;
}
- float m00,m10,tx;
- float m01,m11,ty;
-
gfxmatrix_t m;
m.m00 = (p4.x-p1.x)/sizex; m.m10 = (p2.x-p1.x)/sizey;
m.m01 = (p4.y-p1.y)/sizex; m.m11 = (p2.y-p1.y)/sizey;
}
if(mask) {
- int i,j;
unsigned char buf[8];
int x,y;
unsigned char*pic = new unsigned char[width*height];
/* the size of the drawn image is added to the identifier
as the same image may require different bitmaps if displayed
at different sizes (due to antialiasing): */
- int t,found = -1;
+ int found = -1;
if(type3active) {
unsigned char*pic2 = 0;
numpalette = 16;
/* make a black/white palette */
- float r = 255/(numpalette-1);
+ float r = 255./(float)(numpalette-1);
int t;
for(t=0;t<numpalette;t++) {
pal[t].r = colToByte(rgb.r);
{
msg("<notice> Adding %s to language pack directories", dir);
- int l;
FILE*fi = 0;
char* config_file = (char*)malloc(strlen(dir) + 1 + sizeof("add-to-xpdfrc") + 1);
strcpy(config_file, dir);
}
closedir(dir);
#else
- msg("<warning> No dirent.h- unable to add font dir %s", dir);
+ msg("<warning> No dirent.h- unable to add font dir %s", dirname);
#endif
}