Kaydet (Commit) 33e49a3b authored tarafından Xisco Fauli's avatar Xisco Fauli Kaydeden (comit) Caolán McNamara

tdf#96046 SVG: use the same PPI as in svgio

Change-Id: I211dcc6fb242cfbd05636d42a811523de8e83be6
Reviewed-on: https://gerrit.libreoffice.org/20182Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarArmin Le Grand <Armin.Le.Grand@cib.de>
üst 49a32f4b
...@@ -25,16 +25,17 @@ double convLength( double value, SvgUnit unit, const State& rState, char dir ) ...@@ -25,16 +25,17 @@ double convLength( double value, SvgUnit unit, const State& rState, char dir )
double fRet(value); double fRet(value);
switch ( unit ) switch ( unit )
{ {
case SVG_LENGTH_UNIT_CM: fRet *= 72.0/2.54; break; case SVG_LENGTH_UNIT_CM: fRet *= F_SVG_PIXEL_PER_INCH/2.54; break;
case SVG_LENGTH_UNIT_IN: fRet *= 72.0; break; case SVG_LENGTH_UNIT_IN: fRet *= F_SVG_PIXEL_PER_INCH; break;
case SVG_LENGTH_UNIT_MM: fRet *= 72.0/25.4; break; case SVG_LENGTH_UNIT_MM: fRet *= F_SVG_PIXEL_PER_INCH/25.4; break;
case SVG_LENGTH_UNIT_PC: fRet *= 72.0/6.0; break; case SVG_LENGTH_UNIT_PC: fRet *= F_SVG_PIXEL_PER_INCH/6.0; break;
case SVG_LENGTH_UNIT_USER: case SVG_LENGTH_UNIT_PT: fRet *= F_SVG_PIXEL_PER_INCH/72.0; break;
case SVG_LENGTH_UNIT_PX: // no unit defaults to PX in svg,
// assume display to have 72DPI
case SVG_LENGTH_UNIT_PT: break;
case SVG_LENGTH_UNIT_EM: fRet *= rState.mnFontSize; break; case SVG_LENGTH_UNIT_EM: fRet *= rState.mnFontSize; break;
case SVG_LENGTH_UNIT_EX: fRet *= rState.mnFontSize / 2.0; break; case SVG_LENGTH_UNIT_EX: fRet *= rState.mnFontSize / 2.0; break;
case SVG_LENGTH_UNIT_USER:
case SVG_LENGTH_UNIT_PX:
// no unit defaults to PX in svg, assume display to have 90DPI
break;
case SVG_LENGTH_UNIT_PERCENTAGE: case SVG_LENGTH_UNIT_PERCENTAGE:
{ {
double fBoxLen; double fBoxLen;
......
...@@ -14,6 +14,10 @@ ...@@ -14,6 +14,10 @@
namespace svgi namespace svgi
{ {
// recommended value for this device dependent unit, see CSS2 section 4.3.2 Lengths
// Same as in svgio
#define F_SVG_PIXEL_PER_INCH 90.0
struct State; struct State;
enum SvgUnit enum SvgUnit
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment