diff --git a/content/svg/content/src/nsSVGLength.cpp b/content/svg/content/src/nsSVGLength.cpp index 56942eb2a2bf..c0a7328b9b5b 100644 --- a/content/svg/content/src/nsSVGLength.cpp +++ b/content/svg/content/src/nsSVGLength.cpp @@ -246,10 +246,12 @@ nsSVGLength::GetValue(float *aValue) *aValue = mValueInSpecifiedUnits * 25.4f / mmPerPixel(); break; case SVG_LENGTHTYPE_PT: - *aValue = mValueInSpecifiedUnits * 25.4f / 72.0f / mmPerPixel(); + *aValue = mValueInSpecifiedUnits * 25.4f / POINTS_PER_INCH_FLOAT / + mmPerPixel(); break; case SVG_LENGTHTYPE_PC: - *aValue = mValueInSpecifiedUnits * 25.4f * 12.0f / 72.0f / mmPerPixel(); + *aValue = mValueInSpecifiedUnits * 25.4f * 12.0f / POINTS_PER_INCH_FLOAT / + mmPerPixel(); break; case SVG_LENGTHTYPE_PERCENTAGE: *aValue = mValueInSpecifiedUnits * AxisLength() / 100.0f; @@ -290,10 +292,12 @@ nsSVGLength::SetValue(float aValue) mValueInSpecifiedUnits = aValue * mmPerPixel() / 25.4f; break; case SVG_LENGTHTYPE_PT: - mValueInSpecifiedUnits = aValue * mmPerPixel() * 72.0f / 25.4f; + mValueInSpecifiedUnits = aValue * mmPerPixel() * POINTS_PER_INCH_FLOAT / + 25.4f; break; case SVG_LENGTHTYPE_PC: - mValueInSpecifiedUnits = aValue * mmPerPixel() * 72.0f / 24.4f / 12.0f; + mValueInSpecifiedUnits = aValue * mmPerPixel() * POINTS_PER_INCH_FLOAT / + 24.4f / 12.0f; break; case SVG_LENGTHTYPE_PERCENTAGE: mValueInSpecifiedUnits = aValue * 100.0f / AxisLength(); diff --git a/content/svg/content/src/nsSVGLength2.cpp b/content/svg/content/src/nsSVGLength2.cpp index b0ef72788ba5..0b0d6ba1d7f6 100644 --- a/content/svg/content/src/nsSVGLength2.cpp +++ b/content/svg/content/src/nsSVGLength2.cpp @@ -225,9 +225,9 @@ nsSVGLength2::GetUnitScaleFactor(nsSVGSVGElement *aCtx) const case nsIDOMSVGLength::SVG_LENGTHTYPE_IN: return GetMMPerPixel(aCtx) / 25.4f; case nsIDOMSVGLength::SVG_LENGTHTYPE_PT: - return GetMMPerPixel(aCtx) * 72.0f / 25.4f; + return GetMMPerPixel(aCtx) * POINTS_PER_INCH_FLOAT / 25.4f; case nsIDOMSVGLength::SVG_LENGTHTYPE_PC: - return GetMMPerPixel(aCtx) * 72.0f / 24.4f / 12.0f; + return GetMMPerPixel(aCtx) * POINTS_PER_INCH_FLOAT / 24.4f / 12.0f; case nsIDOMSVGLength::SVG_LENGTHTYPE_PERCENTAGE: return 100.0f / GetAxisLength(aCtx); case nsIDOMSVGLength::SVG_LENGTHTYPE_EMS: diff --git a/gfx/public/nsCoord.h b/gfx/public/nsCoord.h index 3041a27db668..431341f4c840 100644 --- a/gfx/public/nsCoord.h +++ b/gfx/public/nsCoord.h @@ -367,6 +367,8 @@ inline PRInt32 NSAppUnitsToIntPixels(nscoord aAppUnits, PRInt32 aAppUnitsPerPixe /// handy constants #define TWIPS_PER_POINT_INT 20 #define TWIPS_PER_POINT_FLOAT 20.0f +#define POINTS_PER_INCH_INT 72 +#define POINTS_PER_INCH_FLOAT 72.0f /* * Twips/unit conversions @@ -385,28 +387,28 @@ inline float NSTwipsToUnits(nscoord aTwips, float aUnitsPerPoint) /// Unit conversion macros //@{ #define NS_POINTS_TO_TWIPS(x) NSUnitsToTwips((x), 1.0f) -#define NS_INCHES_TO_TWIPS(x) NSUnitsToTwips((x), 72.0f) // 72 points per inch -#define NS_FEET_TO_TWIPS(x) NSUnitsToTwips((x), (72.0f * 12.0f)) // 12 inches per foot -#define NS_MILES_TO_TWIPS(x) NSUnitsToTwips((x), (72.0f * 12.0f * 5280.0f)) // 5280 feet per mile +#define NS_INCHES_TO_TWIPS(x) NSUnitsToTwips((x), POINTS_PER_INCH_FLOAT) // 72 points per inch +#define NS_FEET_TO_TWIPS(x) NSUnitsToTwips((x), (POINTS_PER_INCH_FLOAT * 12.0f)) // 12 inches per foot +#define NS_MILES_TO_TWIPS(x) NSUnitsToTwips((x), (POINTS_PER_INCH_FLOAT * 12.0f * 5280.0f)) // 5280 feet per mile -#define NS_MILLIMETERS_TO_TWIPS(x) NSUnitsToTwips((x), (72.0f * 0.03937f)) -#define NS_CENTIMETERS_TO_TWIPS(x) NSUnitsToTwips((x), (72.0f * 0.3937f)) -#define NS_METERS_TO_TWIPS(x) NSUnitsToTwips((x), (72.0f * 39.37f)) -#define NS_KILOMETERS_TO_TWIPS(x) NSUnitsToTwips((x), (72.0f * 39370.0f)) +#define NS_MILLIMETERS_TO_TWIPS(x) NSUnitsToTwips((x), (POINTS_PER_INCH_FLOAT * 0.03937f)) +#define NS_CENTIMETERS_TO_TWIPS(x) NSUnitsToTwips((x), (POINTS_PER_INCH_FLOAT * 0.3937f)) +#define NS_METERS_TO_TWIPS(x) NSUnitsToTwips((x), (POINTS_PER_INCH_FLOAT * 39.37f)) +#define NS_KILOMETERS_TO_TWIPS(x) NSUnitsToTwips((x), (POINTS_PER_INCH_FLOAT * 39370.0f)) #define NS_PICAS_TO_TWIPS(x) NSUnitsToTwips((x), 12.0f) // 12 points per pica #define NS_DIDOTS_TO_TWIPS(x) NSUnitsToTwips((x), (16.0f / 15.0f)) // 15 didots per 16 points #define NS_CICEROS_TO_TWIPS(x) NSUnitsToTwips((x), (12.0f * (16.0f / 15.0f))) // 12 didots per cicero #define NS_TWIPS_TO_POINTS(x) NSTwipsToUnits((x), 1.0f) -#define NS_TWIPS_TO_INCHES(x) NSTwipsToUnits((x), 1.0f / 72.0f) -#define NS_TWIPS_TO_FEET(x) NSTwipsToUnits((x), 1.0f / (72.0f * 12.0f)) -#define NS_TWIPS_TO_MILES(x) NSTwipsToUnits((x), 1.0f / (72.0f * 12.0f * 5280.0f)) +#define NS_TWIPS_TO_INCHES(x) NSTwipsToUnits((x), 1.0f / POINTS_PER_INCH_FLOAT) +#define NS_TWIPS_TO_FEET(x) NSTwipsToUnits((x), 1.0f / (POINTS_PER_INCH_FLOAT * 12.0f)) +#define NS_TWIPS_TO_MILES(x) NSTwipsToUnits((x), 1.0f / (POINTS_PER_INCH_FLOAT * 12.0f * 5280.0f)) -#define NS_TWIPS_TO_MILLIMETERS(x) NSTwipsToUnits((x), 1.0f / (72.0f * 0.03937f)) -#define NS_TWIPS_TO_CENTIMETERS(x) NSTwipsToUnits((x), 1.0f / (72.0f * 0.3937f)) -#define NS_TWIPS_TO_METERS(x) NSTwipsToUnits((x), 1.0f / (72.0f * 39.37f)) -#define NS_TWIPS_TO_KILOMETERS(x) NSTwipsToUnits((x), 1.0f / (72.0f * 39370.0f)) +#define NS_TWIPS_TO_MILLIMETERS(x) NSTwipsToUnits((x), 1.0f / (POINTS_PER_INCH_FLOAT * 0.03937f)) +#define NS_TWIPS_TO_CENTIMETERS(x) NSTwipsToUnits((x), 1.0f / (POINTS_PER_INCH_FLOAT * 0.3937f)) +#define NS_TWIPS_TO_METERS(x) NSTwipsToUnits((x), 1.0f / (POINTS_PER_INCH_FLOAT * 39.37f)) +#define NS_TWIPS_TO_KILOMETERS(x) NSTwipsToUnits((x), 1.0f / (POINTS_PER_INCH_FLOAT * 39370.0f)) #define NS_TWIPS_TO_PICAS(x) NSTwipsToUnits((x), 1.0f / 12.0f) #define NS_TWIPS_TO_DIDOTS(x) NSTwipsToUnits((x), 1.0f / (16.0f / 15.0f)) diff --git a/gfx/src/thebes/nsSystemFontsGTK2.cpp b/gfx/src/thebes/nsSystemFontsGTK2.cpp index db8a73ab3716..3474275747e7 100644 --- a/gfx/src/thebes/nsSystemFontsGTK2.cpp +++ b/gfx/src/thebes/nsSystemFontsGTK2.cpp @@ -216,7 +216,7 @@ nsSystemFontsGTK2::GetSystemFontInfo(GtkWidget *aWidget, nsString *aFontName, if (!MOZ_pango_font_description_get_size_is_absolute(desc)) { // |size| is in pango-points, so convert to pixels. - size *= float(gfxPlatformGtk::DPI()) / 72.0f; + size *= float(gfxPlatformGtk::DPI()) / POINTS_PER_INCH_FLOAT; } // |size| is now pixels diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h index dd2a6c98ed7c..6c47d230e6c4 100644 --- a/layout/base/nsPresContext.h +++ b/layout/base/nsPresContext.h @@ -532,9 +532,10 @@ public: nscoord PointsToAppUnits(float aPoints) const { return NSToCoordRound(aPoints * mDeviceContext->AppUnitsPerInch() / - 72.0f); } + POINTS_PER_INCH_FLOAT); } float AppUnitsToPoints(nscoord aAppUnits) const - { return (float)aAppUnits / mDeviceContext->AppUnitsPerInch() * 72.0f; } + { return (float)aAppUnits / mDeviceContext->AppUnitsPerInch() * + POINTS_PER_INCH_FLOAT); } nscoord RoundAppUnitsToNearestDevPixels(nscoord aAppUnits) const { return DevPixelsToAppUnits(AppUnitsToDevPixels(aAppUnits)); } diff --git a/layout/style/nsROCSSPrimitiveValue.cpp b/layout/style/nsROCSSPrimitiveValue.cpp index d30e6a183ca5..e5c333165bf8 100644 --- a/layout/style/nsROCSSPrimitiveValue.cpp +++ b/layout/style/nsROCSSPrimitiveValue.cpp @@ -361,7 +361,8 @@ nsROCSSPrimitiveValue::GetFloatValue(PRUint16 aUnitType, float* aReturn) case CSS_PT : if (mType != CSS_PX) return NS_ERROR_DOM_INVALID_ACCESS_ERR; - *aReturn = mValue.mAppUnits * 72.0f / float(mAppUnitsPerInch); + *aReturn = mValue.mAppUnits * POINTS_PER_INCH_FLOAT / + float(mAppUnitsPerInch); break; case CSS_PC : if (mType != CSS_PX)