Skip to content

Fix Drawing pixelsToPoints and twipsToPixels ratios #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix Drawing pixelsToPoints and twipsToPixels ratios #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
769f116
Fix Drawing pixelsToPoints and twipsToPixels ratio
guilliamxavier Nov 26, 2020
870fb29
Update Drawing tests after fix
guilliamxavier Nov 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Common/Drawing.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public static function emuToPixels($pValue = 0)
*/
public static function pixelsToPoints($pValue = 0)
{
return $pValue * 0.67777777;
return $pValue * 0.75;
}

/**
Expand All @@ -70,7 +70,7 @@ public static function pointsToCentimeters($pValue = 0)
if ($pValue == 0) {
return 0;
}
return ((($pValue * 1.333333333) / self::DPI_96) * 2.54);
return ((($pValue / 0.75) / self::DPI_96) * 2.54);
}

/**
Expand All @@ -84,7 +84,7 @@ public static function pointsToPixels($pValue = 0)
if ($pValue == 0) {
return 0;
}
return $pValue * 1.333333333;
return $pValue / 0.75;
}

/**
Expand Down Expand Up @@ -205,7 +205,7 @@ public static function twipsToPixels($pValue = 0)
if ($pValue == 0) {
return 0;
}
return round($pValue / 15.873984);
return round($pValue / 15);
}

/**
Expand Down
8 changes: 4 additions & 4 deletions tests/Common/Tests/DrawingTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ public function testPixelsPoints()
$value = rand(1, 100);

$this->assertEquals(0, Drawing::pixelsToPoints());
$this->assertEquals($value*0.67777777, Drawing::pixelsToPoints($value));
$this->assertEquals($value*0.75, Drawing::pixelsToPoints($value));
$this->assertEquals(0, Drawing::pointsToPixels());
$this->assertEquals($value* 1.333333333, Drawing::pointsToPixels($value));
$this->assertEquals($value/ 0.75, Drawing::pointsToPixels($value));
}

/**
Expand All @@ -80,7 +80,7 @@ public function testPointsCentimeters()
$value = rand(1, 100);

$this->assertEquals(0, Drawing::pointsToCentimeters());
$this->assertEquals($value * 1.333333333 / Drawing::DPI_96 * 2.54, Drawing::pointsToCentimeters($value));
$this->assertEquals($value / 0.75 / Drawing::DPI_96 * 2.54, Drawing::pointsToCentimeters($value));
}

/**
Expand All @@ -105,7 +105,7 @@ public function testTwips()

// Pixels
$this->assertEquals(0, Drawing::twipsToPixels());
$this->assertEquals(round($value / 15.873984), Drawing::twipsToPixels($value));
$this->assertEquals(round($value / 15), Drawing::twipsToPixels($value));
}

public function testHTML()
Expand Down