![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/extension/internal/emf-win32-inout.cpp b/src/extension/internal/emf-win32-inout.cpp
index 3eac9e5fc61eb21c6c95ff2572e4320b165a9c51..7c2aa919208493f83f1a73e3023a344df468e27e 100644 (file)
* Authors:
* Ulf Erikson <ulferikson@users.sf.net>
*
- * Copyright (C) 2006 Authors
+ * Copyright (C) 2006-2008 Authors
*
* Released under GNU GPL, read the file 'COPYING' for more information
*/
bool fill_set;
double xDPI, yDPI;
bool pathless_stroke;
+ bool inpath;
SIZEL sizeWnd;
SIZEL sizeView;
POINTL winorg;
POINTL vieworg;
double ScaleX, ScaleY;
+ COLORREF textColor;
+ bool textColorSet;
+ DWORD textAlign;
+ XFORM worldTransform;
+ unsigned int id;
int n_obj;
PEMF_OBJECT emf_obj;
static void
output_style(PEMF_CALLBACK_DATA d, int iType)
{
+ SVGOStringStream tmp_id;
SVGOStringStream tmp_style;
char tmp[1024] = {0};
float stroke_rgb[3];
sp_color_get_rgb_floatv(&(d->style.stroke.value.color), stroke_rgb);
+ tmp_id << "\n\tid=\"" << (d->id++) << "\"";
+ *(d->outsvg) += tmp_id.str().c_str();
*(d->outsvg) += "\n\tstyle=\"";
if (iType == EMR_STROKEPATH || !d->fill_set) {
tmp_style << "fill:none;";
tmp_style << tmp;
snprintf(tmp, 1023,
"fill-rule:%s;",
- d->style.fill_rule.value != 0 ? "evenodd" : "nonzero");
+ d->style.fill_rule.value == 0 ? "evenodd" : "nonzero");
tmp_style << tmp;
tmp_style << "fill-opacity:1;";
tmp_style << "stroke-width:" <<
MAX( 0.001, d->style.stroke_width.value ) << "px;";
+ tmp_style << "stroke-linecap:" <<
+ (d->style.stroke_linecap.computed == 0 ? "butt" :
+ d->style.stroke_linecap.computed == 1 ? "round" :
+ d->style.stroke_linecap.computed == 2 ? "square" :
+ "unknown") << ";";
+
tmp_style << "stroke-linejoin:" <<
(d->style.stroke_linejoin.computed == 0 ? "miter" :
d->style.stroke_linejoin.computed == 1 ? "round" :
static double
-pix_x_to_point(PEMF_CALLBACK_DATA d, double px)
+_pix_x_to_point(PEMF_CALLBACK_DATA d, double px)
{
double tmp = px - d->winorg.x;
- tmp *= (double) PX_PER_IN / d->ScaleX;
+ tmp *= d->ScaleX ? (double) PX_PER_IN / d->ScaleX : 1.0;
tmp += d->vieworg.x;
return tmp;
}
-
static double
-pix_y_to_point(PEMF_CALLBACK_DATA d, double px)
+_pix_y_to_point(PEMF_CALLBACK_DATA d, double px)
{
double tmp = px - d->winorg.y;
- tmp *= (double) PX_PER_IN / d->ScaleY;
+ tmp *= d->ScaleY ? (double) PX_PER_IN / d->ScaleY : 1.0;
tmp += d->vieworg.y;
return tmp;
}
static double
-pix_size_to_point(PEMF_CALLBACK_DATA d, double px)
+pix_to_x_point(PEMF_CALLBACK_DATA d, double px, double py)
+{
+ double ppx = _pix_x_to_point(d, px);
+ double ppy = _pix_y_to_point(d, py);
+
+ double x = ppx * d->worldTransform.eM11 + ppy * d->worldTransform.eM21 + d->worldTransform.eDx;
+
+ return x;
+}
+
+static double
+pix_to_y_point(PEMF_CALLBACK_DATA d, double px, double py)
+{
+ double ppx = _pix_x_to_point(d, px);
+ double ppy = _pix_y_to_point(d, py);
+
+ double y = ppx * d->worldTransform.eM12 + ppy * d->worldTransform.eM22 + d->worldTransform.eDy;
+
+ return y;
+}
+
+
+static double
+_pix_size_to_point(PEMF_CALLBACK_DATA d, double px)
{
double tmp = px;
- tmp *= (double) PX_PER_IN / d->ScaleX;
+ tmp *= d->ScaleX ? (double) PX_PER_IN / d->ScaleX : 1.0;
+ return tmp;
+}
+
+
+static double
+pix_to_size_point(PEMF_CALLBACK_DATA d, double px)
+{
+ double dx = pix_to_x_point(d, px, 0);
+ double dy = pix_to_y_point(d, px, 0);
+ double tmp = sqrt(dx * dx + dy * dy);
return tmp;
}
if (!pEmr)
return;
- switch (pEmr->lopn.lopnStyle) {
+ switch (pEmr->lopn.lopnStyle & PS_STYLE_MASK) {
case PS_DASH:
case PS_DOT:
case PS_DASHDOT:
case PS_DASHDOTDOT:
{
int i = 0;
+ int penstyle = (pEmr->lopn.lopnStyle & PS_STYLE_MASK);
d->style.stroke_dash.n_dash =
- PS_DASHDOTDOT ? 6 : PS_DASHDOT ? 4 : 2;
+ penstyle == PS_DASHDOTDOT ? 6 : penstyle == PS_DASHDOT ? 4 : 2;
if (d->style.stroke_dash.dash)
delete[] d->style.stroke_dash.dash;
d->style.stroke_dash.dash = new double[d->style.stroke_dash.n_dash];
- if (pEmr->lopn.lopnStyle==PS_DASH || pEmr->lopn.lopnStyle==PS_DASHDOT || pEmr->lopn.lopnStyle==PS_DASHDOTDOT) {
+ if (penstyle==PS_DASH || penstyle==PS_DASHDOT || penstyle==PS_DASHDOTDOT) {
d->style.stroke_dash.dash[i++] = 3;
d->style.stroke_dash.dash[i++] = 1;
}
- if (pEmr->lopn.lopnStyle==PS_DOT || pEmr->lopn.lopnStyle==PS_DASHDOT || pEmr->lopn.lopnStyle==PS_DASHDOTDOT) {
+ if (penstyle==PS_DOT || penstyle==PS_DASHDOT || penstyle==PS_DASHDOTDOT) {
d->style.stroke_dash.dash[i++] = 1;
d->style.stroke_dash.dash[i++] = 1;
}
- if (pEmr->lopn.lopnStyle==PS_DASHDOTDOT) {
+ if (penstyle==PS_DASHDOTDOT) {
d->style.stroke_dash.dash[i++] = 1;
d->style.stroke_dash.dash[i++] = 1;
}
}
}
+ switch (pEmr->lopn.lopnStyle & PS_ENDCAP_MASK) {
+ case PS_ENDCAP_ROUND:
+ {
+ d->style.stroke_linecap.computed = 1;
+ break;
+ }
+ case PS_ENDCAP_SQUARE:
+ {
+ d->style.stroke_linecap.computed = 2;
+ break;
+ }
+ case PS_ENDCAP_FLAT:
+ default:
+ {
+ d->style.stroke_linecap.computed = 0;
+ break;
+ }
+ }
+
+ switch (pEmr->lopn.lopnStyle & PS_JOIN_MASK) {
+ case PS_JOIN_BEVEL:
+ {
+ d->style.stroke_linejoin.computed = 2;
+ break;
+ }
+ case PS_JOIN_MITER:
+ {
+ d->style.stroke_linejoin.computed = 0;
+ break;
+ }
+ case PS_JOIN_ROUND:
+ default:
+ {
+ d->style.stroke_linejoin.computed = 1;
+ break;
+ }
+ }
+
d->stroke_set = true;
if (pEmr->lopn.lopnStyle == PS_NULL) {
d->style.stroke_width.value = 0;
d->stroke_set = false;
} else if (pEmr->lopn.lopnWidth.x) {
- d->style.stroke_width.value = pix_size_to_point( d, pEmr->lopn.lopnWidth.x );
+ d->style.stroke_width.value = pix_to_size_point( d, pEmr->lopn.lopnWidth.x );
} else { // this stroke should always be rendered as 1 pixel wide, independent of zoom level (can that be done in SVG?)
//d->style.stroke_width.value = 1.0;
- d->style.stroke_width.value = pix_size_to_point( d, 1 );
+ d->style.stroke_width.value = pix_to_size_point( d, 1 );
}
double r, g, b;
g = SP_COLOR_U_TO_F( GetGValue(pEmr->lopn.lopnColor) );
b = SP_COLOR_U_TO_F( GetBValue(pEmr->lopn.lopnColor) );
d->style.stroke.value.color.set( r, g, b );
-
- d->style.stroke_linejoin.computed = 1;
}
delete[] d->style.stroke_dash.dash;
d->style.stroke_dash.dash = new double[pEmr->elp.elpNumEntries];
for (unsigned int i=0; i<pEmr->elp.elpNumEntries; i++) {
- d->style.stroke_dash.dash[i] = pix_size_to_point( d, pEmr->elp.elpStyleEntry[i] );
+ d->style.stroke_dash.dash[i] = pix_to_size_point( d, pEmr->elp.elpStyleEntry[i] );
}
d->style.stroke_dasharray_set = 1;
} else {
}
break;
}
+
+ case PS_DASH:
+ case PS_DOT:
+ case PS_DASHDOT:
+ case PS_DASHDOTDOT:
+ {
+ int i = 0;
+ int penstyle = (pEmr->elp.elpPenStyle & PS_STYLE_MASK);
+ d->style.stroke_dash.n_dash =
+ penstyle == PS_DASHDOTDOT ? 6 : penstyle == PS_DASHDOT ? 4 : 2;
+ if (d->style.stroke_dash.dash)
+ delete[] d->style.stroke_dash.dash;
+ d->style.stroke_dash.dash = new double[d->style.stroke_dash.n_dash];
+ if (penstyle==PS_DASH || penstyle==PS_DASHDOT || penstyle==PS_DASHDOTDOT) {
+ d->style.stroke_dash.dash[i++] = 3;
+ d->style.stroke_dash.dash[i++] = 2;
+ }
+ if (penstyle==PS_DOT || penstyle==PS_DASHDOT || penstyle==PS_DASHDOTDOT) {
+ d->style.stroke_dash.dash[i++] = 1;
+ d->style.stroke_dash.dash[i++] = 2;
+ }
+ if (penstyle==PS_DASHDOTDOT) {
+ d->style.stroke_dash.dash[i++] = 1;
+ d->style.stroke_dash.dash[i++] = 2;
+ }
+
+ d->style.stroke_dasharray_set = 1;
+ break;
+ }
+
+ case PS_SOLID:
default:
{
d->style.stroke_dasharray_set = 0;
}
}
- d->style.stroke_width.value = pix_size_to_point( d, pEmr->elp.elpWidth );
+ d->stroke_set = true;
+
+ if (pEmr->elp.elpPenStyle == PS_NULL) {
+ d->style.stroke_width.value = 0;
+ d->stroke_set = false;
+ } else if (pEmr->elp.elpWidth) {
+ d->style.stroke_width.value = pix_to_size_point( d, pEmr->elp.elpWidth );
+ } else { // this stroke should always be rendered as 1 pixel wide, independent of zoom level (can that be done in SVG?)
+ //d->style.stroke_width.value = 1.0;
+ d->style.stroke_width.value = pix_to_size_point( d, 1 );
+ }
double r, g, b;
r = SP_COLOR_U_TO_F( GetRValue(pEmr->elp.elpColor) );
b = SP_COLOR_U_TO_F( GetBValue(pEmr->elp.elpColor) );
d->style.stroke.value.color.set( r, g, b );
-
- d->stroke_set = true;
}
if (!pEmr)
return;
- d->style.font_size.computed = pix_size_to_point( d, pEmr->elfw.elfLogFont.lfHeight );
- d->style.font_weight.value = pEmr->elfw.elfLogFont.lfWeight;
+ d->style.font_size.computed = pix_to_size_point( d, pEmr->elfw.elfLogFont.lfHeight );
+ d->style.font_weight.value =
+ pEmr->elfw.elfLogFont.lfWeight == FW_THIN ? SP_CSS_FONT_WEIGHT_100 :
+ pEmr->elfw.elfLogFont.lfWeight == FW_EXTRALIGHT ? SP_CSS_FONT_WEIGHT_200 :
+ pEmr->elfw.elfLogFont.lfWeight == FW_LIGHT ? SP_CSS_FONT_WEIGHT_300 :
+ pEmr->elfw.elfLogFont.lfWeight == FW_NORMAL ? SP_CSS_FONT_WEIGHT_400 :
+ pEmr->elfw.elfLogFont.lfWeight == FW_MEDIUM ? SP_CSS_FONT_WEIGHT_500 :
+ pEmr->elfw.elfLogFont.lfWeight == FW_SEMIBOLD ? SP_CSS_FONT_WEIGHT_600 :
+ pEmr->elfw.elfLogFont.lfWeight == FW_BOLD ? SP_CSS_FONT_WEIGHT_700 :
+ pEmr->elfw.elfLogFont.lfWeight == FW_EXTRABOLD ? SP_CSS_FONT_WEIGHT_800 :
+ pEmr->elfw.elfLogFont.lfWeight == FW_HEAVY ? SP_CSS_FONT_WEIGHT_900 :
+ pEmr->elfw.elfLogFont.lfWeight == FW_NORMAL ? SP_CSS_FONT_WEIGHT_NORMAL :
+ pEmr->elfw.elfLogFont.lfWeight == FW_BOLD ? SP_CSS_FONT_WEIGHT_BOLD :
+ pEmr->elfw.elfLogFont.lfWeight == FW_EXTRALIGHT ? SP_CSS_FONT_WEIGHT_LIGHTER :
+ pEmr->elfw.elfLogFont.lfWeight == FW_EXTRABOLD ? SP_CSS_FONT_WEIGHT_BOLDER :
+ FW_NORMAL;
d->style.font_style.value = (pEmr->elfw.elfLogFont.lfItalic ? SP_CSS_FONT_STYLE_ITALIC : SP_CSS_FONT_STYLE_NORMAL);
d->style.text_decoration.underline = pEmr->elfw.elfLogFont.lfUnderline;
d->style.text_decoration.line_through = pEmr->elfw.elfLogFont.lfStrikeOut;
}
}
+static void
+assert_empty_path(PEMF_CALLBACK_DATA d, const char *fun)
+{
+ if (!d->path->empty()) {
+ g_debug("emf-win32-inout: assert_empty_path failed for %s\n", fun);
+
+ *(d->outsvg) += "<!--\n";
+ *(d->outsvg) += " <path \t";
+ output_style(d, EMR_STROKEPATH);
+ if (strstr(d->path->c_str(), "d=\"") == NULL) {
+ *(d->outsvg) += "d=\"";
+ *(d->outsvg) += "\n\t";
+ }
+ *(d->outsvg) += *(d->path);
+ *(d->outsvg) += " \" /> \n";
+ *(d->outsvg) += "-->\n";
+
+ *(d->path) = "";
+ }
+}
+
static int CALLBACK
myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nObj, LPARAM lpData)
@@ -550,7 +708,9 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
if (d->pathless_stroke) {
if (lpEMFR->iType!=EMR_POLYBEZIERTO && lpEMFR->iType!=EMR_POLYBEZIERTO16 &&
lpEMFR->iType!=EMR_POLYLINETO && lpEMFR->iType!=EMR_POLYLINETO16 &&
- lpEMFR->iType!=EMR_LINETO && lpEMFR->iType!=EMR_ARCTO)
+ lpEMFR->iType!=EMR_LINETO && lpEMFR->iType!=EMR_ARCTO &&
+ lpEMFR->iType!=EMR_SETBKCOLOR && lpEMFR->iType!=EMR_SETROP2 &&
+ lpEMFR->iType!=EMR_SETBKMODE)
{
*(d->outsvg) += " <path ";
output_style(d, EMR_STROKEPATH);
@@ -581,6 +741,7 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
tmp_outsvg <<
" width=\"" << d->MMX << "mm\"\n" <<
" height=\"" << d->MMY << "mm\">\n";
+ tmp_outsvg << "<g>\n";
if (pEmr->nHandles) {
d->n_obj = pEmr->nHandles;
@@ -608,26 +769,35 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
if (pEmr->cptl<4)
break;
- *(d->outsvg) += " <path ";
- output_style(d, EMR_STROKEPATH);
- *(d->outsvg) += "\n\td=\"";
+ if (!d->inpath) {
+ assert_empty_path(d, "EMR_POLYBEZIER");
+
+ *(d->outsvg) += " <path ";
+ output_style(d, EMR_STROKEPATH);
+ *(d->outsvg) += "\n\td=\"";
+ }
tmp_str <<
"\n\tM " <<
- pix_x_to_point( d, pEmr->aptl[0].x ) << " " <<
- pix_x_to_point( d, pEmr->aptl[0].y) << " ";
+ pix_to_x_point( d, pEmr->aptl[0].x, pEmr->aptl[0].y ) << " " <<
+ pix_to_y_point( d, pEmr->aptl[0].x, pEmr->aptl[0].y) << " ";
for (i=1; i<pEmr->cptl; ) {
tmp_str << "\n\tC ";
for (j=0; j<3 && i<pEmr->cptl; j++,i++) {
tmp_str <<
- pix_x_to_point( d, pEmr->aptl[i].x ) << " " <<
- pix_y_to_point( d, pEmr->aptl[i].y ) << " ";
+ pix_to_x_point( d, pEmr->aptl[i].x, pEmr->aptl[i].y ) << " " <<
+ pix_to_y_point( d, pEmr->aptl[i].x, pEmr->aptl[i].y ) << " ";
}
}
- *(d->outsvg) += tmp_str.str().c_str();
- *(d->outsvg) += " \" /> \n";
+ if (d->inpath) {
+ tmp_path << tmp_str.str().c_str();
+ }
+ else {
+ *(d->outsvg) += tmp_str.str().c_str();
+ *(d->outsvg) += " \" /> \n";
+ }
break;
}
@@ -639,20 +809,22 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
if (pEmr->cptl < 2)
break;
+ assert_empty_path(d, "EMR_POLYGON");
+
*(d->outsvg) += " <path ";
output_style(d, EMR_STROKEANDFILLPATH);
*(d->outsvg) += "\n\td=\"";
tmp_str <<
"\n\tM " <<
- pix_x_to_point( d, pEmr->aptl[0].x ) << " " <<
- pix_y_to_point( d, pEmr->aptl[0].y ) << " ";
+ pix_to_x_point( d, pEmr->aptl[0].x, pEmr->aptl[0].y ) << " " <<
+ pix_to_y_point( d, pEmr->aptl[0].x, pEmr->aptl[0].y ) << " ";
for (i=1; i<pEmr->cptl; i++) {
tmp_str <<
"\n\tL " <<
- pix_x_to_point( d, pEmr->aptl[i].x ) << " " <<
- pix_y_to_point( d, pEmr->aptl[i].y ) << " ";
+ pix_to_x_point( d, pEmr->aptl[i].x, pEmr->aptl[i].y ) << " " <<
+ pix_to_y_point( d, pEmr->aptl[i].x, pEmr->aptl[i].y ) << " ";
}
*(d->outsvg) += tmp_str.str().c_str();
@@ -668,24 +840,33 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
if (pEmr->cptl<2)
break;
- *(d->outsvg) += " <path ";
- output_style(d, EMR_STROKEPATH);
- *(d->outsvg) += "\n\td=\"";
+ if (!d->inpath) {
+ assert_empty_path(d, "EMR_POLYLINE");
+
+ *(d->outsvg) += " <path ";
+ output_style(d, EMR_STROKEPATH);
+ *(d->outsvg) += "\n\td=\"";
+ }
tmp_str <<
"\n\tM " <<
- pix_x_to_point( d, pEmr->aptl[0].x ) << " " <<
- pix_y_to_point( d, pEmr->aptl[0].y ) << " ";
+ pix_to_x_point( d, pEmr->aptl[0].x, pEmr->aptl[0].y ) << " " <<
+ pix_to_y_point( d, pEmr->aptl[0].x, pEmr->aptl[0].y ) << " ";
for (i=1; i<pEmr->cptl; i++) {
tmp_str <<
"\n\tL " <<
- pix_x_to_point( d, pEmr->aptl[i].x ) << " " <<
- pix_y_to_point( d, pEmr->aptl[i].y ) << " ";
+ pix_to_x_point( d, pEmr->aptl[i].x, pEmr->aptl[i].y ) << " " <<
+ pix_to_y_point( d, pEmr->aptl[i].x, pEmr->aptl[i].y ) << " ";
}
- *(d->outsvg) += tmp_str.str().c_str();
- *(d->outsvg) += " \" /> \n";
+ if (d->inpath) {
+ tmp_path << tmp_str.str().c_str();
+ }
+ else {
+ *(d->outsvg) += tmp_str.str().c_str();
+ *(d->outsvg) += " \" /> \n";
+ }
break;
}
@@ -694,15 +875,17 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
PEMRPOLYBEZIERTO pEmr = (PEMRPOLYBEZIERTO) lpEMFR;
DWORD i,j;
- if (d->path->empty())
+ if (d->path->empty()) {
+ d->pathless_stroke = true;
*(d->path) = "d=\"";
+ }
for (i=0; i<pEmr->cptl;) {
tmp_path << "\n\tC ";
for (j=0; j<3 && i<pEmr->cptl; j++,i++) {
tmp_path <<
- pix_x_to_point( d, pEmr->aptl[i].x ) << " " <<
- pix_y_to_point( d, pEmr->aptl[i].y ) << " ";
+ pix_to_x_point( d, pEmr->aptl[i].x, pEmr->aptl[i].y ) << " " <<
+ pix_to_y_point( d, pEmr->aptl[i].x, pEmr->aptl[i].y ) << " ";
}
}
@@ -713,14 +896,16 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
PEMRPOLYLINETO pEmr = (PEMRPOLYLINETO) lpEMFR;
DWORD i;
- if (d->path->empty())
+ if (d->path->empty()) {
+ d->pathless_stroke = true;
*(d->path) = "d=\"";
+ }
for (i=0; i<pEmr->cptl;i++) {
tmp_path <<
"\n\tL " <<
- pix_x_to_point( d, pEmr->aptl[i].x ) << " " <<
- pix_y_to_point( d, pEmr->aptl[i].y ) << " ";
+ pix_to_x_point( d, pEmr->aptl[i].x, pEmr->aptl[i].y ) << " " <<
+ pix_to_y_point( d, pEmr->aptl[i].x, pEmr->aptl[i].y ) << " ";
}
break;
@@ -731,14 +916,13 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
PEMRPOLYPOLYGON pEmr = (PEMRPOLYPOLYGON) lpEMFR;
unsigned int n, i, j;
- if (lpEMFR->iType == EMR_POLYPOLYGON)
- *(d->outsvg) += "<!-- EMR_POLYPOLYGON... -->\n";
- else
- *(d->outsvg) += "<!-- EMR_POLYPOLYLINE... -->\n";
+ if (!d->inpath) {
+ assert_empty_path(d, lpEMFR->iType == EMR_POLYPOLYGON ? "EMR_POLYPOLYGON" : "EMR_POLYPOLYLINE");
- *(d->outsvg) += "<path ";
- output_style(d, lpEMFR->iType==EMR_POLYPOLYGON ? EMR_STROKEANDFILLPATH : EMR_STROKEPATH);
- *(d->outsvg) += "\n\td=\"";
+ *(d->outsvg) += " <path ";
+ output_style(d, lpEMFR->iType==EMR_POLYPOLYGON ? EMR_STROKEANDFILLPATH : EMR_STROKEPATH);
+ *(d->outsvg) += "\n\td=\"";
+ }
POINTL *aptl = (POINTL *) &pEmr->aPolyCounts[pEmr->nPolys];
@@ -747,24 +931,31 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
SVGOStringStream poly_path;
poly_path << "\n\tM " <<
- pix_x_to_point( d, aptl[i].x ) << " " <<
- pix_y_to_point( d, aptl[i].y ) << " ";
+ pix_to_x_point( d, aptl[i].x, aptl[i].y ) << " " <<
+ pix_to_y_point( d, aptl[i].x, aptl[i].y ) << " ";
i++;
for (j=1; j<pEmr->aPolyCounts[n] && i<pEmr->cptl; j++) {
poly_path << "\n\tL " <<
- pix_x_to_point( d, aptl[i].x ) << " " <<
- pix_y_to_point( d, aptl[i].y ) << " ";
+ pix_to_x_point( d, aptl[i].x, aptl[i].y ) << " " <<
+ pix_to_y_point( d, aptl[i].x, aptl[i].y ) << " ";
i++;
}
- *(d->outsvg) += poly_path.str().c_str();
+ tmp_str << poly_path.str().c_str();
if (lpEMFR->iType == EMR_POLYPOLYGON)
- *(d->outsvg) += " z";
- *(d->outsvg) += " \n";
+ tmp_str << " z";
+ tmp_str << " \n";
+ }
+
+ if (d->inpath) {
+ tmp_path << tmp_str.str().c_str();
+ }
+ else {
+ *(d->outsvg) += tmp_str.str().c_str();
+ *(d->outsvg) += " \" /> \n";
}
- *(d->outsvg) += " \" /> \n";
break;
}
case EMR_SETWINDOWEXTEX:
@@ -797,6 +988,7 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
d->sizeView = pEmr->szlExtent;
if (d->sizeWnd.cx && d->sizeWnd.cy) {
+ /*
HDC hScreenDC = GetDC( NULL );
float scrPixelsX = (float)GetDeviceCaps( hScreenDC, HORZRES );
@@ -810,7 +1002,7 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
d->dwInchesY = d->sizeView.cy / (25.4f*scrPixelsY/scrMMY);
d->xDPI = d->sizeWnd.cx / d->dwInchesX;
d->yDPI = d->sizeWnd.cy / d->dwInchesY;
-
+ */
if (1) {
d->xDPI = 2540;
d->yDPI = 2540;
@@ -837,6 +1029,8 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
break;
case EMR_EOF:
{
+ assert_empty_path(d, "EMR_EOF");
+ tmp_outsvg << "</g>\n";
tmp_outsvg << "</svg>\n";
break;
}
@@ -856,8 +1050,8 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
{
PEMRSETPOLYFILLMODE pEmr = (PEMRSETPOLYFILLMODE) lpEMFR;
d->style.fill_rule.value =
- (pEmr->iMode == WINDING ? 0 :
- pEmr->iMode == ALTERNATE ? 1 : 0);
+ (pEmr->iMode == ALTERNATE ? 0 :
+ pEmr->iMode == WINDING ? 1 : 0);
break;
}
case EMR_SETROP2:
@@ -867,14 +1061,21 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
*(d->outsvg) += "<!-- EMR_SETSTRETCHBLTMODE -->\n";
break;
case EMR_SETTEXTALIGN:
- *(d->outsvg) += "<!-- EMR_SETTEXTALIGN -->\n";
+ {
+ PEMRSETTEXTALIGN pEmr = (PEMRSETTEXTALIGN) lpEMFR;
+ d->textAlign = pEmr->iMode;
break;
+ }
case EMR_SETCOLORADJUSTMENT:
*(d->outsvg) += "<!-- EMR_SETCOLORADJUSTMENT -->\n";
break;
case EMR_SETTEXTCOLOR:
- *(d->outsvg) += "<!-- EMR_SETTEXTCOLOR -->\n";
+ {
+ PEMRSETTEXTCOLOR pEmr = (PEMRSETTEXTCOLOR) lpEMFR;
+ d->textColor = pEmr->crColor;
+ d->textColorSet = true;
break;
+ }
case EMR_SETBKCOLOR:
*(d->outsvg) += "<!-- EMR_SETBKCOLOR -->\n";
break;
@@ -892,8 +1093,8 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
tmp_path <<
"\n\tM " <<
- pix_x_to_point( d, pEmr->ptl.x ) << " " <<
- pix_y_to_point( d, pEmr->ptl.y ) << " ";
+ pix_to_x_point( d, pEmr->ptl.x, pEmr->ptl.y ) << " " <<
+ pix_to_y_point( d, pEmr->ptl.x, pEmr->ptl.y ) << " ";
break;
}
case EMR_SETMETARGN:
@@ -918,11 +1119,117 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
*(d->outsvg) += "<!-- EMR_RESTOREDC -->\n";
break;
case EMR_SETWORLDTRANSFORM:
- *(d->outsvg) += "<!-- EMR_SETWORLDTRANSFORM -->\n";
+ {
+ PEMRSETWORLDTRANSFORM pEmr = (PEMRSETWORLDTRANSFORM) lpEMFR;
+ d->worldTransform = pEmr->xform;
break;
+ }
case EMR_MODIFYWORLDTRANSFORM:
- *(d->outsvg) += "<!-- EMR_MODIFYWORLDTRANSFORM -->\n";
+ {
+ PEMRMODIFYWORLDTRANSFORM pEmr = (PEMRMODIFYWORLDTRANSFORM) lpEMFR;
+ switch (pEmr->iMode)
+ {
+ case MWT_IDENTITY:
+ d->worldTransform.eM11 = 1.0;
+ d->worldTransform.eM12 = 0.0;
+ d->worldTransform.eM21 = 0.0;
+ d->worldTransform.eM22 = 1.0;
+ d->worldTransform.eDx = 0.0;
+ d->worldTransform.eDy = 0.0;
+ break;
+ case MWT_LEFTMULTIPLY:
+ {
+// d->worldTransform = pEmr->xform * worldTransform;
+
+ float a11 = pEmr->xform.eM11;
+ float a12 = pEmr->xform.eM12;
+ float a13 = 0.0;
+ float a21 = pEmr->xform.eM21;
+ float a22 = pEmr->xform.eM22;
+ float a23 = 0.0;
+ float a31 = pEmr->xform.eDx;
+ float a32 = pEmr->xform.eDy;
+ float a33 = 1.0;
+
+ float b11 = d->worldTransform.eM11;
+ float b12 = d->worldTransform.eM12;
+ //float b13 = 0.0;
+ float b21 = d->worldTransform.eM21;
+ float b22 = d->worldTransform.eM22;
+ //float b23 = 0.0;
+ float b31 = d->worldTransform.eDx;
+ float b32 = d->worldTransform.eDy;
+ //float b33 = 1.0;
+
+ float c11 = a11*b11 + a12*b21 + a13*b31;;
+ float c12 = a11*b12 + a12*b22 + a13*b32;;
+ //float c13 = a11*b13 + a12*b23 + a13*b33;;
+ float c21 = a21*b11 + a22*b21 + a23*b31;;
+ float c22 = a21*b12 + a22*b22 + a23*b32;;
+ //float c23 = a21*b13 + a22*b23 + a23*b33;;
+ float c31 = a31*b11 + a32*b21 + a33*b31;;
+ float c32 = a31*b12 + a32*b22 + a33*b32;;
+ //float c33 = a31*b13 + a32*b23 + a33*b33;;
+
+ d->worldTransform.eM11 = c11;;
+ d->worldTransform.eM12 = c12;;
+ d->worldTransform.eM21 = c21;;
+ d->worldTransform.eM22 = c22;;
+ d->worldTransform.eDx = c31;
+ d->worldTransform.eDy = c32;
+
+ break;
+ }
+ case MWT_RIGHTMULTIPLY:
+ {
+// d->worldTransform = worldTransform * pEmr->xform;
+
+ float a11 = d->worldTransform.eM11;
+ float a12 = d->worldTransform.eM12;
+ float a13 = 0.0;
+ float a21 = d->worldTransform.eM21;
+ float a22 = d->worldTransform.eM22;
+ float a23 = 0.0;
+ float a31 = d->worldTransform.eDx;
+ float a32 = d->worldTransform.eDy;
+ float a33 = 1.0;
+
+ float b11 = pEmr->xform.eM11;
+ float b12 = pEmr->xform.eM12;
+ //float b13 = 0.0;
+ float b21 = pEmr->xform.eM21;
+ float b22 = pEmr->xform.eM22;
+ //float b23 = 0.0;
+ float b31 = pEmr->xform.eDx;
+ float b32 = pEmr->xform.eDy;
+ //float b33 = 1.0;
+
+ float c11 = a11*b11 + a12*b21 + a13*b31;;
+ float c12 = a11*b12 + a12*b22 + a13*b32;;
+ //float c13 = a11*b13 + a12*b23 + a13*b33;;
+ float c21 = a21*b11 + a22*b21 + a23*b31;;
+ float c22 = a21*b12 + a22*b22 + a23*b32;;
+ //float c23 = a21*b13 + a22*b23 + a23*b33;;
+ float c31 = a31*b11 + a32*b21 + a33*b31;;
+ float c32 = a31*b12 + a32*b22 + a33*b32;;
+ //float c33 = a31*b13 + a32*b23 + a33*b33;;
+
+ d->worldTransform.eM11 = c11;;
+ d->worldTransform.eM12 = c12;;
+ d->worldTransform.eM21 = c21;;
+ d->worldTransform.eM22 = c22;;
+ d->worldTransform.eDx = c31;
+ d->worldTransform.eDy = c32;
+
+ break;
+ }
+// case MWT_SET:
+ default:
+ d->worldTransform = pEmr->xform;
+ break;
+ }
break;
+ }
case EMR_SELECTOBJECT:
{
PEMRSELECTOBJECT pEmr = (PEMRSELECTOBJECT) lpEMFR;
@@ -980,7 +1287,7 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
}
}
} else {
- if (index >= 0 && index < (unsigned int) d->n_obj) {
+ if ( /*index >= 0 &&*/ index < (unsigned int) d->n_obj) {
switch (d->emf_obj[index].type)
{
case EMR_CREATEPEN:
@@ -1006,7 +1313,7 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
int index = pEmr->ihPen;
EMRCREATEPEN *pPen =
- (EMRCREATEPEN *) malloc( sizeof(EMREXTCREATEPEN) );
+ (EMRCREATEPEN *) malloc( sizeof(EMRCREATEPEN) );
pPen->lopn = pEmr->lopn;
insert_object(d, index, EMR_CREATEPEN, (ENHMETARECORD *) pPen);
@@ -1030,11 +1337,64 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
*(d->outsvg) += "<!-- EMR_ANGLEARC -->\n";
break;
case EMR_ELLIPSE:
- *(d->outsvg) += "<!-- EMR_ELLIPSE -->\n";
+ {
+ PEMRELLIPSE pEmr = (PEMRELLIPSE) lpEMFR;
+ RECTL rclBox = pEmr->rclBox;
+
+ double l = pix_to_x_point( d, pEmr->rclBox.left, pEmr->rclBox.top );
+ double t = pix_to_y_point( d, pEmr->rclBox.left, pEmr->rclBox.top );
+ double r = pix_to_x_point( d, pEmr->rclBox.right, pEmr->rclBox.bottom );
+ double b = pix_to_y_point( d, pEmr->rclBox.right, pEmr->rclBox.bottom );
+
+ double cx = (l + r) / 2.0;
+ double cy = (t + b) / 2.0;
+ double rx = fabs(l - r) / 2.0;
+ double ry = fabs(t - b) / 2.0;
+
+ SVGOStringStream tmp_ellipse;
+ tmp_ellipse << "cx=\"" << cx << "\" ";
+ tmp_ellipse << "cy=\"" << cy << "\" ";
+ tmp_ellipse << "rx=\"" << rx << "\" ";
+ tmp_ellipse << "ry=\"" << ry << "\" ";
+
+ assert_empty_path(d, "EMR_ELLIPSE");
+
+ *(d->outsvg) += " <ellipse ";
+ output_style(d, lpEMFR->iType);
+ *(d->outsvg) += "\n\t";
+ *(d->outsvg) += tmp_ellipse.str().c_str();
+ *(d->outsvg) += "/> \n";
+ *(d->path) = "";
break;
+ }
case EMR_RECTANGLE:
- *(d->outsvg) += "<!-- EMR_RECTANGLE -->\n";
+ {
+ PEMRRECTANGLE pEmr = (PEMRRECTANGLE) lpEMFR;
+ RECTL rc = pEmr->rclBox;
+
+ double l = pix_to_x_point( d, rc.left, rc.top );
+ double t = pix_to_y_point( d, rc.left, rc.top );
+ double r = pix_to_x_point( d, rc.right, rc.bottom );
+ double b = pix_to_y_point( d, rc.right, rc.bottom );
+
+ SVGOStringStream tmp_rectangle;
+ tmp_rectangle << "d=\"";
+ tmp_rectangle << "\n\tM " << l << " " << t << " ";
+ tmp_rectangle << "\n\tL " << r << " " << t << " ";
+ tmp_rectangle << "\n\tL " << r << " " << b << " ";
+ tmp_rectangle << "\n\tL " << l << " " << b << " ";
+ tmp_rectangle << "\n\tz";
+
+ assert_empty_path(d, "EMR_RECTANGLE");
+
+ *(d->outsvg) += " <path ";
+ output_style(d, lpEMFR->iType);
+ *(d->outsvg) += "\n\t";
+ *(d->outsvg) += tmp_rectangle.str().c_str();
+ *(d->outsvg) += " \" /> \n";
+ *(d->path) = "";
break;
+ }
case EMR_ROUNDRECT:
*(d->outsvg) += "<!-- EMR_ROUNDRECT -->\n";
break;
@@ -1069,13 +1429,15 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
{
PEMRLINETO pEmr = (PEMRLINETO) lpEMFR;
- if (d->path->empty())
+ if (d->path->empty()) {
+ d->pathless_stroke = true;
*(d->path) = "d=\"";
+ }
tmp_path <<
"\n\tL " <<
- pix_x_to_point( d, pEmr->ptl.x ) << " " <<
- pix_y_to_point( d, pEmr->ptl.y ) << " ";
+ pix_to_x_point( d, pEmr->ptl.x, pEmr->ptl.y ) << " " <<
+ pix_to_y_point( d, pEmr->ptl.x, pEmr->ptl.y ) << " ";
break;
}
case EMR_ARCTO:
@@ -1090,7 +1452,7 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
case EMR_SETMITERLIMIT:
{
PEMRSETMITERLIMIT pEmr = (PEMRSETMITERLIMIT) lpEMFR;
- d->style.stroke_miterlimit.value = pix_size_to_point( d, pEmr->eMiterLimit );
+ d->style.stroke_miterlimit.value = pix_to_size_point( d, pEmr->eMiterLimit );
if (d->style.stroke_miterlimit.value < 1)
d->style.stroke_miterlimit.value = 1.0;
@@ -1101,11 +1463,13 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
{
tmp_path << "d=\"";
*(d->path) = "";
+ d->inpath = true;
break;
}
case EMR_ENDPATH:
{
tmp_path << "\"";
+ d->inpath = false;
break;
}
case EMR_CLOSEFIGURE:
@@ -1194,69 +1558,81 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
{
PEMREXTTEXTOUTW pEmr = (PEMREXTTEXTOUTW) lpEMFR;
- double x = pEmr->emrtext.ptlReference.x;
- double y = pEmr->emrtext.ptlReference.y;
+ double x1 = pEmr->emrtext.ptlReference.x;
+ double y1 = pEmr->emrtext.ptlReference.y;
+
+ if (!(d->textAlign & TA_BOTTOM))
+ y1 += fabs(d->style.font_size.computed);
+
+ double x = pix_to_x_point(d, x1, y1);
+ double y = pix_to_y_point(d, x1, y1);
- x = pix_x_to_point(d, x);
- y = pix_y_to_point(d, y);
+ wchar_t *wide_text = (wchar_t *) ((char *) pEmr + pEmr->emrtext.offString);
- wchar_t *text = (wchar_t *) ((char *) pEmr + pEmr->emrtext.offString);
-/*
- int i;
- for (i=0; i<pEmr->emrtext.nChars; i++) {
- if (text[i] < L' ' || text[i] > L'z')
- text[i] = L'?';
- }
-*/
- gchar *t =
- (gchar *) g_utf16_to_utf8( (gunichar2 *) text, pEmr->emrtext.nChars, NULL, NULL, NULL );
+ gchar *ansi_text =
+ (gchar *) g_utf16_to_utf8( (gunichar2 *) wide_text, pEmr->emrtext.nChars, NULL, NULL, NULL );
- if (t) {
- SVGOStringStream ts;
+ if (ansi_text) {
+ gchar *p = ansi_text;
+ while (*p) {
+ if (*p < 32 || *p >= 127) {
+ g_free(ansi_text);
+ ansi_text = g_strdup("");
+ break;
+ }
+ p++;
+ }
- gchar *escaped = g_markup_escape_text(t, -1);
+ SVGOStringStream ts;
- int j;
- for (j=0; j<strlen(escaped); j++) {
- if (escaped[j] < 32 || escaped[j] > 127)
- escaped[j] = '?';
- }
+ gchar *escaped_text = g_markup_escape_text(ansi_text, -1);
float text_rgb[3];
sp_color_get_rgb_floatv( &(d->style.fill.value.color), text_rgb );
+ if (!d->textColorSet) {
+ d->textColor = RGB(SP_COLOR_F_TO_U(text_rgb[0]),
+ SP_COLOR_F_TO_U(text_rgb[1]),
+ SP_COLOR_F_TO_U(text_rgb[2]));
+ }
+
char tmp[128];
snprintf(tmp, 127,
"fill:#%02x%02x%02x;",
- SP_COLOR_F_TO_U(text_rgb[0]),
- SP_COLOR_F_TO_U(text_rgb[1]),
- SP_COLOR_F_TO_U(text_rgb[2]));
+ GetRValue(d->textColor),
+ GetGValue(d->textColor),
+ GetBValue(d->textColor));
bool i = (d->style.font_style.value == SP_CSS_FONT_STYLE_ITALIC);
- bool o = (d->style.font_style.value == SP_CSS_FONT_STYLE_OBLIQUE);
+ //bool o = (d->style.font_style.value == SP_CSS_FONT_STYLE_OBLIQUE);
bool b = (d->style.font_weight.value == SP_CSS_FONT_WEIGHT_BOLD) ||
(d->style.font_weight.value >= SP_CSS_FONT_WEIGHT_500 && d->style.font_weight.value <= SP_CSS_FONT_WEIGHT_900);
+ int lcr = ((d->textAlign & TA_CENTER) == TA_CENTER) ? 2 : ((d->textAlign & TA_RIGHT) == TA_RIGHT) ? 1 : 0;
+
+ assert_empty_path(d, "EMR_EXTTEXTOUTW");
ts << " <text\n";
+ ts << " id=\"" << (d->id++) << "\"\n";
ts << " xml:space=\"preserve\"\n";
ts << " x=\"" << x << "\"\n";
ts << " y=\"" << y << "\"\n";
ts << " style=\""
- << "font-size:" << d->style.font_size.computed << "px;"
+ << "font-size:" << fabs(d->style.font_size.computed) << "px;"
<< tmp
<< "font-style:" << (i ? "italic" : "normal") << ";"
<< "font-weight:" << (b ? "bold" : "normal") << ";"
-// << "text-align:" << (b ? "start" : "center" : "end") << ";"
+ << "text-align:" << (lcr==2 ? "center" : lcr==1 ? "end" : "start") << ";"
+ << "text-anchor:" << (lcr==2 ? "middle" : lcr==1 ? "end" : "start") << ";"
<< "font-family:" << d->tstyle.font_family.value << ";"
<< "\"\n";
ts << " >";
- ts << escaped;
+ ts << escaped_text;
ts << "</text>\n";
*(d->outsvg) += ts.str().c_str();
- g_free(escaped);
- g_free(t);
+ g_free(escaped_text);
+ g_free(ansi_text);
}
break;
@@ -1270,26 +1646,35 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
if (pEmr->cpts<4)
break;
- *(d->outsvg) += " <path ";
- output_style(d, EMR_STROKEPATH);
- *(d->outsvg) += "\n\td=\"";
+ if (!d->inpath) {
+ assert_empty_path(d, "EMR_POLYBEZIER16");
+
+ *(d->outsvg) += " <path ";
+ output_style(d, EMR_STROKEPATH);
+ *(d->outsvg) += "\n\td=\"";
+ }
tmp_str <<
"\n\tM " <<
- pix_x_to_point( d, apts[0].x ) << " " <<
- pix_y_to_point( d, apts[0].y ) << " ";
+ pix_to_x_point( d, apts[0].x, apts[0].y ) << " " <<
+ pix_to_y_point( d, apts[0].x, apts[0].y ) << " ";
for (i=1; i<pEmr->cpts; ) {
tmp_str << "\n\tC ";
for (j=0; j<3 && i<pEmr->cpts; j++,i++) {
tmp_str <<
- pix_x_to_point( d, apts[i].x ) << " " <<
- pix_y_to_point( d, apts[i].y ) << " ";
+ pix_to_x_point( d, apts[i].x, apts[i].y ) << " " <<
+ pix_to_y_point( d, apts[i].x, apts[i].y ) << " ";
}
}
- *(d->outsvg) += tmp_str.str().c_str();
- *(d->outsvg) += " \" /> \n";
+ if (d->inpath) {
+ tmp_path << tmp_str.str().c_str();
+ }
+ else {
+ *(d->outsvg) += tmp_str.str().c_str();
+ *(d->outsvg) += " \" /> \n";
+ }
break;
}
@@ -1297,24 +1682,28 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
{
PEMRPOLYGON16 pEmr = (PEMRPOLYGON16) lpEMFR;
POINTS *apts = (POINTS *) pEmr->apts; // Bug in MinGW wingdi.h ?
+ SVGOStringStream tmp_poly;
unsigned int i;
+ unsigned int first = 0;
- *(d->outsvg) += "<path ";
+ assert_empty_path(d, "EMR_POLYGON16");
+
+ *(d->outsvg) += " <path ";
output_style(d, EMR_STROKEANDFILLPATH);
*(d->outsvg) += "\n\td=\"";
-
+
// skip the first point?
- tmp_path << "\n\tM " <<
- pix_x_to_point( d, apts[1].x ) << " " <<
- pix_y_to_point( d, apts[1].y ) << " ";
-
- for (i=2; i<pEmr->cpts; i++) {
- tmp_path << "\n\tL " <<
- pix_x_to_point( d, apts[i].x ) << " " <<
- pix_y_to_point( d, apts[i].y ) << " ";
+ tmp_poly << "\n\tM " <<
+ pix_to_x_point( d, apts[first].x, apts[first].y ) << " " <<
+ pix_to_y_point( d, apts[first].x, apts[first].y ) << " ";
+
+ for (i=first+1; i<pEmr->cpts; i++) {
+ tmp_poly << "\n\tL " <<
+ pix_to_x_point( d, apts[i].x, apts[i].y ) << " " <<
+ pix_to_y_point( d, apts[i].x, apts[i].y ) << " ";
}
- *(d->outsvg) += tmp_path.str().c_str();
+ *(d->outsvg) += tmp_poly.str().c_str();
*(d->outsvg) += " z \" /> \n";
break;
@@ -1328,24 +1717,33 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
if (pEmr->cpts<2)
break;
- *(d->outsvg) += " <path ";
- output_style(d, EMR_STROKEPATH);
- *(d->outsvg) += "\n\td=\"";
+ if (!d->inpath) {
+ assert_empty_path(d, "EMR_POLYLINE16");
+
+ *(d->outsvg) += " <path ";
+ output_style(d, EMR_STROKEPATH);
+ *(d->outsvg) += "\n\td=\"";
+ }
tmp_str <<
"\n\tM " <<
- pix_x_to_point( d, apts[0].x ) << " " <<
- pix_y_to_point( d, apts[0].y ) << " ";
+ pix_to_x_point( d, apts[0].x, apts[0].y ) << " " <<
+ pix_to_y_point( d, apts[0].x, apts[0].y ) << " ";
for (i=1; i<pEmr->cpts; i++) {
tmp_str <<
"\n\tL " <<
- pix_x_to_point( d, apts[i].x ) << " " <<
- pix_y_to_point( d, apts[i].y ) << " ";
+ pix_to_x_point( d, apts[i].x, apts[i].y ) << " " <<
+ pix_to_y_point( d, apts[i].x, apts[i].y ) << " ";
}
- *(d->outsvg) += tmp_str.str().c_str();
- *(d->outsvg) += " \" /> \n";
+ if (d->inpath) {
+ tmp_path << tmp_str.str().c_str();
+ }
+ else {
+ *(d->outsvg) += tmp_str.str().c_str();
+ *(d->outsvg) += " \" /> \n";
+ }
break;
}
@@ -1355,15 +1753,17 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
POINTS *apts = (POINTS *) pEmr->apts; // Bug in MinGW wingdi.h ?
DWORD i,j;
- if (d->path->empty())
+ if (d->path->empty()) {
+ d->pathless_stroke = true;
*(d->path) = "d=\"";
+ }
for (i=0; i<pEmr->cpts;) {
tmp_path << "\n\tC ";
for (j=0; j<3 && i<pEmr->cpts; j++,i++) {
tmp_path <<
- pix_x_to_point( d, apts[i].x ) << " " <<
- pix_y_to_point( d, apts[i].y ) << " ";
+ pix_to_x_point( d, apts[i].x, apts[i].y ) << " " <<
+ pix_to_y_point( d, apts[i].x, apts[i].y ) << " ";
}
}
@@ -1375,14 +1775,16 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
POINTS *apts = (POINTS *) pEmr->apts; // Bug in MinGW wingdi.h ?
DWORD i;
- if (d->path->empty())
+ if (d->path->empty()) {
+ d->pathless_stroke = true;
*(d->path) = "d=\"";
+ }
for (i=0; i<pEmr->cpts;i++) {
tmp_path <<
"\n\tL " <<
- pix_x_to_point( d, apts[i].x ) << " " <<
- pix_y_to_point( d, apts[i].y ) << " ";
+ pix_to_x_point( d, apts[i].x, apts[i].y ) << " " <<
+ pix_to_y_point( d, apts[i].x, apts[i].y ) << " ";
}
break;
@@ -1393,14 +1795,13 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
PEMRPOLYPOLYGON16 pEmr = (PEMRPOLYPOLYGON16) lpEMFR;
unsigned int n, i, j;
- if (lpEMFR->iType == EMR_POLYPOLYGON16)
- *(d->outsvg) += "<!-- EMR_POLYPOLYGON16... -->\n";
- else
- *(d->outsvg) += "<!-- EMR_POLYPOLYLINE16... -->\n";
+ if (!d->inpath) {
+ assert_empty_path(d, lpEMFR->iType == EMR_POLYPOLYGON16 ? "EMR_POLYPOLYGON16" : "EMR_POLYPOLYLINE16");
- *(d->outsvg) += "<path ";
- output_style(d, lpEMFR->iType==EMR_POLYPOLYGON16 ? EMR_STROKEANDFILLPATH : EMR_STROKEPATH);
- *(d->outsvg) += "\n\td=\"";
+ *(d->outsvg) += " <path ";
+ output_style(d, lpEMFR->iType==EMR_POLYPOLYGON16 ? EMR_STROKEANDFILLPATH : EMR_STROKEPATH);
+ *(d->outsvg) += "\n\td=\"";
+ }
POINTS *apts = (POINTS *) &pEmr->aPolyCounts[pEmr->nPolys];
@@ -1409,24 +1810,31 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
SVGOStringStream poly_path;
poly_path << "\n\tM " <<
- pix_x_to_point( d, apts[i].x ) << " " <<
- pix_y_to_point( d, apts[i].y ) << " ";
+ pix_to_x_point( d, apts[i].x, apts[i].y ) << " " <<
+ pix_to_y_point( d, apts[i].x, apts[i].y ) << " ";
i++;
for (j=1; j<pEmr->aPolyCounts[n] && i<pEmr->cpts; j++) {
poly_path << "\n\tL " <<
- pix_x_to_point( d, apts[i].x ) << " " <<
- pix_y_to_point( d, apts[i].y ) << " ";
+ pix_to_x_point( d, apts[i].x, apts[i].y ) << " " <<
+ pix_to_y_point( d, apts[i].x, apts[i].y ) << " ";
i++;
}
- *(d->outsvg) += poly_path.str().c_str();
+ tmp_str << poly_path.str().c_str();
if (lpEMFR->iType == EMR_POLYPOLYGON16)
- *(d->outsvg) += " z";
- *(d->outsvg) += " \n";
+ tmp_str << " z";
+ tmp_str << " \n";
+ }
+
+ if (d->inpath) {
+ tmp_path << tmp_str.str().c_str();
+ }
+ else {
+ *(d->outsvg) += tmp_str.str().c_str();
+ *(d->outsvg) += " \" /> \n";
}
- *(d->outsvg) += " \" /> \n";
break;
}
case EMR_POLYDRAW16:
@@ -1494,6 +1902,12 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
return 1;
}
+static int CALLBACK
+myMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, METARECORD *lpMFR, int nObj, LPARAM lpData)
+{
+ g_warning("Unable to import Windows Meta File.\n");
+ return 0;
+}
// Aldus Placeable Header ===================================================
// Since we are a 32bit app, we have to be sure this structure compiles to
SPDocument *
EmfWin32::open( Inkscape::Extension::Input *mod, const gchar *uri )
{
- EMF_CALLBACK_DATA d = {0};
+ EMF_CALLBACK_DATA d;
+
+ memset(&d, 0, sizeof(d));
+ d.worldTransform.eM11 = 1.0;
+ d.worldTransform.eM12 = 0.0;
+ d.worldTransform.eM21 = 0.0;
+ d.worldTransform.eM22 = 1.0;
+ d.worldTransform.eDx = 0.0;
+ d.worldTransform.eDy = 0.0;
+
gsize bytesRead = 0;
gsize bytesWritten = 0;
GError* error = NULL;
gunichar2 *unicode_fn = g_utf8_to_utf16( local_fn, -1, NULL, NULL, NULL );
WCHAR *unicode_uri = (WCHAR *) unicode_fn;
- // Try open as Enhanced Metafile
+ DWORD filesize = 0;
+ HANDLE fp = NULL;
+
+ HMETAFILE hmf;
HENHMETAFILE hemf;
+
+ if (PrintWin32::is_os_wide()) {
+ fp = CreateFileW(unicode_uri, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+ }
+ else {
+ fp = CreateFileA(ansi_uri, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+ }
+
+ if ( fp != INVALID_HANDLE_VALUE ) {
+ filesize = GetFileSize(fp, NULL);
+ CloseHandle(fp);
+ }
+
+ // Try open as Enhanced Metafile
if (PrintWin32::is_os_wide())
hemf = GetEnhMetaFileW(unicode_uri);
else
if (!hemf) {
// Try open as Windows Metafile
- HMETAFILE hmf;
if (PrintWin32::is_os_wide())
hmf = GetMetaFileW(unicode_uri);
else
if (hmf) {
DWORD nSize = GetMetaFileBitsEx( hmf, 0, NULL );
+
+ if (!nSize)
+ nSize = filesize;
+
if (nSize) {
BYTE *lpvData = new BYTE[nSize];
if (lpvData) {
hemf = SetWinMetaFileBits( nSize, lpvData, hDC, &mp );
// Clean up
ReleaseDC( NULL, hDC );
+ DeleteMetaFile( hmf );
+ hmf = NULL;
+ }
+ else {
+ // EnumMetaFile
}
delete[] lpvData;
}
+ else {
+ DeleteMetaFile( hmf );
+ hmf = NULL;
+ }
+ }
+ else {
DeleteMetaFile( hmf );
+ hmf = NULL;
}
- } else {
+ }
+ else {
// Try open as Aldus Placeable Metafile
HANDLE hFile;
if (PrintWin32::is_os_wide())
hFile = CreateFileW( unicode_uri, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL );
else
hFile = CreateFileA( ansi_uri, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL );
+
if (hFile != INVALID_HANDLE_VALUE) {
DWORD nSize = GetFileSize( hFile, NULL );
if (nSize) {
}
}
- if (!hemf || !d.outsvg || !d.path) {
+ if ((!hemf && !hmf) || !d.outsvg || !d.path) {
if (d.outsvg)
delete d.outsvg;
if (d.path)
delete d.path;
- if (local_fn)
+ if (local_fn)
g_free(local_fn);
- if (unicode_fn)
+ if (unicode_fn)
g_free(unicode_fn);
+ if (hemf)
+ DeleteEnhMetaFile(hemf);
+ if (hmf)
+ DeleteMetaFile(hmf);
return NULL;
}
- EnumEnhMetaFile(NULL, hemf, myEnhMetaFileProc, (LPVOID) &d, NULL);
- DeleteEnhMetaFile(hemf);
+ if (hemf) {
+ EnumEnhMetaFile(NULL, hemf, myEnhMetaFileProc, (LPVOID) &d, NULL);
+ DeleteEnhMetaFile(hemf);
+ }
+ else {
+ EnumMetaFile(NULL, hmf, myMetaFileProc, (LPARAM) &d);
+ DeleteMetaFile(hmf);
+ }
// std::cout << "SVG Output: " << std::endl << *(d.outsvg) << std::endl;