Browse Source

Fixed duplicate code due to merging two related pull requests.

David Wimsey 11 years ago
parent
commit
0c1d739cd2
1 changed files with 0 additions and 17 deletions
  1. 0 17
      Source/Core/ElementStyle.cpp

+ 0 - 17
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)