From 2bddd4ed1da6759f2ee741f47261b9f431cba7f8 Mon Sep 17 00:00:00 2001 From: David Mathog <> Date: Tue, 19 Mar 2013 03:22:04 +0100 Subject: changes_2013_03_18c.patch This set of patches does the following: 1. Fixed a typo ( where "+ sizeof()" should have been "* sizeof()") which caused a memory problem for EMF/WMF files with very large numbers of hatches. 2. Added support for background mode, background color, and textcolor in hatches. EMF/WMF files change these parameters but the change may be silent until many records later. This has the odd effect that a stroke or fill may be defined (in SVG) and then it is ignored later and replaced with one with a different background color. 3. Fixed WMF output so that it wasn't adding +1 to the number of pixels for Width and Height. (Allows WMF files to go through several cycles of save as, open without changing sizes.) 4. Cleaned up indenting of [ew]mf-{print|inout}.* files, to make them compliant with the inkscape standard. All indents are (I hope) now 4*i deep. 5. Added underline/strikeout support for text read from EMF/WMF files. Inkscape itself cannot currently render this, but it makes it into the SVG, and it shows up correctly when that SVG is read by Opera. 6. Took out all the "throw" calls, replacing them with g_error(). If this comes up again in debugging a define can be used to remap the g_error to temporarily reintroduce the throw so that gdb can catch them. 7. Took out the "%6lf" format changes from patch 11724, retained the "127" length limit in the same sscanf. 8. Put the C type casts back in, reversing those changes from patch 11724. This is a style issue, and I could not find clear guidance for which way to go. (Nor a good rationale for keeping the lengthier C++ syntax.) So I reviewed a large swath of other inkscape code to see if there was a trend and found a very large number of other sections that were using C style casts instead of the more verbose C++ forms. So I kept it the way it has been. 9. The locale changes from 11724 were of course retained. (bzr r11668.1.59) --- src/extension/internal/emf-print.cpp | 1959 +++++++++++++++++----------------- 1 file changed, 975 insertions(+), 984 deletions(-) (limited to 'src/extension/internal/emf-print.cpp') diff --git a/src/extension/internal/emf-print.cpp b/src/extension/internal/emf-print.cpp index 30571fc25..3296a1be6 100644 --- a/src/extension/internal/emf-print.cpp +++ b/src/extension/internal/emf-print.cpp @@ -81,149 +81,135 @@ namespace Internal { enum drawmode {DRAW_PAINT, DRAW_PATTERN, DRAW_IMAGE, DRAW_LINEAR_GRADIENT, DRAW_RADIAL_GRADIENT}; struct FFNEXUS { - char *fontname; //Font name - FFNEXUS *next; //link to next nexus, NULL if this is the last - double f1; //Vertical (rotating) offset factor (* font height) - double f2; //Vertical (nonrotating) offset factor (* font height) - double f3; //Horizontal (nonrotating) offset factor (* font height) - }; + char *fontname; //Font name + FFNEXUS *next; //link to next nexus, NULL if this is the last + double f1; //Vertical (rotating) offset factor (* font height) + double f2; //Vertical (nonrotating) offset factor (* font height) + double f3; //Horizontal (nonrotating) offset factor (* font height) +}; struct GRADVALUES{ - Geom::Point p1; // center or start - Geom::Point p2; // xhandle or end - Geom::Point p3; // yhandle or unused - double r; // radius or unused - void *grad; // to access the stops information - int mode; // DRAW_LINEAR_GRADIENT or DRAW_RADIAL_GRADIENT, if GRADVALUES is valid, else any value - U_COLORREF bgc; // document background color, this is as good a place as any to keep it - float rgb[3]; // also background color, but as 0-1 float. - }; + Geom::Point p1; // center or start + Geom::Point p2; // xhandle or end + Geom::Point p3; // yhandle or unused + double r; // radius or unused + void *grad; // to access the stops information + int mode; // DRAW_LINEAR_GRADIENT or DRAW_RADIAL_GRADIENT, if GRADVALUES is valid, else any value + U_COLORREF bgc; // document background color, this is as good a place as any to keep it + float rgb[3]; // also background color, but as 0-1 float. +}; /* globals */ -static double PX2WORLD = 20.0f; -static U_XFORM worldTransform; -static bool FixPPTCharPos, FixPPTDashLine, FixPPTGrad2Polys, FixPPTPatternAsHatch, FixImageRot; -static FFNEXUS *emf_short_fflist = NULL; //only those fonts so far encountered. This is SHARED with wmf-print.cpp -static FFNEXUS *emf_long_fflist = NULL; //all the fonts described in ...\share\extensions\fontfix.conf -static EMFTRACK *et = NULL; -static EMFHANDLES *eht = NULL; -static GRADVALUES gv; +static double PX2WORLD = 20.0f; +static U_XFORM worldTransform; +static bool FixPPTCharPos, FixPPTDashLine, FixPPTGrad2Polys, FixPPTPatternAsHatch, FixImageRot; +static FFNEXUS *emf_short_fflist = NULL; //only those fonts so far encountered. This is SHARED with wmf-print.cpp +static FFNEXUS *emf_long_fflist = NULL; //all the fonts described in ...\share\extensions\fontfix.conf +static EMFTRACK *et = NULL; +static EMFHANDLES *eht = NULL; +static GRADVALUES gv; void PrintEmf::read_system_fflist(void){ //this is not called by any other source files - FFNEXUS *temp=NULL; - FFNEXUS *ptr=NULL; - std::fstream fffile; - std::string instr; - char fontname[128]; - double f1,f2,f3; - std::string path_to_ffconf; - - if(emf_long_fflist){ - return; - } - path_to_ffconf=INKSCAPE_EXTENSIONDIR; + FFNEXUS *temp=NULL; + FFNEXUS *ptr=NULL; + std::fstream fffile; + std::string instr; + char fontname[128]; + double f1,f2,f3; + std::string path_to_ffconf; + + if(emf_long_fflist)return; + char *oldlocale = g_strdup(setlocale(LC_NUMERIC, NULL)); + setlocale(LC_NUMERIC, "C"); + + path_to_ffconf=INKSCAPE_EXTENSIONDIR; #ifdef WIN32 - path_to_ffconf.append("\\fontfix.conf"); //Windows path syntax + path_to_ffconf.append("\\fontfix.conf"); //Windows path syntax #else - path_to_ffconf.append("/fontfix.conf"); //Unix/linx path syntax + path_to_ffconf.append("/fontfix.conf"); //Unix/linx path syntax #endif - //open the input - fffile.open(path_to_ffconf.c_str(), std::ios::in); - if(!fffile.is_open()){ - g_error("Unable to open file: %s\n", path_to_ffconf.c_str()); - // throw "boom"; - } - - char *oldlocale = g_strdup (setlocale (LC_NUMERIC, NULL)); - setlocale (LC_NUMERIC, "C"); - - while (std::getline(fffile,instr)){ - if (instr.empty()) { - continue; - } - if(instr[0]=='#'){ - continue; + //open the input + fffile.open(path_to_ffconf.c_str(), std::ios::in); + if(!fffile.is_open()){ + g_error("Unable to open file: %s\n", path_to_ffconf.c_str()); } - - // not a comment, get the 4 values from the line - int elements=sscanf(instr.c_str(),"%6lf %6lf %6lf %127[^\n\r]",&f1,&f2,&f3, &fontname[0]); - if(elements!=4){ - setlocale (LC_NUMERIC, oldlocale); - g_free (oldlocale); - fffile.close(); - g_error("Expected \"f1 f2 f3 Fontname\" but did not find it in file: %s\n", path_to_ffconf.c_str()); - // throw "boom"; - } - temp=(FFNEXUS *) calloc(1,sizeof(FFNEXUS)); //This will never be freed - temp->f1=f1; - temp->f2=f2; - temp->f3=f3; - temp->fontname=strdup(fontname); //This will never be freed - temp->next=NULL; //just to be explicit, it is already 0 - if(ptr){ - ptr->next=temp; - ptr=temp; - } - else { - emf_long_fflist=ptr=temp; + while (std::getline(fffile,instr)){ + if(instr[0]=='#')continue; + // not a comment, get the 4 values from the line + int elements=sscanf(instr.c_str(),"%lf %lf %lf %127[^\n]",&f1,&f2,&f3, &fontname[0]); + if(elements!=4){ + g_error("Expected \"f1 f2 f3 Fontname\" but did not find it in file: %s\n", path_to_ffconf.c_str()); + } + temp=(FFNEXUS *) calloc(1,sizeof(FFNEXUS)); //This will never be freed + temp->f1=f1; + temp->f2=f2; + temp->f3=f3; + temp->fontname=strdup(fontname); //This will never be freed + temp->next=NULL; //just to be explicit, it is already 0 + if(ptr){ + ptr->next=temp; + ptr=temp; + } + else { + emf_long_fflist=ptr=temp; + } } - } - setlocale (LC_NUMERIC, oldlocale); - g_free (oldlocale); - fffile.close(); + fffile.close(); + + setlocale(LC_NUMERIC, oldlocale); + g_free(oldlocale); } /* Looks for the fontname in the long list. If it does not find it, it adds the default values to the short list with this fontname. If it does find it, then it adds the specified values. */ void PrintEmf::search_long_fflist(const char *fontname, double *f1, double *f2, double *f3){ //this is not called by any other source files -FFNEXUS *ptr=NULL; -FFNEXUS *tmp=emf_long_fflist; - if(!emf_long_fflist){ - g_error("Programming error search_long_fflist called before read_system_fflist\n"); - // throw "boom"; - } - ptr=emf_long_fflist; - while(ptr){ - if(!strcmp(ptr->fontname,fontname)){ tmp=ptr; break; } - ptr=ptr->next; - } - //tmp points at either the found name, or the default, the first entry in long_fflist - if(!emf_short_fflist){ - ptr=emf_short_fflist=(FFNEXUS *) malloc(sizeof(FFNEXUS)); - } - else { - ptr=emf_short_fflist; - while(ptr->next){ ptr=ptr->next; } - ptr->next=(FFNEXUS *) malloc(sizeof(FFNEXUS)); - ptr=ptr->next; - } - ptr->fontname=strdup(tmp->fontname); - *f1 = ptr->f1 = tmp->f1; - *f2 = ptr->f2 = tmp->f2; - *f3 = ptr->f3 = tmp->f3; - ptr->next=NULL; + FFNEXUS *ptr=NULL; + FFNEXUS *tmp=emf_long_fflist; + if(!emf_long_fflist){ + g_error("Programming error search_long_fflist called before read_system_fflist\n"); + } + ptr=emf_long_fflist; + while(ptr){ + if(!strcmp(ptr->fontname,fontname)){ tmp=ptr; break; } + ptr=ptr->next; + } + //tmp points at either the found name, or the default, the first entry in long_fflist + if(!emf_short_fflist){ + ptr=emf_short_fflist=(FFNEXUS *) malloc(sizeof(FFNEXUS)); + } + else { + ptr=emf_short_fflist; + while(ptr->next){ ptr=ptr->next; } + ptr->next=(FFNEXUS *) malloc(sizeof(FFNEXUS)); + ptr=ptr->next; + } + ptr->fontname=strdup(tmp->fontname); + *f1 = ptr->f1 = tmp->f1; + *f2 = ptr->f2 = tmp->f2; + *f3 = ptr->f3 = tmp->f3; + ptr->next=NULL; } /* Looks for the fontname in the short list. If it does not find it, it looks in the long_fflist. Either way it returns the f1, f2, f3 parameters for the font, even if these are for the default. */ void PrintEmf::search_short_fflist(const char *fontname, double *f1, double *f2, double *f3){ //this is not called by any other source files -FFNEXUS *ptr=NULL; -static FFNEXUS *last=NULL; - if(!emf_long_fflist){ - g_error("Programming error search_short_fflist called before read_system_fflist\n"); - // throw "boom"; - } - // This speeds things up a lot - if the same font is called twice in a row, pull it out immediately - if(last && !strcmp(last->fontname,fontname)){ ptr=last; } - else { ptr=emf_short_fflist; } // short_fflist may still be NULL - while(ptr){ - if(!strcmp(ptr->fontname,fontname)){ *f1=ptr->f1; *f2=ptr->f2; *f3=ptr->f3; last=ptr; return; } - ptr=ptr->next; - } - //reach this point only if there is no match - search_long_fflist(fontname, f1, f2, f3); + FFNEXUS *ptr=NULL; + static FFNEXUS *last=NULL; + + if(!emf_long_fflist){ + g_error("Programming error search_short_fflist called before read_system_fflist\n"); + } + // This speeds things up a lot - if the same font is called twice in a row, pull it out immediately + if(last && !strcmp(last->fontname,fontname)){ ptr=last; } + else { ptr=emf_short_fflist; } // short_fflist may still be NULL + while(ptr){ + if(!strcmp(ptr->fontname,fontname)){ *f1=ptr->f1; *f2=ptr->f2; *f3=ptr->f3; last=ptr; return; } + ptr=ptr->next; + } + //reach this point only if there is no match + search_long_fflist(fontname, f1, f2, f3); } void PrintEmf::smuggle_adxky_out(const char *string, uint32_t **adx, double *ky, int *ndx, float scale){ @@ -238,14 +224,11 @@ void PrintEmf::smuggle_adxky_out(const char *string, uint32_t **adx, double *ky, if(!*ndx)return; // this could happen with an empty string cptr += 7; ladx = (uint32_t *) malloc(*ndx * sizeof(uint32_t) ); - if(!ladx){ - g_error("Out of memory"); - // throw "Out of memory"; - } + if(!ladx)g_message("Out of memory"); *adx=ladx; for(i=0; i<*ndx; i++,cptr+=7, ladx++){ - sscanf(cptr,"%7f",&fdx); - *ladx = static_cast(round(fdx * scale)); + sscanf(cptr,"%7f",&fdx); + *ladx=(uint32_t) round(fdx * scale); } cptr++; // skip 2nd fake terminator sscanf(cptr,"%7f",&fdx); @@ -256,13 +239,12 @@ void PrintEmf::smuggle_adxky_out(const char *string, uint32_t **adx, double *ky, inverse of sethexcolor() in emf-inout.cpp */ U_COLORREF PrintEmf::gethexcolor(uint32_t color){ - U_COLORREF out; - out = U_RGB( - (color >> 16) & 0xFF, - (color >> 8) & 0xFF, - (color >> 0) & 0xFF - ); + out = U_RGB( + (color >> 16) & 0xFF, + (color >> 8) & 0xFF, + (color >> 0) & 0xFF + ); return(out); } @@ -285,7 +267,7 @@ uint32_t PrintEmf::transweight(const unsigned int inkweight){ PrintEmf::PrintEmf (void) { - // all of the class variables are initialized elsewhere, many in PrintWmf::Begin, + // all of the class variables are initialized elsewhere, many in PrintEmf::Begin, } @@ -308,21 +290,21 @@ unsigned int PrintEmf::setup (Inkscape::Extension::Print * /*mod*/) unsigned int PrintEmf::begin (Inkscape::Extension::Print *mod, SPDocument *doc) { - U_SIZEL szlDev, szlMm; - U_RECTL rclBounds, rclFrame; - char *rec; - - gchar const *utf8_fn = mod->get_param_string("destination"); - FixPPTCharPos = mod->get_param_bool("FixPPTCharPos"); - FixPPTDashLine = mod->get_param_bool("FixPPTDashLine"); - FixPPTGrad2Polys = mod->get_param_bool("FixPPTGrad2Polys"); + U_SIZEL szlDev, szlMm; + U_RECTL rclBounds, rclFrame; + char *rec; + gchar const *utf8_fn = mod->get_param_string("destination"); + + FixPPTCharPos = mod->get_param_bool("FixPPTCharPos"); + FixPPTDashLine = mod->get_param_bool("FixPPTDashLine"); + FixPPTGrad2Polys = mod->get_param_bool("FixPPTGrad2Polys"); FixPPTPatternAsHatch = mod->get_param_bool("FixPPTPatternAsHatch"); - FixImageRot = mod->get_param_bool("FixImageRot"); + FixImageRot = mod->get_param_bool("FixImageRot"); (void) emf_start(utf8_fn, 1000000, 250000, &et); // Initialize the et structure (void) htable_create(128, 128, &eht); // Initialize the eht structure - char *ansi_uri = const_cast(utf8_fn); + char *ansi_uri = (char *) utf8_fn; // width and height in px @@ -331,18 +313,18 @@ unsigned int PrintEmf::begin (Inkscape::Extension::Print *mod, SPDocument *doc) // initialize a few global variables hbrush = hbrushOld = hpen = 0; - use_stroke = use_fill = simple_shape = false; + use_stroke = use_fill = simple_shape = usebk = false; Inkscape::XML::Node *nv = sp_repr_lookup_name (doc->rroot, "sodipodi:namedview"); if(nv){ - const char *p1 = nv->attribute("pagecolor"); - char *p2; - uint32_t lc = strtoul( &p1[1], &p2, 16 ); // it looks like "#ABC123" - if(*p2)lc=0; - gv.bgc = gethexcolor(lc); - gv.rgb[0] = static_cast(U_RGBAGetR(gv.bgc)/255.0); - gv.rgb[1] = static_cast(U_RGBAGetG(gv.bgc)/255.0); - gv.rgb[2] = static_cast(U_RGBAGetB(gv.bgc)/255.0); + const char *p1 = nv->attribute("pagecolor"); + char *p2; + uint32_t lc = strtoul( &p1[1], &p2, 16 ); // it looks like "#ABC123" + if(*p2)lc=0; + gv.bgc = gethexcolor(lc); + gv.rgb[0] = (float) U_RGBAGetR(gv.bgc)/255.0; + gv.rgb[1] = (float) U_RGBAGetG(gv.bgc)/255.0; + gv.rgb[2] = (float) U_RGBAGetB(gv.bgc)/255.0; } bool pageBoundingBox; @@ -354,9 +336,7 @@ unsigned int PrintEmf::begin (Inkscape::Extension::Print *mod, SPDocument *doc) } else { SPItem* doc_item = doc->getRoot(); Geom::OptRect bbox = doc_item->desktopVisualBounds(); - if (bbox) { - d = *bbox; - } + if (bbox) d = *bbox; } d *= Geom::Scale(IN_PER_PX); @@ -365,7 +345,7 @@ unsigned int PrintEmf::begin (Inkscape::Extension::Print *mod, SPDocument *doc) float dwInchesY = d.height(); // dwInchesX x dwInchesY in micrometer units, dpi=90 -> 3543.3 dpm - (void) drawing_size(static_cast(ceil(dwInchesX*25.4)), static_cast(ceil(dwInchesY*25.4)), 3.543307, &rclBounds, &rclFrame); + (void) drawing_size((int) ceil(dwInchesX*25.4), (int) ceil(dwInchesY*25.4), 3.543307, &rclBounds, &rclFrame); // set up the reference device as 100 X A4 horizontal, (1200 dpi/25.4 -> dpmm). Extra digits maintain dpi better in EMF int MMX = 21600; @@ -392,17 +372,15 @@ unsigned int PrintEmf::begin (Inkscape::Extension::Print *mod, SPDocument *doc) // construct the EMRHEADER record and append it to the EMF in memory rec = U_EMRHEADER_set( rclBounds, rclFrame, NULL, cbDesc, Description, szlDev, szlMm, 0); free(Description); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - g_error("Fatal programming error in PrintEmf::begin at EMRHEADER"); - // throw "Fatal programming error in PrintEmf::begin at EMRHEADER"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::begin at EMRHEADER"); } // Simplest mapping mode, supply all coordinates in pixels rec = U_EMRSETMAPMODE_set(U_MM_TEXT); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - g_error ("Fatal programming error in PrintEmf::begin at EMRSETMAPMODE"); - // throw "Fatal programming error in PrintEmf::begin at EMRSETMAPMODE"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::begin at EMRSETMAPMODE"); } @@ -417,35 +395,66 @@ unsigned int PrintEmf::begin (Inkscape::Extension::Print *mod, SPDocument *doc) worldTransform.eDy = 0; rec = U_EMRMODIFYWORLDTRANSFORM_set(worldTransform, U_MWT_LEFTMULTIPLY); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - g_error("Fatal programming error in PrintEmf::begin at EMRMODIFYWORLDTRANSFORM"); - // throw "Fatal programming error in PrintEmf::begin at EMRMODIFYWORLDTRANSFORM"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::begin at EMRMODIFYWORLDTRANSFORM"); } if (1) { snprintf(buff, sizeof(buff)-1, "Screen=%dx%dpx, %dx%dmm", PixelsX, PixelsY, MMX, MMY); rec = textcomment_set(buff); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - g_error("Fatal programming error in PrintEmf::begin at textcomment_set 1"); - // throw "Fatal programming error in PrintEmf::begin at textcomment_set 1"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::begin at textcomment_set 1"); } snprintf(buff, sizeof(buff)-1, "Drawing=%.1lfx%.1lfpx, %.1lfx%.1lfmm", _width, _height, dwInchesX * MM_PER_IN, dwInchesY * MM_PER_IN); rec = textcomment_set(buff); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - g_error("Fatal programming error in PrintEmf::begin at textcomment_set 1"); - // throw "Fatal programming error in PrintEmf::begin at textcomment_set 1"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::begin at textcomment_set 1"); } } + /* set some parameters, else the program that reads the EMF may default to other values */ + + rec = U_EMRSETBKMODE_set(U_TRANSPARENT); + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::text at U_EMRSETBKMODE_set"); + } + + hpolyfillmode=U_WINDING; + rec = U_EMRSETPOLYFILLMODE_set(U_WINDING); + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::text at U_EMRSETPOLYFILLMODE_set"); + } + + // Text alignment: (Never changes) + // - (x,y) coordinates received by this filter are those of the point where the text + // actually starts, and already takes into account the text object's alignment; + // - for this reason, the EMF text alignment must always be TA_BASELINE|TA_LEFT. + rec = U_EMRSETTEXTALIGN_set(U_TA_BASELINE | U_TA_LEFT); + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::text at U_EMRSETTEXTALIGN_set"); + } + + htextcolor_rgb[0] = htextcolor_rgb[1] = htextcolor_rgb[2] = 0.0; + rec = U_EMRSETTEXTCOLOR_set(U_RGB(0,0,0)); + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::text at U_EMRSETTEXTCOLOR_set"); + } + + rec = U_EMRSETROP2_set(U_R2_COPYPEN); + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::text at U_EMRSETROP2_set"); + } + + /* miterlimit is set with eah pen, so no need to check for it changes as in WMF */ + return 0; } unsigned int PrintEmf::finish (Inkscape::Extension::Print * /*mod*/) { -// std::cout << "finish " << std::endl; char *rec; if (!et) return 0; @@ -453,57 +462,64 @@ unsigned int PrintEmf::finish (Inkscape::Extension::Print * /*mod*/) // earlier versions had flush of fill here, but it never executed and was removed rec = U_EMREOF_set(0,NULL,et); // generate the EOF record - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - g_error("Fatal programming error in PrintEmf::finish"); - // throw "Fatal programming error in PrintEmf::finish"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::finish"); } (void) emf_finish(et, eht); // Finalize and write out the EMF emf_free(&et); // clean up htable_free(&eht); // clean up -// std::cout << "end finish" << std::endl; return 0; } -unsigned int PrintEmf::comment (Inkscape::Extension::Print * /*module*/, - const char * /*comment*/) +unsigned int PrintEmf::comment ( + Inkscape::Extension::Print * /*module*/, + const char * /*comment*/) { -// std::cout << "comment " << std::endl; if (!et) return 0; // earlier versions had flush of fill here, but it never executed and was removed -// std::cout << "end comment" << std::endl; return 0; } -// Extracth hatchType, hatchColor from a name like +// Extract hatchType, hatchColor from a name like // EMFhatch_ // Where the first one is a number and the second a color in hex. // hatchType and hatchColor have been set with defaults before this is called. // -void PrintEmf::hatch_classify(char *name, int *hatchType, U_COLORREF *hatchColor){ - int val; - uint32_t hcolor=0; - // name should be EMFhatch or WMFhatch but *MFhatch will be accepted - if(0!=strncmp(&name[1],"MFhatch",7)){ return; } // not anything we can parse - name+=8; // EMFhatch already detected - val = 0; - while(*name && isdigit(*name)){ - val = 10*val + *name - '0'; - name++; - } - *hatchType = val; - if(*name != '_' || val > U_HS_DITHEREDBKCLR){ // wrong syntax, cannot classify - *hatchType = -1; - } - else { - name++; - if(1 != sscanf(name,"%X",&hcolor)){ *hatchType = -1; } // again wrong syntax, cannot classify - *hatchColor = gethexcolor(hcolor); - } - if(*hatchType > U_HS_SOLIDCLR)*hatchType = U_HS_SOLIDCLR; +void PrintEmf::hatch_classify(char *name, int *hatchType, U_COLORREF *hatchColor, U_COLORREF *bkColor){ + int val; + uint32_t hcolor=0; + uint32_t bcolor=0; + + // name should be EMFhatch or WMFhatch but *MFhatch will be accepted + if(0!=strncmp(&name[1],"MFhatch",7)){ return; } // not anything we can parse + name += 8; // EMFhatch already detected + val = 0; + while(*name && isdigit(*name)){ + val = 10*val + *name - '0'; + name++; + } + *hatchType = val; + if(*name != '_' || val > U_HS_DITHEREDBKCLR){ // wrong syntax, cannot classify + *hatchType = -1; + } + else { + name++; + if(2 != sscanf(name,"%X_%X", &hcolor, &bcolor)){ // not a pattern with background + if(1 != sscanf(name,"%X", &hcolor)){ *hatchType = -1; } // not a pattern, cannot classify + *hatchColor = gethexcolor(hcolor); + } + else { + *hatchColor = gethexcolor(hcolor); + *bkColor = gethexcolor(bcolor); + usebk = true; + } + } + /* Everything > U_HS_SOLIDCLR is solid, just specify the color in the brush rather than messing around with background or textcolor */ + if(*hatchType > U_HS_SOLIDCLR)*hatchType = U_HS_SOLIDCLR; } // @@ -513,125 +529,124 @@ void PrintEmf::hatch_classify(char *name, int *hatchType, U_COLORREF *hatchColor // otherwise hatchType is set to -1 and hatchColor is not defined. // -void PrintEmf::brush_classify(SPObject *parent, int depth, GdkPixbuf **epixbuf, int *hatchType, U_COLORREF *hatchColor){ - if(depth==0){ - *epixbuf = NULL; - *hatchType = -1; - *hatchColor = U_RGB(0,0,0); - } - depth++; - // first look along the pattern chain, if there is one - if(SP_IS_PATTERN(parent)){ - for (SPPattern *pat_i = SP_PATTERN(parent); pat_i != NULL; pat_i = pat_i->ref ? pat_i->ref->getObject() : NULL) { - if(SP_IS_IMAGE(pat_i)){ - *epixbuf = ((SPImage *)pat_i)->pixbuf; - return; - } - char temp[32]; // large enough - temp[31]='\0'; - strncpy(temp,pat_i->getAttribute("id"),31); // Some names may be longer than [EW]MFhatch#_###### - hatch_classify(temp,hatchType,hatchColor); - if(*hatchType != -1)return; - - // still looking? Look at this pattern's children, if there are any - SPObject *child = pat_i->firstChild(); - while(child && !(*epixbuf) && (*hatchType == -1)){ - brush_classify(child, depth, epixbuf, hatchType, hatchColor); +void PrintEmf::brush_classify(SPObject *parent, int depth, GdkPixbuf **epixbuf, int *hatchType, U_COLORREF *hatchColor, U_COLORREF *bkColor){ + if(depth==0){ + *epixbuf = NULL; + *hatchType = -1; + *hatchColor = U_RGB(0,0,0); + *bkColor = U_RGB(255,255,255); + } + depth++; + // first look along the pattern chain, if there is one + if(SP_IS_PATTERN(parent)){ + for (SPPattern *pat_i = SP_PATTERN(parent); pat_i != NULL; pat_i = pat_i->ref ? pat_i->ref->getObject() : NULL) { + if(SP_IS_IMAGE(pat_i)){ + *epixbuf = ((SPImage *)pat_i)->pixbuf; + return; + } + char temp[32]; // large enough + temp[31]='\0'; + strncpy(temp,pat_i->getAttribute("id"),31); // Some names may be longer than [EW]MFhatch#_###### + hatch_classify(temp, hatchType, hatchColor, bkColor); + if(*hatchType != -1)return; + + // still looking? Look at this pattern's children, if there are any + SPObject *child = pat_i->firstChild(); + while(child && !(*epixbuf) && (*hatchType == -1)){ + brush_classify(child, depth, epixbuf, hatchType, hatchColor, bkColor); + child = child->getNext(); + } + } + } + else if(SP_IS_IMAGE(parent)){ + *epixbuf = ((SPImage *)parent)->pixbuf; + return; + } + else { // some inkscape rearrangements pass through nodes between pattern and image which are not classified as either. + SPObject *child = parent->firstChild(); + while(child && !(*epixbuf) && (*hatchType == -1)){ + brush_classify(child, depth, epixbuf, hatchType, hatchColor, bkColor); child = child->getNext(); - } - } - } - else if(SP_IS_IMAGE(parent)){ - *epixbuf = ((SPImage *)parent)->pixbuf; - return; - } - else { // some inkscape rearrangements pass through nodes between pattern and image which are not classified as either. - SPObject *child = parent->firstChild(); - while(child && !(*epixbuf) && (*hatchType == -1)){ - brush_classify(child, depth, epixbuf, hatchType, hatchColor); - child = child->getNext(); - } - } + } + } } //swap R/B in 4 byte pixel void PrintEmf::swapRBinRGBA(char *px, int pixels){ - char tmp; - for(int i=0;ivector.stops.size() -1; - if(last>=1){ - float rgbs[3]; - float rgbe[3]; - float ops,ope; - - ops = gr->vector.stops[0 ].opacity; - ope = gr->vector.stops[last].opacity; - sp_color_get_rgb_floatv(&gr->vector.stops[0 ].color, rgbs); - sp_color_get_rgb_floatv(&gr->vector.stops[last].color, rgbe); - - /* Replace opacity at start & stop with that fraction background color, then average those two for final color. */ - cr = U_RGB( - 255*(( opweight(rgbs[0],gv.rgb[0],ops) + opweight(rgbe[0],gv.rgb[0],ope) )/2.0), - 255*(( opweight(rgbs[1],gv.rgb[1],ops) + opweight(rgbe[1],gv.rgb[1],ope) )/2.0), - 255*(( opweight(rgbs[2],gv.rgb[2],ops) + opweight(rgbe[2],gv.rgb[2],ope) )/2.0) - ); - } - else { - cr = U_RGB(0, 0, 0); // The default fill - } - return cr; + U_COLORREF cr; + int last = gr->vector.stops.size() -1; + if(last>=1){ + float rgbs[3]; + float rgbe[3]; + float ops,ope; + + ops = gr->vector.stops[0 ].opacity; + ope = gr->vector.stops[last].opacity; + sp_color_get_rgb_floatv(&gr->vector.stops[0 ].color, rgbs); + sp_color_get_rgb_floatv(&gr->vector.stops[last].color, rgbe); + + /* Replace opacity at start & stop with that fraction background color, then average those two for final color. */ + cr = U_RGB( + 255*(( opweight(rgbs[0],gv.rgb[0],ops) + opweight(rgbe[0],gv.rgb[0],ope) )/2.0), + 255*(( opweight(rgbs[1],gv.rgb[1],ops) + opweight(rgbe[1],gv.rgb[1],ope) )/2.0), + 255*(( opweight(rgbs[2],gv.rgb[2],ops) + opweight(rgbe[2],gv.rgb[2],ope) )/2.0) + ); + } + else { + cr = U_RGB(0, 0, 0); // The default fill + } + return cr; } int PrintEmf::hold_gradient(void *gr, int mode){ - gv.mode = mode; - gv.grad = gr; - if(mode==DRAW_RADIAL_GRADIENT){ - SPRadialGradient *rg = (SPRadialGradient *) gr; - gv.r = rg->r.computed; // radius, but of what??? - gv.p1 = Geom::Point(rg->cx.computed, rg->cy.computed); // center - gv.p2 = Geom::Point(gv.r, 0) + gv.p1; // xhandle - gv.p3 = Geom::Point(0, -gv.r) + gv.p1; // yhandle - if (rg->gradientTransform_set) { - gv.p1 = gv.p1 * rg->gradientTransform; - gv.p2 = gv.p2 * rg->gradientTransform; - gv.p3 = gv.p3 * rg->gradientTransform; - } - } - else if(mode==DRAW_LINEAR_GRADIENT){ - SPLinearGradient *lg = (SPLinearGradient *) gr; - gv.r = 0; // unused - gv.p1 = Geom::Point (lg->x1.computed, lg->y1.computed); // start - gv.p2 = Geom::Point (lg->x2.computed, lg->y2.computed); // end - gv.p3 = Geom::Point (0, 0); // unused - if (lg->gradientTransform_set) { - gv.p1 = gv.p1 * lg->gradientTransform; - gv.p2 = gv.p2 * lg->gradientTransform; - } - } - else { - g_error("Fatal programming error, hold_gradient() in emf-print.cpp called with invalid draw mode"); - // throw "Fatal programming error, hold_gradient() in emf-print.cpp called with invalid draw mode"; - } - return 1; + gv.mode = mode; + gv.grad = gr; + if(mode==DRAW_RADIAL_GRADIENT){ + SPRadialGradient *rg = (SPRadialGradient *) gr; + gv.r = rg->r.computed; // radius, but of what??? + gv.p1 = Geom::Point(rg->cx.computed, rg->cy.computed); // center + gv.p2 = Geom::Point(gv.r, 0) + gv.p1; // xhandle + gv.p3 = Geom::Point(0, -gv.r) + gv.p1; // yhandle + if (rg->gradientTransform_set) { + gv.p1 = gv.p1 * rg->gradientTransform; + gv.p2 = gv.p2 * rg->gradientTransform; + gv.p3 = gv.p3 * rg->gradientTransform; + } + } + else if(mode==DRAW_LINEAR_GRADIENT){ + SPLinearGradient *lg = (SPLinearGradient *) gr; + gv.r = 0; // unused + gv.p1 = Geom::Point (lg->x1.computed, lg->y1.computed); // start + gv.p2 = Geom::Point (lg->x2.computed, lg->y2.computed); // end + gv.p3 = Geom::Point (0, 0); // unused + if (lg->gradientTransform_set) { + gv.p1 = gv.p1 * lg->gradientTransform; + gv.p2 = gv.p2 * lg->gradientTransform; + } + } + else { + g_error("Fatal programming error, hold_gradient() in emf-print.cpp called with invalid draw mode"); + } + return 1; } // fcolor is defined when gradients are being expanded, it is the color of one stripe or ring. int PrintEmf::create_brush(SPStyle const *style, PU_COLORREF fcolor) { -// std::cout << "create_brush " << std::endl; float rgb[3]; char *rec; U_LOGBRUSH lb; @@ -641,6 +656,7 @@ int PrintEmf::create_brush(SPStyle const *style, PU_COLORREF fcolor) uint32_t brushStyle; int hatchType; U_COLORREF hatchColor; + U_COLORREF bkColor; uint32_t width = 0; // quiets a harmless compiler warning, initialization not otherwise required. uint32_t height = 0; @@ -651,73 +667,74 @@ int PrintEmf::create_brush(SPStyle const *style, PU_COLORREF fcolor) fill_mode = DRAW_PAINT; brushStyle = U_BS_SOLID; hatchType = U_HS_SOLIDCLR; + bkColor = U_RGB(0, 0, 0); if(fcolor){ hatchColor = *fcolor; } else { hatchColor = U_RGB(0, 0, 0); } if (!fcolor && style) { if(style->fill.isColor()){ - fill_mode = DRAW_PAINT; - float opacity = SP_SCALE24_TO_FLOAT(style->fill_opacity.value); - if (opacity <= 0.0)opacity = 0.0; // basically the same as no fill + fill_mode = DRAW_PAINT; + float opacity = SP_SCALE24_TO_FLOAT(style->fill_opacity.value); + if (opacity <= 0.0)opacity = 0.0; // basically the same as no fill - sp_color_get_rgb_floatv( &style->fill.value.color, rgb ); - hatchColor = U_RGB(255*rgb[0], 255*rgb[1], 255*rgb[2]); + sp_color_get_rgb_floatv( &style->fill.value.color, rgb ); + hatchColor = U_RGB(255*rgb[0], 255*rgb[1], 255*rgb[2]); - fmode = style->fill_rule.computed == 0 ? U_WINDING : (style->fill_rule.computed == 2 ? U_ALTERNATE : U_ALTERNATE); + fmode = style->fill_rule.computed == 0 ? U_WINDING : (style->fill_rule.computed == 2 ? U_ALTERNATE : U_ALTERNATE); } else if(SP_IS_PATTERN(SP_STYLE_FILL_SERVER(style))){ // must be paint-server - SPPaintServer *paintserver = style->fill.value.href->getObject(); - SPPattern *pat = SP_PATTERN (paintserver); - double dwidth = pattern_width(pat); - double dheight = pattern_height(pat); - width = dwidth; - height = dheight; - brush_classify(pat,0,&pixbuf,&hatchType,&hatchColor); - if(pixbuf){ fill_mode = DRAW_IMAGE; } - else { // pattern - fill_mode = DRAW_PATTERN; - if(hatchType == -1){ // Not a standard hatch, so force it to something - hatchType = U_HS_CROSS; - hatchColor = U_RGB(0xFF,0xC3,0xC3); - } - } - if(FixPPTPatternAsHatch){ - if(hatchType == -1){ // image or unclassified - fill_mode = DRAW_PATTERN; - hatchType = U_HS_DIAGCROSS; - hatchColor = U_RGB(0xFF,0xC3,0xC3); - } - } - brushStyle = U_BS_HATCHED; + SPPaintServer *paintserver = style->fill.value.href->getObject(); + SPPattern *pat = SP_PATTERN (paintserver); + double dwidth = pattern_width(pat); + double dheight = pattern_height(pat); + width = dwidth; + height = dheight; + brush_classify(pat,0,&pixbuf,&hatchType,&hatchColor,&bkColor); + if(pixbuf){ fill_mode = DRAW_IMAGE; } + else { // pattern + fill_mode = DRAW_PATTERN; + if(hatchType == -1){ // Not a standard hatch, so force it to something + hatchType = U_HS_CROSS; + hatchColor = U_RGB(0xFF,0xC3,0xC3); + } + } + if(FixPPTPatternAsHatch){ + if(hatchType == -1){ // image or unclassified + fill_mode = DRAW_PATTERN; + hatchType = U_HS_DIAGCROSS; + hatchColor = U_RGB(0xFF,0xC3,0xC3); + } + } + brushStyle = U_BS_HATCHED; } else if(SP_IS_GRADIENT(SP_STYLE_FILL_SERVER(style))){ // must be a gradient - // currently we do not do anything with gradients, the code below just sets the color to the average of the stops - SPPaintServer *paintserver = style->fill.value.href->getObject(); - SPLinearGradient *lg = NULL; - SPRadialGradient *rg = NULL; - - if (SP_IS_LINEARGRADIENT (paintserver)) { - lg = SP_LINEARGRADIENT(paintserver); - SP_GRADIENT(lg)->ensureVector(); // when exporting from commandline, vector is not built - fill_mode = DRAW_LINEAR_GRADIENT; - } - else if (SP_IS_RADIALGRADIENT (paintserver)) { - rg = SP_RADIALGRADIENT(paintserver); - SP_GRADIENT(rg)->ensureVector(); // when exporting from commandline, vector is not built - fill_mode = DRAW_RADIAL_GRADIENT; - } - else { - // default fill - } - - if(rg){ - if(FixPPTGrad2Polys){ return hold_gradient(rg, fill_mode); } - else { hatchColor = avg_stop_color(rg); } - } - else if(lg){ - if(FixPPTGrad2Polys){ return hold_gradient(lg, fill_mode); } - else { hatchColor = avg_stop_color(lg); } - } + // currently we do not do anything with gradients, the code below just sets the color to the average of the stops + SPPaintServer *paintserver = style->fill.value.href->getObject(); + SPLinearGradient *lg = NULL; + SPRadialGradient *rg = NULL; + + if (SP_IS_LINEARGRADIENT (paintserver)) { + lg = SP_LINEARGRADIENT(paintserver); + SP_GRADIENT(lg)->ensureVector(); // when exporting from commandline, vector is not built + fill_mode = DRAW_LINEAR_GRADIENT; + } + else if (SP_IS_RADIALGRADIENT (paintserver)) { + rg = SP_RADIALGRADIENT(paintserver); + SP_GRADIENT(rg)->ensureVector(); // when exporting from commandline, vector is not built + fill_mode = DRAW_RADIAL_GRADIENT; + } + else { + // default fill + } + + if(rg){ + if(FixPPTGrad2Polys){ return hold_gradient(rg, fill_mode); } + else { hatchColor = avg_stop_color(rg); } + } + else if(lg){ + if(FixPPTGrad2Polys){ return hold_gradient(lg, fill_mode); } + else { hatchColor = avg_stop_color(lg); } + } } } else { // if (!style) @@ -727,74 +744,87 @@ int PrintEmf::create_brush(SPStyle const *style, PU_COLORREF fcolor) lb = logbrush_set(brushStyle, hatchColor, hatchType); switch(fill_mode){ - case DRAW_LINEAR_GRADIENT: // fill with average color unless gradients are converted to slices - case DRAW_RADIAL_GRADIENT: // ditto - case DRAW_PAINT: - case DRAW_PATTERN: - rec = createbrushindirect_set(&brush, eht, lb); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::create_brush at createbrushindirect_set"; - } - break; - case DRAW_IMAGE: - char *px; - char *rgba_px; - uint32_t cbPx; - uint32_t colortype; - PU_RGBQUAD ct; - int numCt; - U_BITMAPINFOHEADER Bmih; - PU_BITMAPINFO Bmi; - rgba_px = (char *) gdk_pixbuf_get_pixels(pixbuf); // Do NOT free this!!! - colortype = U_BCBM_COLOR32; - (void) RGBA_to_DIB(&px, &cbPx, &ct, &numCt, rgba_px, width, height, width*4, colortype, 0, 1); - // Not sure why the next swap is needed because the preceding does it, and the code is identical - // to that in stretchdibits_set, which does not need this. - swapRBinRGBA(px, width*height); - Bmih = bitmapinfoheader_set(width, height, 1, colortype, U_BI_RGB, 0, PXPERMETER, PXPERMETER, numCt, 0); - Bmi = bitmapinfo_set(Bmih, ct); - rec = createdibpatternbrushpt_set(&brush, eht, U_DIB_RGB_COLORS, Bmi, cbPx, px); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::create_brush at createdibpatternbrushpt_set"; - } - free(px); - free(Bmi); // ct will be NULL because of colortype - break; + case DRAW_LINEAR_GRADIENT: // fill with average color unless gradients are converted to slices + case DRAW_RADIAL_GRADIENT: // ditto + case DRAW_PAINT: + case DRAW_PATTERN: + // SVG text has no background attribute, so OPAQUE mode ALWAYS cancels after the next draw, otherwise it would mess up future text output. + if(usebk){ + rec = U_EMRSETBKCOLOR_set(bkColor); + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::create_brush at U_EMRSETBKCOLOR_set"); + } + rec = U_EMRSETBKMODE_set(U_OPAQUE); + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::create_brush at U_EMRSETBKMODE_set"); + } + } + rec = createbrushindirect_set(&brush, eht, lb); + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::create_brush at createbrushindirect_set"); + } + break; + case DRAW_IMAGE: + char *px; + char *rgba_px; + uint32_t cbPx; + uint32_t colortype; + PU_RGBQUAD ct; + int numCt; + U_BITMAPINFOHEADER Bmih; + PU_BITMAPINFO Bmi; + rgba_px = (char *) gdk_pixbuf_get_pixels(pixbuf); // Do NOT free this!!! + colortype = U_BCBM_COLOR32; + (void) RGBA_to_DIB(&px, &cbPx, &ct, &numCt, rgba_px, width, height, width*4, colortype, 0, 1); + // Not sure why the next swap is needed because the preceding does it, and the code is identical + // to that in stretchdibits_set, which does not need this. + swapRBinRGBA(px, width*height); + Bmih = bitmapinfoheader_set(width, height, 1, colortype, U_BI_RGB, 0, PXPERMETER, PXPERMETER, numCt, 0); + Bmi = bitmapinfo_set(Bmih, ct); + rec = createdibpatternbrushpt_set(&brush, eht, U_DIB_RGB_COLORS, Bmi, cbPx, px); + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::create_brush at createdibpatternbrushpt_set"); + } + free(px); + free(Bmi); // ct will be NULL because of colortype + break; } + hbrush = brush; // need this later for destroy_brush rec = selectobject_set(brush, eht); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::create_brush at selectobject_set"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::create_brush at selectobject_set"); } - rec = U_EMRSETPOLYFILLMODE_set(fmode); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::create_brush at U_EMRSETPOLYdrawmode_set"; + if(fmode != hpolyfillmode){ + hpolyfillmode=fmode; + rec = U_EMRSETPOLYFILLMODE_set(fmode); + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::create_brush at U_EMRSETPOLYdrawmode_set"); + } } -// std::cout << "end create_brush " << std::endl; + return 0; } void PrintEmf::destroy_brush() { -// std::cout << "destroy_brush " << std::endl; char *rec; // before an object may be safely deleted it must no longer be selected // select in a stock object to deselect this one, the stock object should // never be used because we always select in a new one before drawing anythingrestore previous brush, necessary??? Would using a default stock object not work? rec = selectobject_set(U_NULL_BRUSH, eht); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::destroy_brush at selectobject_set"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::destroy_brush at selectobject_set"); } if (hbrush){ - rec = deleteobject_set(&hbrush, eht); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::destroy_brush"; - } - hbrush = 0; + rec = deleteobject_set(&hbrush, eht); + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::destroy_brush"); + } + hbrush = 0; } -// std::cout << "end destroy_brush" << std::endl; } @@ -812,6 +842,7 @@ int PrintEmf::create_pen(SPStyle const *style, const Geom::Affine &transform) GdkPixbuf *pixbuf; int hatchType; U_COLORREF hatchColor; + U_COLORREF bkColor; uint32_t width,height; char *px=NULL; char *rgba_px; @@ -821,100 +852,110 @@ int PrintEmf::create_pen(SPStyle const *style, const Geom::Affine &transform) int numCt=0; U_BITMAPINFOHEADER Bmih; PU_BITMAPINFO Bmi=NULL; -// std::cout << "create_pen " << std::endl; if (!et) return 0; // set a default stroke in case we can't figure out a better way to do it - brushStyle = U_BS_SOLID; + brushStyle = U_BS_SOLID; hatchColor = U_RGB(0, 0, 0); hatchType = U_HS_HORIZONTAL; + bkColor = U_RGB(0, 0, 0); if (style) { float rgb[3]; if(SP_IS_PATTERN(SP_STYLE_STROKE_SERVER(style))){ // must be paint-server - SPPaintServer *paintserver = style->stroke.value.href->getObject(); - SPPattern *pat = SP_PATTERN (paintserver); - double dwidth = pattern_width(pat); - double dheight = pattern_height(pat); - width = dwidth; - height = dheight; - brush_classify(pat,0,&pixbuf,&hatchType,&hatchColor); - if(pixbuf){ - brushStyle = U_BS_DIBPATTERN; - rgba_px = (char *) gdk_pixbuf_get_pixels(pixbuf); // Do NOT free this!!! - colortype = U_BCBM_COLOR32; - (void) RGBA_to_DIB(&px, &cbPx, &ct, &numCt, rgba_px, width, height, width*4, colortype, 0, 1); - // Not sure why the next swap is needed because the preceding does it, and the code is identical - // to that in stretchdibits_set, which does not need this. - swapRBinRGBA(px, width*height); - Bmih = bitmapinfoheader_set(width, height, 1, colortype, U_BI_RGB, 0, PXPERMETER, PXPERMETER, numCt, 0); - Bmi = bitmapinfo_set(Bmih, ct); - } - else { // pattern - brushStyle = U_BS_HATCHED; - if(hatchType == -1){ // Not a standard hatch, so force it to something - hatchType = U_HS_CROSS; - hatchColor = U_RGB(0xFF,0xC3,0xC3); - } - } - if(FixPPTPatternAsHatch){ - if(hatchType == -1){ // image or unclassified - brushStyle = U_BS_HATCHED; - hatchType = U_HS_DIAGCROSS; - hatchColor = U_RGB(0xFF,0xC3,0xC3); - } - } + SPPaintServer *paintserver = style->stroke.value.href->getObject(); + SPPattern *pat = SP_PATTERN (paintserver); + double dwidth = pattern_width(pat); + double dheight = pattern_height(pat); + width = dwidth; + height = dheight; + brush_classify(pat,0,&pixbuf,&hatchType,&hatchColor,&bkColor); + if(pixbuf){ + brushStyle = U_BS_DIBPATTERN; + rgba_px = (char *) gdk_pixbuf_get_pixels(pixbuf); // Do NOT free this!!! + colortype = U_BCBM_COLOR32; + (void) RGBA_to_DIB(&px, &cbPx, &ct, &numCt, rgba_px, width, height, width*4, colortype, 0, 1); + // Not sure why the next swap is needed because the preceding does it, and the code is identical + // to that in stretchdibits_set, which does not need this. + swapRBinRGBA(px, width*height); + Bmih = bitmapinfoheader_set(width, height, 1, colortype, U_BI_RGB, 0, PXPERMETER, PXPERMETER, numCt, 0); + Bmi = bitmapinfo_set(Bmih, ct); + } + else { // pattern + brushStyle = U_BS_HATCHED; + if(usebk){ // OPAQUE mode ALWAYS cancels after the next draw, otherwise it would mess up future text output. + rec = U_EMRSETBKCOLOR_set(bkColor); + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::create_pen at U_EMRSETBKCOLOR_set"); + } + rec = U_EMRSETBKMODE_set(U_OPAQUE); + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::create_pen at U_EMRSETBKMODE_set"); + } + } + if(hatchType == -1){ // Not a standard hatch, so force it to something + hatchType = U_HS_CROSS; + hatchColor = U_RGB(0xFF,0xC3,0xC3); + } + } + if(FixPPTPatternAsHatch){ + if(hatchType == -1){ // image or unclassified + brushStyle = U_BS_HATCHED; + hatchType = U_HS_DIAGCROSS; + hatchColor = U_RGB(0xFF,0xC3,0xC3); + } + } } else if(SP_IS_GRADIENT(SP_STYLE_STROKE_SERVER(style))){ // must be a gradient - // currently we do not do anything with gradients, the code below has no net effect. - - SPPaintServer *paintserver = style->stroke.value.href->getObject(); - if (SP_IS_LINEARGRADIENT (paintserver)) { - SPLinearGradient *lg=SP_LINEARGRADIENT(paintserver); - - SP_GRADIENT(lg)->ensureVector(); // when exporting from commandline, vector is not built - - Geom::Point p1 (lg->x1.computed, lg->y1.computed); - Geom::Point p2 (lg->x2.computed, lg->y2.computed); - - if (lg->gradientTransform_set) { - p1 = p1 * lg->gradientTransform; - p2 = p2 * lg->gradientTransform; - } - hatchColor = avg_stop_color(lg); - } - else if (SP_IS_RADIALGRADIENT (paintserver)) { - SPRadialGradient *rg=SP_RADIALGRADIENT(paintserver); - - SP_GRADIENT(rg)->ensureVector(); // when exporting from commandline, vector is not built - double r = rg->r.computed; - - Geom::Point c (rg->cx.computed, rg->cy.computed); - Geom::Point xhandle_point(r, 0); - Geom::Point yhandle_point(0, -r); - yhandle_point += c; - xhandle_point += c; - if (rg->gradientTransform_set) { - c = c * rg->gradientTransform; - yhandle_point = yhandle_point * rg->gradientTransform; - xhandle_point = xhandle_point * rg->gradientTransform; - } - hatchColor = avg_stop_color(rg); - } - else { - // default fill - } + // currently we do not do anything with gradients, the code below has no net effect. + + SPPaintServer *paintserver = style->stroke.value.href->getObject(); + if (SP_IS_LINEARGRADIENT (paintserver)) { + SPLinearGradient *lg=SP_LINEARGRADIENT(paintserver); + + SP_GRADIENT(lg)->ensureVector(); // when exporting from commandline, vector is not built + + Geom::Point p1 (lg->x1.computed, lg->y1.computed); + Geom::Point p2 (lg->x2.computed, lg->y2.computed); + + if (lg->gradientTransform_set) { + p1 = p1 * lg->gradientTransform; + p2 = p2 * lg->gradientTransform; + } + hatchColor = avg_stop_color(lg); + } + else if (SP_IS_RADIALGRADIENT (paintserver)) { + SPRadialGradient *rg=SP_RADIALGRADIENT(paintserver); + + SP_GRADIENT(rg)->ensureVector(); // when exporting from commandline, vector is not built + double r = rg->r.computed; + + Geom::Point c (rg->cx.computed, rg->cy.computed); + Geom::Point xhandle_point(r, 0); + Geom::Point yhandle_point(0, -r); + yhandle_point += c; + xhandle_point += c; + if (rg->gradientTransform_set) { + c = c * rg->gradientTransform; + yhandle_point = yhandle_point * rg->gradientTransform; + xhandle_point = xhandle_point * rg->gradientTransform; + } + hatchColor = avg_stop_color(rg); + } + else { + // default fill + } } else if(style->stroke.isColor()){ // test last, always seems to be set, even for other types above - sp_color_get_rgb_floatv( &style->stroke.value.color, rgb ); - brushStyle = U_BS_SOLID; - hatchColor = U_RGB(255*rgb[0], 255*rgb[1], 255*rgb[2]); - hatchType = U_HS_SOLIDCLR; + sp_color_get_rgb_floatv( &style->stroke.value.color, rgb ); + brushStyle = U_BS_SOLID; + hatchColor = U_RGB(255*rgb[0], 255*rgb[1], 255*rgb[2]); + hatchType = U_HS_SOLIDCLR; } else { - // default fill + // default fill } @@ -933,50 +974,36 @@ int PrintEmf::create_pen(SPStyle const *style, const Geom::Affine &transform) if(!style->stroke_width.computed){return 0;} //if width is 0 do not (reset) the pen, it should already be NULL_PEN uint32_t linewidth = MAX( 1, (uint32_t) (scale * style->stroke_width.computed * PX2WORLD) ); - if (style->stroke_linecap.computed == 0) { - linecap = U_PS_ENDCAP_FLAT; - } - else if (style->stroke_linecap.computed == 1) { - linecap = U_PS_ENDCAP_ROUND; - } - else if (style->stroke_linecap.computed == 2) { - linecap = U_PS_ENDCAP_SQUARE; - } + if ( style->stroke_linecap.computed == 0){ linecap = U_PS_ENDCAP_FLAT; } + else if (style->stroke_linecap.computed == 1){ linecap = U_PS_ENDCAP_ROUND; } + else if (style->stroke_linecap.computed == 2){ linecap = U_PS_ENDCAP_SQUARE; } - if (style->stroke_linejoin.computed == 0) { - linejoin = U_PS_JOIN_MITER; - } - else if (style->stroke_linejoin.computed == 1) { - linejoin = U_PS_JOIN_ROUND; - } - else if (style->stroke_linejoin.computed == 2) { - linejoin = U_PS_JOIN_BEVEL; - } + if ( style->stroke_linejoin.computed == 0){ linejoin = U_PS_JOIN_MITER; } + else if (style->stroke_linejoin.computed == 1){ linejoin = U_PS_JOIN_ROUND; } + else if (style->stroke_linejoin.computed == 2){ linejoin = U_PS_JOIN_BEVEL; } if (style->stroke_dash.n_dash && style->stroke_dash.dash ) { if(FixPPTDashLine){ // will break up line into many smaller lines. Override gradient if that was set, cannot do both. - brushStyle = U_BS_SOLID; - hatchType = U_HS_HORIZONTAL; + brushStyle = U_BS_SOLID; + hatchType = U_HS_HORIZONTAL; } else { - int i = 0; - while (linestyle != U_PS_USERSTYLE && - (i < style->stroke_dash.n_dash)) { - if (style->stroke_dash.dash[i] > 0.00000001) - linestyle = U_PS_USERSTYLE; - i++; - } - - if (linestyle == U_PS_USERSTYLE) { - n_dash = style->stroke_dash.n_dash; - dash = new uint32_t[n_dash]; - for (i = 0; i < style->stroke_dash.n_dash; i++) { - dash[i] = (uint32_t) (style->stroke_dash.dash[i]); - } - } - } + int i = 0; + while ( (linestyle != U_PS_USERSTYLE) && (i < style->stroke_dash.n_dash) ){ + if (style->stroke_dash.dash[i] > 0.00000001){ linestyle = U_PS_USERSTYLE; } + i++; + } + + if (linestyle == U_PS_USERSTYLE) { + n_dash = style->stroke_dash.n_dash; + dash = new uint32_t[n_dash]; + for (i = 0; i < style->stroke_dash.n_dash; i++) { + dash[i] = (uint32_t) (style->stroke_dash.dash[i]); + } + } + } } elp = extlogpen_set( @@ -1002,16 +1029,16 @@ int PrintEmf::create_pen(SPStyle const *style, const Geom::Affine &transform) } rec = extcreatepen_set(&pen, eht, Bmi, cbPx, px, elp ); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::create_pen at extcreatepen_set"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::create_pen at extcreatepen_set"); } free(elp); if(Bmi)free(Bmi); if(px)free(px); // ct will always be NULL rec = selectobject_set(pen, eht); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::create_pen at selectobject_set"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::create_pen at selectobject_set"); } hpen = pen; // need this later for destroy_pen @@ -1021,45 +1048,39 @@ int PrintEmf::create_pen(SPStyle const *style, const Geom::Affine &transform) if (miterlimit < 1)miterlimit = 1; rec = U_EMRSETMITERLIMIT_set((uint32_t) miterlimit); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::create_pen at U_EMRSETMITERLIMIT_set"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::create_pen at U_EMRSETMITERLIMIT_set"); } } - if (n_dash) { - delete[] dash; - } + if (n_dash) { delete[] dash; } return 0; -// std::cout << "end create_pen" << std::endl; } // set the current pen to the stock object NULL_PEN and then delete the defined pen object, if there is one. void PrintEmf::destroy_pen() { -// std::cout << "destroy_pen hpen: " << hpen<< std::endl; char *rec = NULL; // before an object may be safely deleted it must no longer be selected // select in a stock object to deselect this one, the stock object should // never be used because we always select in a new one before drawing anythingrestore previous brush, necessary??? Would using a default stock object not work? rec = selectobject_set(U_NULL_PEN, eht); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::destroy_pen at selectobject_set"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::destroy_pen at selectobject_set"); } if (hpen){ - rec = deleteobject_set(&hpen, eht); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::destroy_pen"; - } - hpen = 0; + rec = deleteobject_set(&hpen, eht); + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::destroy_pen"); + } + hpen = 0; } -// std::cout << "end destroy_pen " << std::endl; } unsigned int PrintEmf::bind(Inkscape::Extension::Print * /*mod*/, Geom::Affine const &transform, float /*opacity*/) { -// std::cout << "bind " << std::endl; if (!m_tr_stack.empty()) { Geom::Affine tr_top = m_tr_stack.top(); m_tr_stack.push(transform * tr_top); @@ -1067,15 +1088,12 @@ unsigned int PrintEmf::bind(Inkscape::Extension::Print * /*mod*/, Geom::Affine c m_tr_stack.push(transform); } -// std::cout << "end bind" << std::endl; return 1; } unsigned int PrintEmf::release(Inkscape::Extension::Print * /*mod*/) { -// std::cout << "release " << std::endl; m_tr_stack.pop(); -// std::cout << "end release" << std::endl; return 1; } @@ -1108,24 +1126,24 @@ U_COLORREF PrintEmf::weight_colors(U_COLORREF c1, U_COLORREF c2, double t){ /* convert from center ellipse to SVGEllipticalArc ellipse - From: - http://www.w3.org/TR/SVG/implnote.html#ArcConversionEndpointToCenter - A point (x,y) on the arc can be found by: - - {x,y} = {cx,cy} + {cosF,-sinF,sinF,cosF} x {rxcosT,rysinT} - - where - {cx,cy} is the center of the ellipse - F is the rotation angle of the X axis of the ellipse from the true X axis - T is the rotation angle around the ellipse - {,,,} is the rotation matrix - rx,ry are the radii of the ellipse's axes + From: + http://www.w3.org/TR/SVG/implnote.html#ArcConversionEndpointToCenter + A point (x,y) on the arc can be found by: - For SVG parameterization need two points. - Arbitrarily we can use T=0 and T=pi - Since the sweep is 180 the flags are always 0: + {x,y} = {cx,cy} + {cosF,-sinF,sinF,cosF} x {rxcosT,rysinT} - F is in RADIANS, but the SVGEllipticalArc needs degrees! + where + {cx,cy} is the center of the ellipse + F is the rotation angle of the X axis of the ellipse from the true X axis + T is the rotation angle around the ellipse + {,,,} is the rotation matrix + rx,ry are the radii of the ellipse's axes + + For SVG parameterization need two points. + Arbitrarily we can use T=0 and T=pi + Since the sweep is 180 the flags are always 0: + + F is in RADIANS, but the SVGEllipticalArc needs degrees! */ Geom::PathVector PrintEmf::center_ellipse_as_SVG_PathV(Geom::Point ctr, double rx, double ry, double F){ @@ -1212,26 +1230,22 @@ Geom::PathVector PrintEmf::rect_cutter(Geom::Point ctr, Geom::Point pos, Geom::P return outres; } -/* Convert from SPWindRule to livarot's FillRule - This is similar to what sp_selected_path_boolop() does +/* Convert from SPWindRule to livarot's FillRule + This is similar to what sp_selected_path_boolop() does */ FillRule PrintEmf::SPWR_to_LVFR(SPWindRule wr){ FillRule fr; - if(wr == SP_WIND_RULE_EVENODD){ - fr = fill_oddEven; - } - else { - fr = fill_nonZero; - } + if(wr == SP_WIND_RULE_EVENODD){ fr = fill_oddEven; } + else { fr = fill_nonZero; } return fr; } -unsigned int PrintEmf::fill(Inkscape::Extension::Print * /*mod*/, - Geom::PathVector const &pathv, Geom::Affine const & /*transform*/, SPStyle const *style, - Geom::OptRect const &/*pbox*/, Geom::OptRect const &/*dbox*/, Geom::OptRect const &/*bbox*/) +unsigned int PrintEmf::fill( + Inkscape::Extension::Print * /*mod*/, + Geom::PathVector const &pathv, Geom::Affine const & /*transform*/, SPStyle const *style, + Geom::OptRect const &/*pbox*/, Geom::OptRect const &/*dbox*/, Geom::OptRect const &/*bbox*/) { -// std::cout << "fill " << std::endl; using Geom::X; using Geom::Y; @@ -1243,186 +1257,184 @@ unsigned int PrintEmf::fill(Inkscape::Extension::Print * /*mod*/, fill_transform = tf; if (create_brush(style, NULL)){ // only happens if the style is a gradient - /* - Handle gradients. Uses modified livarot as 2geom boolops is currently broken. - Can handle gradients with multiple stops. - - The overlap is needed to avoid antialiasing artifacts when edges are not strictly aligned on pixel boundaries. - There is an inevitable loss of accuracy saving through an EMF file because of the integer coordinate system. - Keep the overlap quite large so that loss of accuracy does not remove an overlap. - */ - destroy_pen(); //this sets the NULL_PEN, otherwise gradient slices may display with boundaries, see longer explanation below - Geom::Path cutter; - float rgb[3]; - U_COLORREF wc,c1,c2; - FillRule frb = SPWR_to_LVFR( (SPWindRule) style->fill_rule.computed); - double doff,doff_base,doff_range; - double divisions= 128.0; - int nstops; - int istop = 1; - float opa; // opacity at stop - - SPRadialGradient *tg = (SPRadialGradient *) (gv.grad); // linear/radial are the same here - nstops = tg->vector.stops.size(); - sp_color_get_rgb_floatv(&tg->vector.stops[0].color, rgb); - opa = tg->vector.stops[0].opacity; - c1 = U_RGBA( 255*rgb[0], 255*rgb[1], 255*rgb[2], 255*opa ); - sp_color_get_rgb_floatv(&tg->vector.stops[nstops-1].color, rgb); - opa = tg->vector.stops[nstops-1].opacity; - c2 = U_RGBA( 255*rgb[0], 255*rgb[1], 255*rgb[2], 255*opa ); - - doff = 0.0; - doff_base = 0.0; - doff_range = tg->vector.stops[1].offset; // next or last stop - - if(gv.mode==DRAW_RADIAL_GRADIENT){ - Geom::Point xv = gv.p2 - gv.p1; // X' vector - Geom::Point yv = gv.p3 - gv.p1; // Y' vector - Geom::Point xuv = Geom::unit_vector(xv); // X' unit vector - double rx = hypot(xv[X],xv[Y]); - double ry = hypot(yv[X],yv[Y]); - double range = fmax(rx,ry); // length along the gradient - double step = range/divisions; // adequate approximation for gradient - double overlap = step/4.0; // overlap slices slightly - double start; - double stop; - Geom::PathVector pathvc, pathvr; - - /* radial gradient might stop part way through the shape, fill with outer color from there to "infinity". - Do this first so that outer colored ring will overlay it. - */ - pathvc = center_elliptical_hole_as_SVG_PathV(gv.p1, rx*(1.0 - overlap/range), ry*(1.0 - overlap/range), asin(xuv[Y])); - pathvr = sp_pathvector_boolop(pathvc, pathv, bool_op_inters, (FillRule) fill_oddEven, frb); - wc = weight_opacity(c2); - (void) create_brush(style, &wc); - print_pathv(pathvr, fill_transform); - - sp_color_get_rgb_floatv(&tg->vector.stops[istop].color, rgb); - opa = tg->vector.stops[istop].opacity; - c2 = U_RGBA( 255*rgb[0], 255*rgb[1], 255*rgb[2], 255*opa ); - - for(start = 0.0; start < range; start += step, doff += 1./divisions){ - stop = start + step + overlap; - if(stop > range)stop=range; - wc = weight_colors(c1, c2, (doff - doff_base)/(doff_range-doff_base) ); - (void) create_brush(style, &wc); - - pathvc = center_elliptical_ring_as_SVG_PathV(gv.p1, rx*start/range, ry*start/range, rx*stop/range, ry*stop/range, asin(xuv[Y])); - - pathvr = sp_pathvector_boolop(pathvc, pathv, bool_op_inters, (FillRule) fill_nonZero, frb); - print_pathv(pathvr, fill_transform); // show the intersection - - if(doff >= doff_range - doff_base){ - istop++; - if(istop >= nstops)continue; // could happen on a rounding error - doff_base = doff_range; - doff_range = tg->vector.stops[istop].offset; // next or last stop - c1=c2; - sp_color_get_rgb_floatv(&tg->vector.stops[istop].color, rgb); - opa = tg->vector.stops[istop].opacity; - c2 = U_RGBA( 255*rgb[0], 255*rgb[1], 255*rgb[2], 255*opa ); - } - } - - } - else if(gv.mode == DRAW_LINEAR_GRADIENT){ - Geom::Point uv = Geom::unit_vector(gv.p2 - gv.p1); // unit vector - Geom::Point puv = uv.cw(); // perp. to unit vector - double range = Geom::distance(gv.p1,gv.p2); // length along the gradient - double step = range/divisions; // adequate approximation for gradient - double overlap = step/4.0; // overlap slices slightly - double start; - double stop; - Geom::PathVector pathvc, pathvr; - - /* before lower end of gradient, overlap first slice position */ - wc = weight_opacity(c1); - (void) create_brush(style, &wc); - pathvc = rect_cutter(gv.p1, uv*(overlap), uv*(-50000.0), puv*50000.0); - pathvr = sp_pathvector_boolop(pathvc, pathv, bool_op_inters, (FillRule) fill_nonZero, frb); - print_pathv(pathvr, fill_transform); - - /* after high end of gradient, overlap last slice poosition */ - wc = weight_opacity(c2); - (void) create_brush(style, &wc); - pathvc = rect_cutter(gv.p2, uv*(-overlap), uv*(50000.0), puv*50000.0); - pathvr = sp_pathvector_boolop(pathvc, pathv, bool_op_inters, (FillRule) fill_nonZero, frb); - print_pathv(pathvr, fill_transform); - - sp_color_get_rgb_floatv(&tg->vector.stops[istop].color, rgb); - opa = tg->vector.stops[istop].opacity; - c2 = U_RGBA( 255*rgb[0], 255*rgb[1], 255*rgb[2], 255*opa ); - - for(start = 0.0; start < range; start += step, doff += 1./divisions){ - stop = start + step + overlap; - if(stop > range)stop=range; - pathvc = rect_cutter(gv.p1, uv*start, uv*stop, puv*50000.0); - - wc = weight_colors(c1, c2, (doff - doff_base)/(doff_range-doff_base) ); - (void) create_brush(style, &wc); - Geom::PathVector pathvr = sp_pathvector_boolop(pathvc, pathv, bool_op_inters, (FillRule) fill_nonZero, frb); - print_pathv(pathvr, fill_transform); // show the intersection - - if(doff >= doff_range - doff_base){ - istop++; - if(istop >= nstops)continue; // could happen on a rounding error - doff_base = doff_range; - doff_range = tg->vector.stops[istop].offset; // next or last stop - c1=c2; - sp_color_get_rgb_floatv(&tg->vector.stops[istop].color, rgb); - opa = tg->vector.stops[istop].opacity; - c2 = U_RGBA( 255*rgb[0], 255*rgb[1], 255*rgb[2], 255*opa ); - } - } - } - else { - throw "Fatal programming error in PrintEmf::fill, invalid gradient type detected"; - } - use_fill = false; // gradients handled, be sure stroke does not use stroke and fill + /* + Handle gradients. Uses modified livarot as 2geom boolops is currently broken. + Can handle gradients with multiple stops. + + The overlap is needed to avoid antialiasing artifacts when edges are not strictly aligned on pixel boundaries. + There is an inevitable loss of accuracy saving through an EMF file because of the integer coordinate system. + Keep the overlap quite large so that loss of accuracy does not remove an overlap. + */ + destroy_pen(); //this sets the NULL_PEN, otherwise gradient slices may display with boundaries, see longer explanation below + Geom::Path cutter; + float rgb[3]; + U_COLORREF wc,c1,c2; + FillRule frb = SPWR_to_LVFR( (SPWindRule) style->fill_rule.computed); + double doff,doff_base,doff_range; + double divisions= 128.0; + int nstops; + int istop = 1; + float opa; // opacity at stop + + SPRadialGradient *tg = (SPRadialGradient *) (gv.grad); // linear/radial are the same here + nstops = tg->vector.stops.size(); + sp_color_get_rgb_floatv(&tg->vector.stops[0].color, rgb); + opa = tg->vector.stops[0].opacity; + c1 = U_RGBA( 255*rgb[0], 255*rgb[1], 255*rgb[2], 255*opa ); + sp_color_get_rgb_floatv(&tg->vector.stops[nstops-1].color, rgb); + opa = tg->vector.stops[nstops-1].opacity; + c2 = U_RGBA( 255*rgb[0], 255*rgb[1], 255*rgb[2], 255*opa ); + + doff = 0.0; + doff_base = 0.0; + doff_range = tg->vector.stops[1].offset; // next or last stop + + if(gv.mode==DRAW_RADIAL_GRADIENT){ + Geom::Point xv = gv.p2 - gv.p1; // X' vector + Geom::Point yv = gv.p3 - gv.p1; // Y' vector + Geom::Point xuv = Geom::unit_vector(xv); // X' unit vector + double rx = hypot(xv[X],xv[Y]); + double ry = hypot(yv[X],yv[Y]); + double range = fmax(rx,ry); // length along the gradient + double step = range/divisions; // adequate approximation for gradient + double overlap = step/4.0; // overlap slices slightly + double start; + double stop; + Geom::PathVector pathvc, pathvr; + + /* radial gradient might stop part way through the shape, fill with outer color from there to "infinity". + Do this first so that outer colored ring will overlay it. + */ + pathvc = center_elliptical_hole_as_SVG_PathV(gv.p1, rx*(1.0 - overlap/range), ry*(1.0 - overlap/range), asin(xuv[Y])); + pathvr = sp_pathvector_boolop(pathvc, pathv, bool_op_inters, (FillRule) fill_oddEven, frb); + wc = weight_opacity(c2); + (void) create_brush(style, &wc); + print_pathv(pathvr, fill_transform); + + sp_color_get_rgb_floatv(&tg->vector.stops[istop].color, rgb); + opa = tg->vector.stops[istop].opacity; + c2 = U_RGBA( 255*rgb[0], 255*rgb[1], 255*rgb[2], 255*opa ); + + for(start = 0.0; start < range; start += step, doff += 1./divisions){ + stop = start + step + overlap; + if(stop > range)stop=range; + wc = weight_colors(c1, c2, (doff - doff_base)/(doff_range-doff_base) ); + (void) create_brush(style, &wc); + + pathvc = center_elliptical_ring_as_SVG_PathV(gv.p1, rx*start/range, ry*start/range, rx*stop/range, ry*stop/range, asin(xuv[Y])); + + pathvr = sp_pathvector_boolop(pathvc, pathv, bool_op_inters, (FillRule) fill_nonZero, frb); + print_pathv(pathvr, fill_transform); // show the intersection + + if(doff >= doff_range - doff_base){ + istop++; + if(istop >= nstops)continue; // could happen on a rounding error + doff_base = doff_range; + doff_range = tg->vector.stops[istop].offset; // next or last stop + c1=c2; + sp_color_get_rgb_floatv(&tg->vector.stops[istop].color, rgb); + opa = tg->vector.stops[istop].opacity; + c2 = U_RGBA( 255*rgb[0], 255*rgb[1], 255*rgb[2], 255*opa ); + } + } + } + else if(gv.mode == DRAW_LINEAR_GRADIENT){ + Geom::Point uv = Geom::unit_vector(gv.p2 - gv.p1); // unit vector + Geom::Point puv = uv.cw(); // perp. to unit vector + double range = Geom::distance(gv.p1,gv.p2); // length along the gradient + double step = range/divisions; // adequate approximation for gradient + double overlap = step/4.0; // overlap slices slightly + double start; + double stop; + Geom::PathVector pathvc, pathvr; + + /* before lower end of gradient, overlap first slice position */ + wc = weight_opacity(c1); + (void) create_brush(style, &wc); + pathvc = rect_cutter(gv.p1, uv*(overlap), uv*(-50000.0), puv*50000.0); + pathvr = sp_pathvector_boolop(pathvc, pathv, bool_op_inters, (FillRule) fill_nonZero, frb); + print_pathv(pathvr, fill_transform); + + /* after high end of gradient, overlap last slice poosition */ + wc = weight_opacity(c2); + (void) create_brush(style, &wc); + pathvc = rect_cutter(gv.p2, uv*(-overlap), uv*(50000.0), puv*50000.0); + pathvr = sp_pathvector_boolop(pathvc, pathv, bool_op_inters, (FillRule) fill_nonZero, frb); + print_pathv(pathvr, fill_transform); + + sp_color_get_rgb_floatv(&tg->vector.stops[istop].color, rgb); + opa = tg->vector.stops[istop].opacity; + c2 = U_RGBA( 255*rgb[0], 255*rgb[1], 255*rgb[2], 255*opa ); + + for(start = 0.0; start < range; start += step, doff += 1./divisions){ + stop = start + step + overlap; + if(stop > range)stop=range; + pathvc = rect_cutter(gv.p1, uv*start, uv*stop, puv*50000.0); + + wc = weight_colors(c1, c2, (doff - doff_base)/(doff_range-doff_base) ); + (void) create_brush(style, &wc); + Geom::PathVector pathvr = sp_pathvector_boolop(pathvc, pathv, bool_op_inters, (FillRule) fill_nonZero, frb); + print_pathv(pathvr, fill_transform); // show the intersection + + if(doff >= doff_range - doff_base){ + istop++; + if(istop >= nstops)continue; // could happen on a rounding error + doff_base = doff_range; + doff_range = tg->vector.stops[istop].offset; // next or last stop + c1=c2; + sp_color_get_rgb_floatv(&tg->vector.stops[istop].color, rgb); + opa = tg->vector.stops[istop].opacity; + c2 = U_RGBA( 255*rgb[0], 255*rgb[1], 255*rgb[2], 255*opa ); + } + } + } + else { + g_error("Fatal programming error in PrintEmf::fill, invalid gradient type detected"); + } + use_fill = false; // gradients handled, be sure stroke does not use stroke and fill } else { - /* - Inkscape was not calling create_pen for objects with no border. - This was because it never called stroke() (next method). - PPT, and presumably others, pick whatever they want for the border if it is not specified, so no border can - become a visible border. - To avoid this force the pen to NULL_PEN if we can determine that no pen will be needed after the fill. - */ - if (style->stroke.noneSet || style->stroke_width.computed == 0.0){ - destroy_pen(); //this sets the NULL_PEN - } + /* + Inkscape was not calling create_pen for objects with no border. + This was because it never called stroke() (next method). + PPT, and presumably others, pick whatever they want for the border if it is not specified, so no border can + become a visible border. + To avoid this force the pen to NULL_PEN if we can determine that no pen will be needed after the fill. + */ + if (style->stroke.noneSet || style->stroke_width.computed == 0.0){ + destroy_pen(); //this sets the NULL_PEN + } - /* postpone fill in case stroke also required AND all stroke paths closed - Dashes converted to line segments will "open" a closed path. - */ - bool all_closed = true; - for (Geom::PathVector::const_iterator pit = pathv.begin(); pit != pathv.end(); ++pit){ - for (Geom::Path::const_iterator cit = pit->begin(); cit != pit->end_open(); ++cit){ - if (pit->end_default() != pit->end_closed()) { all_closed=false; } - } - } - if ( + /* postpone fill in case stroke also required AND all stroke paths closed + Dashes converted to line segments will "open" a closed path. + */ + bool all_closed = true; + for (Geom::PathVector::const_iterator pit = pathv.begin(); pit != pathv.end(); ++pit){ + for (Geom::Path::const_iterator cit = pit->begin(); cit != pit->end_open(); ++cit){ + if (pit->end_default() != pit->end_closed()) { all_closed=false; } + } + } + if ( (style->stroke.noneSet || style->stroke_width.computed == 0.0) || (style->stroke_dash.n_dash && style->stroke_dash.dash && FixPPTDashLine) || !all_closed - ) - { - print_pathv(pathv, fill_transform); // do any fills. side effect: clears fill_pathv - use_fill = false; - } + ){ + print_pathv(pathv, fill_transform); // do any fills. side effect: clears fill_pathv + use_fill = false; + } } -// std::cout << "end fill" << std::endl; return 0; } -unsigned int PrintEmf::stroke (Inkscape::Extension::Print * /*mod*/, - Geom::PathVector const &pathv, const Geom::Affine &/*transform*/, const SPStyle *style, - Geom::OptRect const &/*pbox*/, Geom::OptRect const &/*dbox*/, Geom::OptRect const &/*bbox*/) +unsigned int PrintEmf::stroke ( + Inkscape::Extension::Print * /*mod*/, + Geom::PathVector const &pathv, const Geom::Affine &/*transform*/, const SPStyle *style, + Geom::OptRect const &/*pbox*/, Geom::OptRect const &/*dbox*/, Geom::OptRect const &/*bbox*/) { -// std::cout << "stroke " << std::endl; + char *rec = NULL; Geom::Affine tf = m_tr_stack.top(); use_stroke = true; @@ -1431,46 +1443,52 @@ unsigned int PrintEmf::stroke (Inkscape::Extension::Print * /*mod*/, if (create_pen(style, tf))return 0; if (style->stroke_dash.n_dash && style->stroke_dash.dash && FixPPTDashLine ){ - // convert the path, gets its complete length, and then make a new path with parameter length instead of t - Geom::Piecewise > tmp_pathpw; // pathv-> sbasis - Geom::Piecewise > tmp_pathpw2; // sbasis using arc length parameter - Geom::Piecewise > tmp_pathpw3; // new (discontinuous) path, composed of dots/dashes - Geom::Piecewise > first_frag; // first fragment, will be appended at end - int n_dash = style->stroke_dash.n_dash; - int i=0; //dash index - double tlength; // length of tmp_pathpw - double slength=0.0; // start of gragment - double elength; // end of gragment - for (unsigned int i=0; i < pathv.size(); i++) { - tmp_pathpw.concat(pathv[i].toPwSb()); - } - tlength = length(tmp_pathpw,0.1); - tmp_pathpw2 = arc_length_parametrization(tmp_pathpw); - - // go around the dash array repeatedly until the entire path is consumed (but not beyond). - while(slength < tlength){ - elength = slength + style->stroke_dash.dash[i++]; - if(elength > tlength)elength = tlength; - Geom::Piecewise > fragment(portion(tmp_pathpw2, slength, elength)); - if(slength){ tmp_pathpw3.concat(fragment); } - else { first_frag = fragment; } - slength = elength; - slength += style->stroke_dash.dash[i++]; // the gap - if(i>=n_dash)i=0; - } - tmp_pathpw3.concat(first_frag); // may merge line around start point - Geom::PathVector out_pathv = Geom::path_from_piecewise(tmp_pathpw3, 0.01); - print_pathv(out_pathv, tf); + // convert the path, gets its complete length, and then make a new path with parameter length instead of t + Geom::Piecewise > tmp_pathpw; // pathv-> sbasis + Geom::Piecewise > tmp_pathpw2; // sbasis using arc length parameter + Geom::Piecewise > tmp_pathpw3; // new (discontinuous) path, composed of dots/dashes + Geom::Piecewise > first_frag; // first fragment, will be appended at end + int n_dash = style->stroke_dash.n_dash; + int i=0; //dash index + double tlength; // length of tmp_pathpw + double slength=0.0; // start of gragment + double elength; // end of gragment + for (unsigned int i=0; i < pathv.size(); i++) { + tmp_pathpw.concat(pathv[i].toPwSb()); + } + tlength = length(tmp_pathpw,0.1); + tmp_pathpw2 = arc_length_parametrization(tmp_pathpw); + + // go around the dash array repeatedly until the entire path is consumed (but not beyond). + while(slength < tlength){ + elength = slength + style->stroke_dash.dash[i++]; + if(elength > tlength)elength = tlength; + Geom::Piecewise > fragment(portion(tmp_pathpw2, slength, elength)); + if(slength){ tmp_pathpw3.concat(fragment); } + else { first_frag = fragment; } + slength = elength; + slength += style->stroke_dash.dash[i++]; // the gap + if(i>=n_dash)i=0; + } + tmp_pathpw3.concat(first_frag); // may merge line around start point + Geom::PathVector out_pathv = Geom::path_from_piecewise(tmp_pathpw3, 0.01); + print_pathv(out_pathv, tf); } else { - print_pathv(pathv, tf); + print_pathv(pathv, tf); } use_stroke = false; use_fill = false; + if(usebk){ // OPAQUE was set, revert to TRANSPARENT + usebk = false; + rec = U_EMRSETBKMODE_set(U_TRANSPARENT); + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::stroke at U_EMRSETBKMODE_set"); + } + } -// std::cout << "end stroke " << std::endl; return 0; } @@ -1480,7 +1498,6 @@ unsigned int PrintEmf::stroke (Inkscape::Extension::Print * /*mod*/, // For other paths it sets a few flags and returns. bool PrintEmf::print_simple_shape(Geom::PathVector const &pathv, const Geom::Affine &transform) { -// std::cout << "print_simple_shape " << std::endl <(round(p0[X])); - int32_t const y0 = static_cast( round(p0[Y])); + int32_t const x0 = (int32_t) round(p0[X]); + int32_t const y0 = (int32_t) round(p0[Y]); lpPoints[i].x = x0; lpPoints[i].y = y0; @@ -1550,10 +1567,10 @@ bool PrintEmf::print_simple_shape(Geom::PathVector const &pathv, const Geom::Aff //p0[Y] = (p0[Y] * PX2WORLD); p1[Y] = (p1[Y] * PX2WORLD); - //int32_t const x0 = static_cast(round(p0[X])); - //int32_t const y0 = static_cast(round(p0[Y])); - int32_t const x1 = static_cast(round(p1[X])); - int32_t const y1 = static_cast(round(p1[Y])); + //int32_t const x0 = (int32_t) round(p0[X]); + //int32_t const y0 = (int32_t) round(p0[Y]); + int32_t const x1 = (int32_t) round(p1[X]); + int32_t const y1 = (int32_t) round(p1[Y]); lpPoints[i].x = x1; lpPoints[i].y = y1; @@ -1576,14 +1593,14 @@ bool PrintEmf::print_simple_shape(Geom::PathVector const &pathv, const Geom::Aff p2[Y] = (p2[Y] * PX2WORLD); p3[Y] = (p3[Y] * PX2WORLD); - //int32_t const x0 = static_cast(round(p0[X])); - //int32_t const y0 = static_cast(round(p0[Y])); - int32_t const x1 = static_cast(round(p1[X])); - int32_t const y1 = static_cast(round(p1[Y])); - int32_t const x2 = static_cast(round(p2[X])); - int32_t const y2 = static_cast(round(p2[Y])); - int32_t const x3 = static_cast(round(p3[X])); - int32_t const y3 = static_cast(round(p3[Y])); + //int32_t const x0 = (int32_t) round(p0[X]); + //int32_t const y0 = (int32_t) round(p0[Y]); + int32_t const x1 = (int32_t) round(p1[X]); + int32_t const y1 = (int32_t) round(p1[Y]); + int32_t const x2 = (int32_t) round(p2[X]); + int32_t const y2 = (int32_t) round(p2[Y]); + int32_t const x3 = (int32_t) round(p3[X]); + int32_t const y3 = (int32_t) round(p3[Y]); lpPoints[i].x = x1; lpPoints[i].y = y1; @@ -1628,115 +1645,113 @@ bool PrintEmf::print_simple_shape(Geom::PathVector const &pathv, const Geom::Aff if (use_fill && !use_stroke) { // only fill rec = selectobject_set(U_NULL_PEN, eht); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::print_simple_shape at selectobject_set pen"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::print_simple_shape at selectobject_set pen"); } } else if(!use_fill && use_stroke) { // only stroke rec = selectobject_set(U_NULL_BRUSH, eht); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::print_simple_shape at selectobject_set brush"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::print_simple_shape at selectobject_set brush"); } } if (polygon) { if (rectangle){ - U_RECTL rcl = rectl_set((U_POINTL) {lpPoints[0].x, lpPoints[0].y}, (U_POINTL) {lpPoints[2].x, lpPoints[2].y}); - rec = U_EMRRECTANGLE_set(rcl); + U_RECTL rcl = rectl_set((U_POINTL) {lpPoints[0].x, lpPoints[0].y}, (U_POINTL) {lpPoints[2].x, lpPoints[2].y}); + rec = U_EMRRECTANGLE_set(rcl); } else { - rec = U_EMRPOLYGON_set(U_RCL_DEF, nodes, lpPoints); + rec = U_EMRPOLYGON_set(U_RCL_DEF, nodes, lpPoints); } } else if (ellipse) { U_RECTL rcl = rectl_set((U_POINTL) {lpPoints[6].x, lpPoints[3].y}, (U_POINTL) {lpPoints[0].x, lpPoints[9].y}); rec = U_EMRELLIPSE_set(rcl); } - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::print_simple_shape at retangle/ellipse/polygon"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::print_simple_shape at retangle/ellipse/polygon"); } done = true; // replace the handle we moved above, assuming there was something set already if (use_fill && !use_stroke && hpen) { // only fill - rec = selectobject_set(hpen, eht); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::print_simple_shape at selectobject_set pen"; - } + rec = selectobject_set(hpen, eht); + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::print_simple_shape at selectobject_set pen"); + } } else if (!use_fill && use_stroke && hbrush){ // only stroke - rec = selectobject_set(hbrush, eht); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::print_simple_shape at selectobject_set brush"; - } + rec = selectobject_set(hbrush, eht); + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::print_simple_shape at selectobject_set brush"); + } } - } delete[] lpPoints; -// std::cout << "end simple_shape " << std::endl; return done; } /** Some parts based on win32.cpp by Lauris Kaplinski . Was a part of Inkscape - in the past (or will be in the future?) Not in current trunk. (4/19/2012) + in the past (or will be in the future?) Not in current trunk. (4/19/2012) - Limitations of this code: - 1. Transparency is lost on export. (Apparently a limitation of the EMF format.) - 2. Probably messes up if row stride != w*4 - 3. There is still a small memory leak somewhere, possibly in a pixbuf created in a routine - that calls this one and passes px, but never removes the rest of the pixbuf. The first time - this is called it leaked 5M (in one test) and each subsequent call leaked around 200K more. - If this routine is reduced to - if(1)return(0); - and called for a single 1280 x 1024 image then the program leaks 11M per call, or roughly the - size of two bitmaps. + Limitations of this code: + 1. Transparency is lost on export. (Apparently a limitation of the EMF format.) + 2. Probably messes up if row stride != w*4 + 3. There is still a small memory leak somewhere, possibly in a pixbuf created in a routine + that calls this one and passes px, but never removes the rest of the pixbuf. The first time + this is called it leaked 5M (in one test) and each subsequent call leaked around 200K more. + If this routine is reduced to + if(1)return(0); + and called for a single 1280 x 1024 image then the program leaks 11M per call, or roughly the + size of two bitmaps. */ -unsigned int PrintEmf::image(Inkscape::Extension::Print * /* module */, /** not used */ - unsigned char *rgba_px, /** array of pixel values, Gdk::Pixbuf bitmap format */ - unsigned int w, /** width of bitmap */ - unsigned int h, /** height of bitmap */ - unsigned int rs, /** row stride (normally w*4) */ - Geom::Affine const &/*tf_ignore*/, /** WRONG affine transform, use the one from m_tr_stack */ - SPStyle const *style) /** provides indirect link to image object */ +unsigned int PrintEmf::image( + Inkscape::Extension::Print * /* module */, /** not used */ + unsigned char *rgba_px, /** array of pixel values, Gdk::Pixbuf bitmap format */ + unsigned int w, /** width of bitmap */ + unsigned int h, /** height of bitmap */ + unsigned int rs, /** row stride (normally w*4) */ + Geom::Affine const &tf_ignore, /** WRONG affine transform, use the one from m_tr_stack */ + SPStyle const *style) /** provides indirect link to image object */ { -// std::cout << "image " << std::endl; - double x1,y1,dw,dh; - char *rec = NULL; - Geom::Affine tf = m_tr_stack.top(); - - rec = U_EMRSETSTRETCHBLTMODE_set(U_COLORONCOLOR); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::image at EMRHEADER"; - } - - x1= atof(style->object->getAttribute("x")); - y1= atof(style->object->getAttribute("y")); - dw= atof(style->object->getAttribute("width")); - dh= atof(style->object->getAttribute("height")); - Geom::Point pLL(x1,y1); - Geom::Point pLL2 = pLL * tf; //location of LL corner in Inkscape coordinates - - char *px; - uint32_t cbPx; - uint32_t colortype; - PU_RGBQUAD ct; - int numCt; - U_BITMAPINFOHEADER Bmih; - PU_BITMAPINFO Bmi; - colortype = U_BCBM_COLOR32; - (void) RGBA_to_DIB(&px, &cbPx, &ct, &numCt, (char *) rgba_px, w, h, w*4, colortype, 0, 1); - Bmih = bitmapinfoheader_set(w, h, 1, colortype, U_BI_RGB, 0, PXPERMETER, PXPERMETER, numCt, 0); - Bmi = bitmapinfo_set(Bmih, ct); - - U_POINTL Dest = pointl_set(round(pLL2[Geom::X] * PX2WORLD), round(pLL2[Geom::Y] * PX2WORLD)); - U_POINTL cDest = pointl_set(round(dw * PX2WORLD), round(dh * PX2WORLD)); - U_POINTL Src = pointl_set(0,0); - U_POINTL cSrc = pointl_set(w,h); - if(!FixImageRot){ /* Rotate images - some programs cannot read them in correctly if they are rotated */ + double x1,y1,dw,dh; + char *rec = NULL; + Geom::Affine tf = m_tr_stack.top(); + + rec = U_EMRSETSTRETCHBLTMODE_set(U_COLORONCOLOR); + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::image at EMRHEADER"); + } + + x1= atof(style->object->getAttribute("x")); + y1= atof(style->object->getAttribute("y")); + dw= atof(style->object->getAttribute("width")); + dh= atof(style->object->getAttribute("height")); + Geom::Point pLL(x1,y1); + Geom::Point pLL2 = pLL * tf; //location of LL corner in Inkscape coordinates + + char *px; + uint32_t cbPx; + uint32_t colortype; + PU_RGBQUAD ct; + int numCt; + U_BITMAPINFOHEADER Bmih; + PU_BITMAPINFO Bmi; + colortype = U_BCBM_COLOR32; + (void) RGBA_to_DIB(&px, &cbPx, &ct, &numCt, (char *) rgba_px, w, h, w*4, colortype, 0, 1); + Bmih = bitmapinfoheader_set(w, h, 1, colortype, U_BI_RGB, 0, PXPERMETER, PXPERMETER, numCt, 0); + Bmi = bitmapinfo_set(Bmih, ct); + + U_POINTL Dest = pointl_set(round(pLL2[Geom::X] * PX2WORLD), round(pLL2[Geom::Y] * PX2WORLD)); + U_POINTL cDest = pointl_set(round(dw * PX2WORLD), round(dh * PX2WORLD)); + U_POINTL Src = pointl_set(0,0); + U_POINTL cSrc = pointl_set(w,h); + if(!FixImageRot){ /* Rotate images - some programs cannot read them in correctly if they are rotated */ tf[4] = tf[5] = 0.0; // get rid of the offset in the transform Geom::Point pLL2prime = pLL2 * tf; U_XFORM tmpTransform; @@ -1748,70 +1763,66 @@ unsigned int PrintEmf::image(Inkscape::Extension::Print * /* module */, /** not tmpTransform.eDy = (pLL2[Geom::Y] - pLL2prime[Geom::Y]) * PX2WORLD; rec=U_EMRSAVEDC_set(); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::begin at U_EMRSAVEDC_set"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::image at U_EMRSAVEDC_set"); } - rec = U_EMRMODIFYWORLDTRANSFORM_set(tmpTransform, U_MWT_LEFTMULTIPLY); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::begin at EMRMODIFYWORLDTRANSFORM"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::image at EMRMODIFYWORLDTRANSFORM"); } - - } - rec = U_EMRSTRETCHDIBITS_set( - U_RCL_DEF, //! Bounding rectangle in device units - Dest, //! Destination UL corner in logical units - cDest, //! Destination W & H in logical units - Src, //! Source UL corner in logical units - cSrc, //! Source W & H in logical units - U_DIB_RGB_COLORS, //! DIBColors Enumeration - U_SRCCOPY, //! RasterOPeration Enumeration - Bmi, //! (Optional) bitmapbuffer (U_BITMAPINFO section) - h*rs, //! size in bytes of px - px //! (Optional) bitmapbuffer (U_BITMAPINFO section) - ); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::image at U_EMRSTRETCHDIBITS_set"; - } - free(px); - free(Bmi); - if(numCt)free(ct); - - if(!FixImageRot){ - rec=U_EMRRESTOREDC_set(-1); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::begin at U_EMRRESTOREDC_set"; - } - } + } + rec = U_EMRSTRETCHDIBITS_set( + U_RCL_DEF, //! Bounding rectangle in device units + Dest, //! Destination UL corner in logical units + cDest, //! Destination W & H in logical units + Src, //! Source UL corner in logical units + cSrc, //! Source W & H in logical units + U_DIB_RGB_COLORS, //! DIBColors Enumeration + U_SRCCOPY, //! RasterOPeration Enumeration + Bmi, //! (Optional) bitmapbuffer (U_BITMAPINFO section) + h*rs, //! size in bytes of px + px //! (Optional) bitmapbuffer (U_BITMAPINFO section) + ); + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::image at U_EMRSTRETCHDIBITS_set"); + } + free(px); + free(Bmi); + if(numCt)free(ct); + + if(!FixImageRot){ + rec=U_EMRRESTOREDC_set(-1); + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::image at U_EMRRESTOREDC_set"); + } + } -// std::cout << "end image" << std::endl; - return 0; + return 0; } // may also be called with a simple_shape or an empty path, whereupon it just returns without doing anything unsigned int PrintEmf::print_pathv(Geom::PathVector const &pathv, const Geom::Affine &transform) { -// std::cout << "print_pathv " << std::endl << std::flush; Geom::Affine tf = transform; char *rec = NULL; simple_shape = print_simple_shape(pathv, tf); if (simple_shape || pathv.empty()){ - if (use_fill){ destroy_brush(); } // these must be cleared even if nothing is drawn or hbrush,hpen fill up - if (use_stroke){ destroy_pen(); } - return TRUE; + if (use_fill){ destroy_brush(); } // these must be cleared even if nothing is drawn or hbrush,hpen fill up + if (use_stroke){ destroy_pen(); } + return TRUE; } - /* inkscape to EMF scaling is done below, but NOT the rotation/translation transform, - that is handled by the EMF MODIFYWORLDTRANSFORM record + /* inkscape to EMF scaling is done below, but NOT the rotation/translation transform, + that is handled by the EMF MODIFYWORLDTRANSFORM record */ Geom::PathVector pv = pathv_to_linear_and_cubic_beziers( pathv * tf ); rec = U_EMRBEGINPATH_set(); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::print_pathv at U_EMRBEGINPATH_set"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::print_pathv at U_EMRBEGINPATH_set"); } /** @@ -1828,10 +1839,10 @@ unsigned int PrintEmf::print_pathv(Geom::PathVector const &pathv, const Geom::Af p0[X] = (p0[X] * PX2WORLD); p0[Y] = (p0[Y] * PX2WORLD); - U_POINTL ptl = pointl_set(static_cast(round(p0[X])), static_cast(round(p0[Y]))); + U_POINTL ptl = pointl_set((int32_t) round(p0[X]), (int32_t) round(p0[Y])); rec = U_EMRMOVETOEX_set(ptl); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::print_pathv at U_EMRMOVETOEX_set"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::print_pathv at U_EMRMOVETOEX_set"); } /** @@ -1849,13 +1860,13 @@ unsigned int PrintEmf::print_pathv(Geom::PathVector const &pathv, const Geom::Af //p0[Y] = (p0[Y] * PX2WORLD); p1[Y] = (p1[Y] * PX2WORLD); - //int32_t const x0 = static_cast(round(p0[X])); - //int32_t const y0 = static_cast(round(p0[Y])); + //int32_t const x0 = (int32_t) round(p0[X]); + //int32_t const y0 = (int32_t) round(p0[Y]); - ptl = pointl_set(static_cast(round(p1[X])), static_cast(round(p1[Y]))); + ptl = pointl_set((int32_t) round(p1[X]), (int32_t) round(p1[Y])); rec = U_EMRLINETO_set(ptl); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::print_pathv at U_EMRLINETO_set"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::print_pathv at U_EMRLINETO_set"); } } else if (Geom::CubicBezier const *cubic = dynamic_cast(&*cit)) @@ -1875,14 +1886,14 @@ unsigned int PrintEmf::print_pathv(Geom::PathVector const &pathv, const Geom::Af p2[Y] = (p2[Y] * PX2WORLD); p3[Y] = (p3[Y] * PX2WORLD); - //int32_t const x0 = static_cast(round(p0[X])); - //int32_t const y0 = static_cast(round(p0[Y])); - int32_t const x1 = static_cast(round(p1[X])); - int32_t const y1 = static_cast(round(p1[Y])); - int32_t const x2 = static_cast(round(p2[X])); - int32_t const y2 = static_cast(round(p2[Y])); - int32_t const x3 = static_cast(round(p3[X])); - int32_t const y3 = static_cast(round(p3[Y])); + //int32_t const x0 = (int32_t) round(p0[X]); + //int32_t const y0 = (int32_t) round(p0[Y]); + int32_t const x1 = (int32_t) round(p1[X]); + int32_t const y1 = (int32_t) round(p1[Y]); + int32_t const x2 = (int32_t) round(p2[X]); + int32_t const y2 = (int32_t) round(p2[Y]); + int32_t const x3 = (int32_t) round(p3[X]); + int32_t const y3 = (int32_t) round(p3[Y]); U_POINTL pt[3]; pt[0].x = x1; @@ -1893,8 +1904,8 @@ unsigned int PrintEmf::print_pathv(Geom::PathVector const &pathv, const Geom::Af pt[2].y = y3; rec = U_EMRPOLYBEZIERTO_set(U_RCL_DEF, 3, pt); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::print_pathv at U_EMRPOLYBEZIERTO_set"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::print_pathv at U_EMRPOLYBEZIERTO_set"); } } else @@ -1905,35 +1916,35 @@ unsigned int PrintEmf::print_pathv(Geom::PathVector const &pathv, const Geom::Af if (pit->end_default() == pit->end_closed()) { // there may be multiples of this on a single path rec = U_EMRCLOSEFIGURE_set(); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::print_pathv at U_EMRCLOSEFIGURE_set"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::print_pathv at U_EMRCLOSEFIGURE_set"); } } } rec = U_EMRENDPATH_set(); // there may be only be one of these on a single path - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::print_pathv at U_EMRENDPATH_set"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::print_pathv at U_EMRENDPATH_set"); } // explicit FILL/STROKE commands are needed for each sub section of the path if (use_fill && !use_stroke){ rec = U_EMRFILLPATH_set(U_RCL_DEF); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::fill at U_EMRFILLPATH_set"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::fill at U_EMRFILLPATH_set"); } } else if (use_fill && use_stroke) { rec = U_EMRSTROKEANDFILLPATH_set(U_RCL_DEF); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::stroke at U_EMRSTROKEANDFILLPATH_set"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::stroke at U_EMRSTROKEANDFILLPATH_set"); } } else if (!use_fill && use_stroke){ rec = U_EMRSTROKEPATH_set(U_RCL_DEF); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::stroke at U_EMRSTROKEPATH_set"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::stroke at U_EMRSTROKEPATH_set"); } } @@ -1945,8 +1956,6 @@ unsigned int PrintEmf::print_pathv(Geom::PathVector const &pathv, const Geom::Af destroy_pen(); } -// std::cout << "end pathv" << std::endl; - return TRUE; } @@ -1959,7 +1968,6 @@ bool PrintEmf::textToPath(Inkscape::Extension::Print * ext) unsigned int PrintEmf::text(Inkscape::Extension::Print * /*mod*/, char const *text, Geom::Point const &p, SPStyle const *const style) { -// std::cout << "text " << std::endl; if (!et) return 0; char *rec = NULL; @@ -2015,10 +2023,10 @@ unsigned int PrintEmf::text(Inkscape::Extension::Print * /*mod*/, char const *te } } - /* Note that text font sizes are stored into the EMF as fairly small integers and that limits their precision. - The EMF output files produced here have been designed so that the integer valued pt sizes - land right on an integer value in the EMF file, so those are exact. However, something like 18.1 pt will be - somewhat off, so that when it is read back in it becomes 18.11 pt. (For instance.) + /* Note that text font sizes are stored into the EMF as fairly small integers and that limits their precision. + The EMF output files produced here have been designed so that the integer valued pt sizes + land right on an integer value in the EMF file, so those are exact. However, something like 18.1 pt will be + somewhat off, so that when it is read back in it becomes 18.11 pt. (For instance.) */ int textheight = round(-style->font_size.computed * PX2WORLD * std::min(tf.expansionX(),tf.expansionY())); if (!hfont) { @@ -2026,12 +2034,8 @@ unsigned int PrintEmf::text(Inkscape::Extension::Print * /*mod*/, char const *te // Get font face name. Use changed font name if unicode mapped to one // of the special fonts. uint16_t *wfacename; - if(!newfont){ - wfacename = U_Utf8ToUtf16le(style->text->font_family.value, 0, NULL); - } - else { - wfacename = U_Utf8ToUtf16le(FontName(newfont), 0, NULL); - } + if(!newfont){ wfacename = U_Utf8ToUtf16le(style->text->font_family.value, 0, NULL); } + else { wfacename = U_Utf8ToUtf16le(FontName(newfont), 0, NULL); } // Scale the text to the minimum stretch. (It tends to stay within bounding rectangles even if // it was streteched asymmetrically.) Few applications support text from EMF which is scaled @@ -2055,36 +2059,25 @@ unsigned int PrintEmf::text(Inkscape::Extension::Print * /*mod*/, char const *te free(wfacename); rec = extcreatefontindirectw_set(&hfont, eht, (char *) &lf, NULL); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::text at extcreatefontindirectw_set"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::text at extcreatefontindirectw_set"); } } rec = selectobject_set(hfont, eht); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::text at selectobject_set"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::text at selectobject_set"); } float rgb[3]; sp_color_get_rgb_floatv( &style->fill.value.color, rgb ); - rec = U_EMRSETTEXTCOLOR_set(U_RGB(255*rgb[0], 255*rgb[1], 255*rgb[2])); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::text at U_EMRSETTEXTCOLOR_set"; - } - - // Text alignment: - // - (x,y) coordinates received by this filter are those of the point where the text - // actually starts, and already takes into account the text object's alignment; - // - for this reason, the EMF text alignment must always be TA_BASELINE|TA_LEFT. - rec = U_EMRSETTEXTALIGN_set(U_TA_BASELINE | U_TA_LEFT); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::text at U_EMRSETTEXTALIGN_set"; - } - - // Transparent text background - rec = U_EMRSETBKMODE_set(U_TRANSPARENT); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::text at U_EMRSETBKMODE_set"; + // only change the text color when it needs to be changed + if(memcmp(htextcolor_rgb,rgb,3*sizeof(float))){ + memcpy(htextcolor_rgb,rgb,3*sizeof(float)); + rec = U_EMRSETTEXTCOLOR_set(U_RGB(255*rgb[0], 255*rgb[1], 255*rgb[2])); + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::text at U_EMRSETTEXTCOLOR_set"); + } } Geom::Point p2 = p * tf; @@ -2099,27 +2092,27 @@ unsigned int PrintEmf::text(Inkscape::Extension::Print * /*mod*/, char const *te //Conditionally handle compensation for PPT EMF import bug (affects PPT 2003-2010, at least) if(FixPPTCharPos){ - if(fix90n==1){ //vertical - dx= 0.0; - dy= f3 * style->font_size.computed * std::cos( rotb ); - } - else if(fix90n==2){ //horizontal - dx= f2 * style->font_size.computed * std::sin( rotb ); - dy= 0.0; - } - else { - dx= f1 * style->font_size.computed * std::sin( rotb ); - dy= f1 * style->font_size.computed * std::cos( rotb ); - } - p2[Geom::X] += dx; - p2[Geom::Y] += dy; + if(fix90n==1){ //vertical + dx= 0.0; + dy= f3 * style->font_size.computed * std::cos( rotb ); + } + else if(fix90n==2){ //horizontal + dx= f2 * style->font_size.computed * std::sin( rotb ); + dy= 0.0; + } + else { + dx= f1 * style->font_size.computed * std::sin( rotb ); + dy= f1 * style->font_size.computed * std::cos( rotb ); + } + p2[Geom::X] += dx; + p2[Geom::Y] += dy; } p2[Geom::X] = (p2[Geom::X] * PX2WORLD); p2[Geom::Y] = (p2[Geom::Y] * PX2WORLD); - int32_t const xpos = static_cast(round(p2[Geom::X])); - int32_t const ypos = static_cast(round(p2[Geom::Y])); + int32_t const xpos = (int32_t) round(p2[Geom::X]); + int32_t const ypos = (int32_t) round(p2[Geom::Y]); // The number of characters in the string is a bit fuzzy. ndx, the number of entries in adx is // the number of VISIBLE characters, since some may combine from the UTF (8 originally, @@ -2134,30 +2127,28 @@ unsigned int PrintEmf::text(Inkscape::Extension::Print * /*mod*/, char const *te free(adx); rec = U_EMREXTTEXTOUTW_set(U_RCL_DEF,U_GM_COMPATIBLE,1.0,1.0,(PU_EMRTEXT)rec2); free(rec2); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::text at U_EMREXTTEXTOUTW_set"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::text at U_EMREXTTEXTOUTW_set"); } // Must deselect an object before deleting it. Put the default font (back) in. rec = selectobject_set(U_DEVICE_DEFAULT_FONT, eht); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::text at selectobject_set"; + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::text at selectobject_set"); } if(hfont){ - rec = deleteobject_set(&hfont, eht); - if(!rec || emf_append(reinterpret_cast(rec), et, U_REC_FREE)){ - throw "Fatal programming error in PrintEmf::text at deleteobject_set"; - } + rec = deleteobject_set(&hfont, eht); + if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){ + g_error("Fatal programming error in PrintEmf::text at deleteobject_set"); + } } -// std::cout << "end text" << std::endl; return 0; } void PrintEmf::init (void) { -// std::cout << "init " << std::endl; read_system_fflist(); /* EMF print */ -- cgit v1.2.3