merge from trunk (r12272)

(bzr r11668.1.66)

1 files changed, 36 insertions, 0 deletions

diff --git a/src/style.h b/src/style.h
index cb5178b40..360d502be 100644
--- a/src/style.h
+++ b/src/style.h
@@ -383,6 +383,13 @@ struct SPStyle {
         filter when the style is used for querying */
     SPILength filter_gaussianBlur_deviation;
 
+    /** hints on how to render: e.g. speed vs. accuracy.
+     * As of April, 2013, only image_rendering used. */
+    SPIEnum color_rendering;
+    SPIEnum image_rendering;
+    SPIEnum shape_rendering;
+    SPIEnum text_rendering;
+
     /** enable-background, used for defining where filter effects get
      * their background image */
     SPIEnum enable_background;
@@ -584,6 +591,35 @@ enum SPColorInterpolation {
     SP_CSS_COLOR_INTERPOLATION_LINEARRGB
 };
 
+enum SPColorRendering {
+    SP_CSS_COLOR_RENDERING_AUTO,
+    SP_CSS_COLOR_RENDERING_OPTIMIZESPEED,
+    SP_CSS_COLOR_RENDERING_OPTIMIZEQUALITY
+};
+
+/* Last two are CSS4 Image values... for the momement prefaced with -inkscape. */
+enum SPImageRendering {
+    SP_CSS_IMAGE_RENDERING_AUTO,
+    SP_CSS_IMAGE_RENDERING_OPTIMIZESPEED,
+    SP_CSS_IMAGE_RENDERING_OPTIMIZEQUALITY,
+    SP_CSS_IMAGE_RENDERING_CRISPEDGES,
+    SP_CSS_IMAGE_RENDERING_PIXELATED
+};
+
+enum SPShapeRendering {
+    SP_CSS_SHAPE_RENDERING_AUTO,
+    SP_CSS_SHAPE_RENDERING_OPTIMIZESPEED,
+    SP_CSS_SHAPE_RENDERING_CRISPEDGES,
+    SP_CSS_SHAPE_RENDERING_GEOMETRICPRECISION
+};
+
+enum SPTextRendering {
+    SP_CSS_TEXT_RENDERING_AUTO,
+    SP_CSS_TEXT_RENDERING_OPTIMIZESPEED,
+    SP_CSS_TEXT_RENDERING_OPTIMIZELEGIBILITY,
+    SP_CSS_TEXT_RENDERING_GEOMETRICPRECISION
+};
+
 /// An SPTextStyle has a refcount, a font family, and a font name.
 struct SPTextStyle {
     int refcount;