Fixed duplicate code due to merging two related pull requests.

andersm · Jul 2, 2014 · 0c1d739 · 0c1d739
1 parent f22219c
commit 0c1d739
Showing 1 changed file with 0 additions and 17 deletions.
diff --git a/Source/Core/ElementStyle.cpp b/Source/Core/ElementStyle.cpp
@@ -364,23 +364,6 @@ float ElementStyle::ResolveProperty(const Property* property, float base_value)
 	{
 		return property->value.Get< float >();
 	}
-
-        // Values based on pixels-per-inch.
-	if (property->unit & Property::PPI_UNIT)
-	{
-		float inch = property->value.Get< float >() * element->GetRenderInterface()->GetPixelsPerInch();
-
-		if (property->unit & Property::INCH) // inch
-			return inch;
-		if (property->unit & Property::CM) // centimeter
-			return inch / 2.54f;
-		if (property->unit & Property::MM) // millimeter
-			return inch / 25.4f;
-		if (property->unit & Property::PT) // point
-			return inch / 72.0f;
-		if (property->unit & Property::PC) // pica
-			return inch / 6.0f;
-	}
 
 	// Values based on pixels-per-inch.
 	if (property->unit & Property::PPI_UNIT)