X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2FGFXOutputDev.cc;h=81cb642bea952a7221a498b16d27ee4080d35e2a;hb=de3f74f8a6269f6564371fbee93cfec05d61a408;hp=4a1c310761eaa37f36bf1f0a43e13cfbf8f1a9f7;hpb=d2d02d844617bed89afc5234e24ac7f603e2bc4d;p=swftools.git

diff --git a/lib/pdf/GFXOutputDev.cc b/lib/pdf/GFXOutputDev.cc
index 4a1c310..81cb642 100644
--- a/lib/pdf/GFXOutputDev.cc
+++ b/lib/pdf/GFXOutputDev.cc
@@ -141,7 +141,7 @@ typedef struct _feature
 } feature_t;
 feature_t*featurewarnings = 0;
 
-static void showfeature(char*feature,char fully, char warn)
+void GFXOutputDev::showfeature(char*feature,char fully, char warn)
 {
     feature_t*f = featurewarnings;
     while(f) {
@@ -155,15 +155,19 @@ static void showfeature(char*feature,char fully, char warn)
     featurewarnings = f;
     if(warn) {
 	msg("<warning> %s not yet %ssupported!",feature,fully?"fully ":"");
+	if(this->config_break_on_warning) {
+	    msg("<fatal> Aborting conversion due to unsupported feature");
+	    exit(1);
+	}
     } else {
-	msg("<info> File contains %s",feature);
+	msg("<notice> File contains %s",feature);
     }
 }
-static void warnfeature(char*feature,char fully)
+void GFXOutputDev::warnfeature(char*feature,char fully)
 {
     showfeature(feature,fully,1);
 }
-static void infofeature(char*feature)
+void GFXOutputDev::infofeature(char*feature)
 {
     showfeature(feature,0,0);
 }
@@ -255,18 +259,17 @@ GFXOutputDev::GFXOutputDev(parameter_t*p)
     this->pages = 0;
     this->pagebuflen = 0;
     this->pagepos = 0;
-  
-    this->forceType0Fonts=1;
     this->config_use_fontconfig=1;
+    this->config_break_on_warning=0;
 
     this->parameters = p;
 
     /* configure device */
     while(p) {
-	if(!strcmp(p->name,"forceType0Fonts")) {
-	    this->forceType0Fonts = atoi(p->value);
-	} else if(!strcmp(p->name,"fontconfig")) {
+	if(!strcmp(p->name,"fontconfig")) {
 	    this->config_use_fontconfig = atoi(p->value);
+	} else if(!strcmp(p->name,"breakonwarning")) {
+	    this->config_break_on_warning = atoi(p->value);
 	}
 	p = p->next;
     }
@@ -276,7 +279,7 @@ void GFXOutputDev::setDevice(gfxdevice_t*dev)
 {
     parameter_t*p = this->parameters;
 
-    /* TODO: get rid of this */
+    /* pass parameters to output device */
     this->device = dev;
     if(this->device) {
 	while(p) {
@@ -628,13 +631,13 @@ gfxline_t* gfxPath_to_gfxline(GfxState*state, GfxPath*path, int closed, int user
 
 GBool GFXOutputDev::useTilingPatternFill()
 {
-    warnfeature("tiled patterns", 1);
+    infofeature("tiled patterns");
     return gFalse;
 }
 
 GBool GFXOutputDev::useShadedFills()
 {
-    warnfeature("shaded fills", 1);
+    infofeature("shaded fills");
     return gFalse;
 }
 
@@ -1900,7 +1903,7 @@ void GFXOutputDev::updateFont(GfxState *state)
     if(embedded &&
        (gfxFont->getType() == fontType1 ||
 	gfxFont->getType() == fontType1C ||
-       (gfxFont->getType() == fontCIDType0C && forceType0Fonts) ||
+        gfxFont->getType() == fontCIDType0C ||
 	gfxFont->getType() == fontTrueType ||
 	gfxFont->getType() == fontCIDType2
        ))
@@ -2676,7 +2679,7 @@ void GFXOutputDev::paintTransparencyGroup(GfxState *state, double *bbox)
     else {
 	char buffer[80];
 	sprintf(buffer, "%s blended transparency groups", blendmodes[state->getBlendMode()]);
-	warnfeature("transparency groups", 0);
+	warnfeature(buffer, 0);
     }
 
     gfxresult_t*grouprecording = states[statepos].grouprecording;
@@ -2714,6 +2717,10 @@ void GFXOutputDev::setSoftMask(GfxState *state, double *bbox, GBool alpha, Funct
     states[statepos].softmask = 1;
 }
 
+static inline Guchar div255(int x) {
+  return (Guchar)((x + (x >> 8) + 0x80) >> 8);
+}
+
 void GFXOutputDev::clearSoftMask(GfxState *state)
 {
     if(!states[statepos].softmask)
@@ -2776,14 +2783,12 @@ void GFXOutputDev::clearSoftMask(GfxState *state)
 	gfxcolor_t* l1 = &maskimg->data[maskimg->width*y];
 	gfxcolor_t* l2 = &belowimg->data[belowimg->width*y];
 	for(x=0;x<width;x++) {
-	    l1->a = 255;
 	    l2->a = (77*l1->r + 151*l1->g + 28*l1->b) >> 8;
 
-	    /* premultiply alpha... do we need this? (depends on output device)
-	    l2->r = (l2->a*l2->r) >> 8;
-	    l2->g = (l2->a*l2->g) >> 8;
-	    l2->b = (l2->a*l2->b) >> 8;
-	    */
+	    /* premultiply alpha */
+	    l2->r = div255(l2->a*l2->r);
+	    l2->g = div255(l2->a*l2->g);
+	    l2->b = div255(l2->a*l2->b);
 
 	    l1++;
 	    l2++;