Merge pull request #114 from opengenius/master

Restores PPI units, needs to be combined with PR #129.  Also needs fixes to work correctly as the current PPI is hard coded to 100 ppi which applies to pretty much nothing.  See issue #138.  Will be augmented int he future with density independent pixel units (DP) as defined in issue #139

Source/Core/Decorator.cpp

@@ -119,6 +119,23 @@ float Decorator::ResolveProperty(const PropertyDictionary& properties, const Str
 
 	if (property->unit & Property::NUMBER || property->unit & Property::PX)
 		return property->value.Get< float >();
+    
+    // Values based on pixels-per-inch.
+	if (property->unit & Property::PPI_UNIT)
+	{
+		float inch = property->value.Get< float >() * 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;
+	}
 
 	ROCKET_ERROR;
 	return 0;

Source/Core/ElementStyle.cpp

@@ -364,6 +364,23 @@ 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;
+	}
 
 	// We're not a numeric property; return 0.
 	return 0.0f;
@@ -435,6 +452,23 @@ float ElementStyle::ResolveProperty(const String& name, 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;
+	}
 
 	// We're not a numeric property; return 0.
 	return 0.0f;