Release v1.0.0

sammycage · Aug 14, 2020 · e4f1917 · e4f1917
1 parent e902221
commit e4f1917
Show file tree

Hide file tree

Showing 239 changed files with 273 additions and 321 deletions.
diff --git a/3rdparty/agg/CMakeLists.txt b/3rdparty/agg/CMakeLists.txt
@@ -0,0 +1,15 @@
+target_sources(lunasvg 
+PRIVATE
+    "${CMAKE_CURRENT_LIST_DIR}/src/agg_vcgen_stroke.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/src/agg_vcgen_dash.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/src/agg_vcgen_contour.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/src/agg_trans_affine.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/src/agg_curves.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/src/agg_sqrt_tables.cpp"
+)
+
+target_include_directories(lunasvg
+PRIVATE
+    "${CMAKE_CURRENT_LIST_DIR}/include"
+)
+
diff --git a/.../graphics/agg/include/agg_alpha_mask_u8.h → 3rdparty/agg/include/agg_alpha_mask_u8.h b/.../graphics/agg/include/agg_alpha_mask_u8.h → 3rdparty/agg/include/agg_alpha_mask_u8.h
diff --git a/source/graphics/agg/include/agg_arc.h → 3rdparty/agg/include/agg_arc.h b/source/graphics/agg/include/agg_arc.h → 3rdparty/agg/include/agg_arc.h
diff --git a/source/graphics/agg/include/agg_array.h → 3rdparty/agg/include/agg_array.h b/source/graphics/agg/include/agg_array.h → 3rdparty/agg/include/agg_array.h
diff --git a/source/graphics/agg/include/agg_arrowhead.h → 3rdparty/agg/include/agg_arrowhead.h b/source/graphics/agg/include/agg_arrowhead.h → 3rdparty/agg/include/agg_arrowhead.h
diff --git a/source/graphics/agg/include/agg_basics.h → 3rdparty/agg/include/agg_basics.h b/source/graphics/agg/include/agg_basics.h → 3rdparty/agg/include/agg_basics.h
diff --git a/source/graphics/agg/include/agg_bezier_arc.h → 3rdparty/agg/include/agg_bezier_arc.h b/source/graphics/agg/include/agg_bezier_arc.h → 3rdparty/agg/include/agg_bezier_arc.h
diff --git a/...raphics/agg/include/agg_bitset_iterator.h → 3rdparty/agg/include/agg_bitset_iterator.h b/...raphics/agg/include/agg_bitset_iterator.h → 3rdparty/agg/include/agg_bitset_iterator.h
diff --git a/source/graphics/agg/include/agg_blur.h → 3rdparty/agg/include/agg_blur.h b/source/graphics/agg/include/agg_blur.h → 3rdparty/agg/include/agg_blur.h
diff --git a/.../graphics/agg/include/agg_bounding_rect.h → 3rdparty/agg/include/agg_bounding_rect.h b/.../graphics/agg/include/agg_bounding_rect.h → 3rdparty/agg/include/agg_bounding_rect.h
diff --git a/source/graphics/agg/include/agg_bspline.h → 3rdparty/agg/include/agg_bspline.h b/source/graphics/agg/include/agg_bspline.h → 3rdparty/agg/include/agg_bspline.h
diff --git a/...phics/agg/include/agg_clip_liang_barsky.h → 3rdparty/agg/include/agg_clip_liang_barsky.h b/...phics/agg/include/agg_clip_liang_barsky.h → 3rdparty/agg/include/agg_clip_liang_barsky.h
diff --git a/source/graphics/agg/include/agg_color_gray.h → 3rdparty/agg/include/agg_color_gray.h b/source/graphics/agg/include/agg_color_gray.h → 3rdparty/agg/include/agg_color_gray.h
diff --git a/source/graphics/agg/include/agg_color_rgba.h → 3rdparty/agg/include/agg_color_rgba.h b/source/graphics/agg/include/agg_color_rgba.h → 3rdparty/agg/include/agg_color_rgba.h
diff --git a/source/graphics/agg/include/agg_config.h → 3rdparty/agg/include/agg_config.h b/source/graphics/agg/include/agg_config.h → 3rdparty/agg/include/agg_config.h
diff --git a/...hics/agg/include/agg_conv_adaptor_vcgen.h → ...arty/agg/include/agg_conv_adaptor_vcgen.h b/...hics/agg/include/agg_conv_adaptor_vcgen.h → ...arty/agg/include/agg_conv_adaptor_vcgen.h
diff --git a/...hics/agg/include/agg_conv_adaptor_vpgen.h → ...arty/agg/include/agg_conv_adaptor_vpgen.h b/...hics/agg/include/agg_conv_adaptor_vpgen.h → ...arty/agg/include/agg_conv_adaptor_vpgen.h
diff --git a/...e/graphics/agg/include/agg_conv_bspline.h → 3rdparty/agg/include/agg_conv_bspline.h b/...e/graphics/agg/include/agg_conv_bspline.h → 3rdparty/agg/include/agg_conv_bspline.h
diff --git a/...phics/agg/include/agg_conv_clip_polygon.h → 3rdparty/agg/include/agg_conv_clip_polygon.h b/...phics/agg/include/agg_conv_clip_polygon.h → 3rdparty/agg/include/agg_conv_clip_polygon.h
diff --git a/...hics/agg/include/agg_conv_clip_polyline.h → ...arty/agg/include/agg_conv_clip_polyline.h b/...hics/agg/include/agg_conv_clip_polyline.h → ...arty/agg/include/agg_conv_clip_polyline.h
diff --git a/...hics/agg/include/agg_conv_close_polygon.h → ...arty/agg/include/agg_conv_close_polygon.h b/...hics/agg/include/agg_conv_close_polygon.h → ...arty/agg/include/agg_conv_close_polygon.h
diff --git a/...ce/graphics/agg/include/agg_conv_concat.h → 3rdparty/agg/include/agg_conv_concat.h b/...ce/graphics/agg/include/agg_conv_concat.h → 3rdparty/agg/include/agg_conv_concat.h
diff --git a/...e/graphics/agg/include/agg_conv_contour.h → 3rdparty/agg/include/agg_conv_contour.h b/...e/graphics/agg/include/agg_conv_contour.h → 3rdparty/agg/include/agg_conv_contour.h
diff --git a/source/graphics/agg/include/agg_conv_curve.h → 3rdparty/agg/include/agg_conv_curve.h b/source/graphics/agg/include/agg_conv_curve.h → 3rdparty/agg/include/agg_conv_curve.h
diff --git a/source/graphics/agg/include/agg_conv_dash.h → 3rdparty/agg/include/agg_conv_dash.h b/source/graphics/agg/include/agg_conv_dash.h → 3rdparty/agg/include/agg_conv_dash.h
diff --git a/source/graphics/agg/include/agg_conv_gpc.h → 3rdparty/agg/include/agg_conv_gpc.h b/source/graphics/agg/include/agg_conv_gpc.h → 3rdparty/agg/include/agg_conv_gpc.h
diff --git a/...ce/graphics/agg/include/agg_conv_marker.h → 3rdparty/agg/include/agg_conv_marker.h b/...ce/graphics/agg/include/agg_conv_marker.h → 3rdparty/agg/include/agg_conv_marker.h
diff --git a/...ics/agg/include/agg_conv_marker_adaptor.h → ...rty/agg/include/agg_conv_marker_adaptor.h b/...ics/agg/include/agg_conv_marker_adaptor.h → ...rty/agg/include/agg_conv_marker_adaptor.h
diff --git a/...aphics/agg/include/agg_conv_segmentator.h → 3rdparty/agg/include/agg_conv_segmentator.h b/...aphics/agg/include/agg_conv_segmentator.h → 3rdparty/agg/include/agg_conv_segmentator.h
diff --git a/...phics/agg/include/agg_conv_shorten_path.h → 3rdparty/agg/include/agg_conv_shorten_path.h b/...phics/agg/include/agg_conv_shorten_path.h → 3rdparty/agg/include/agg_conv_shorten_path.h
diff --git a/...phics/agg/include/agg_conv_smooth_poly1.h → 3rdparty/agg/include/agg_conv_smooth_poly1.h b/...phics/agg/include/agg_conv_smooth_poly1.h → 3rdparty/agg/include/agg_conv_smooth_poly1.h
diff --git a/...ce/graphics/agg/include/agg_conv_stroke.h → 3rdparty/agg/include/agg_conv_stroke.h b/...ce/graphics/agg/include/agg_conv_stroke.h → 3rdparty/agg/include/agg_conv_stroke.h
diff --git a/...graphics/agg/include/agg_conv_transform.h → 3rdparty/agg/include/agg_conv_transform.h b/...graphics/agg/include/agg_conv_transform.h → 3rdparty/agg/include/agg_conv_transform.h
diff --git a/...cs/agg/include/agg_conv_unclose_polygon.h → ...ty/agg/include/agg_conv_unclose_polygon.h b/...cs/agg/include/agg_conv_unclose_polygon.h → ...ty/agg/include/agg_conv_unclose_polygon.h
diff --git a/source/graphics/agg/include/agg_curves.h → 3rdparty/agg/include/agg_curves.h b/source/graphics/agg/include/agg_curves.h → 3rdparty/agg/include/agg_curves.h
diff --git a/source/graphics/agg/include/agg_dda_line.h → 3rdparty/agg/include/agg_dda_line.h b/source/graphics/agg/include/agg_dda_line.h → 3rdparty/agg/include/agg_dda_line.h
diff --git a/source/graphics/agg/include/agg_ellipse.h → 3rdparty/agg/include/agg_ellipse.h b/source/graphics/agg/include/agg_ellipse.h → 3rdparty/agg/include/agg_ellipse.h
diff --git a/...phics/agg/include/agg_ellipse_bresenham.h → 3rdparty/agg/include/agg_ellipse_bresenham.h b/...phics/agg/include/agg_ellipse_bresenham.h → 3rdparty/agg/include/agg_ellipse_bresenham.h
diff --git a/...s/agg/include/agg_embedded_raster_fonts.h → ...y/agg/include/agg_embedded_raster_fonts.h b/...s/agg/include/agg_embedded_raster_fonts.h → ...y/agg/include/agg_embedded_raster_fonts.h
diff --git a/...hics/agg/include/agg_font_cache_manager.h → ...arty/agg/include/agg_font_cache_manager.h b/...hics/agg/include/agg_font_cache_manager.h → ...arty/agg/include/agg_font_cache_manager.h
diff --git a/...ics/agg/include/agg_font_cache_manager2.h → ...rty/agg/include/agg_font_cache_manager2.h b/...ics/agg/include/agg_font_cache_manager2.h → ...rty/agg/include/agg_font_cache_manager2.h
diff --git a/...raphics/agg/include/agg_gamma_functions.h → 3rdparty/agg/include/agg_gamma_functions.h b/...raphics/agg/include/agg_gamma_functions.h → 3rdparty/agg/include/agg_gamma_functions.h
diff --git a/source/graphics/agg/include/agg_gamma_lut.h → 3rdparty/agg/include/agg_gamma_lut.h b/source/graphics/agg/include/agg_gamma_lut.h → 3rdparty/agg/include/agg_gamma_lut.h
diff --git a/...aphics/agg/include/agg_glyph_raster_bin.h → 3rdparty/agg/include/agg_glyph_raster_bin.h b/...aphics/agg/include/agg_glyph_raster_bin.h → 3rdparty/agg/include/agg_glyph_raster_bin.h
diff --git a/...e/graphics/agg/include/agg_gradient_lut.h → 3rdparty/agg/include/agg_gradient_lut.h b/...e/graphics/agg/include/agg_gradient_lut.h → 3rdparty/agg/include/agg_gradient_lut.h
diff --git a/source/graphics/agg/include/agg_gsv_text.h → 3rdparty/agg/include/agg_gsv_text.h b/source/graphics/agg/include/agg_gsv_text.h → 3rdparty/agg/include/agg_gsv_text.h
diff --git a/...raphics/agg/include/agg_image_accessors.h → 3rdparty/agg/include/agg_image_accessors.h b/...raphics/agg/include/agg_image_accessors.h → 3rdparty/agg/include/agg_image_accessors.h
diff --git a/.../graphics/agg/include/agg_image_filters.h → 3rdparty/agg/include/agg_image_filters.h b/.../graphics/agg/include/agg_image_filters.h → 3rdparty/agg/include/agg_image_filters.h
diff --git a/...graphics/agg/include/agg_line_aa_basics.h → 3rdparty/agg/include/agg_line_aa_basics.h b/...graphics/agg/include/agg_line_aa_basics.h → 3rdparty/agg/include/agg_line_aa_basics.h
diff --git a/source/graphics/agg/include/agg_math.h → 3rdparty/agg/include/agg_math.h b/source/graphics/agg/include/agg_math.h → 3rdparty/agg/include/agg_math.h
diff --git a/...ce/graphics/agg/include/agg_math_stroke.h → 3rdparty/agg/include/agg_math_stroke.h b/...ce/graphics/agg/include/agg_math_stroke.h → 3rdparty/agg/include/agg_math_stroke.h
diff --git a/...ce/graphics/agg/include/agg_path_length.h → 3rdparty/agg/include/agg_path_length.h b/...ce/graphics/agg/include/agg_path_length.h → 3rdparty/agg/include/agg_path_length.h
diff --git a/...e/graphics/agg/include/agg_path_storage.h → 3rdparty/agg/include/agg_path_storage.h b/...e/graphics/agg/include/agg_path_storage.h → 3rdparty/agg/include/agg_path_storage.h
diff --git a/...cs/agg/include/agg_path_storage_integer.h → ...ty/agg/include/agg_path_storage_integer.h b/...cs/agg/include/agg_path_storage_integer.h → ...ty/agg/include/agg_path_storage_integer.h
diff --git a/...cs/agg/include/agg_pattern_filters_rgba.h → ...ty/agg/include/agg_pattern_filters_rgba.h b/...cs/agg/include/agg_pattern_filters_rgba.h → ...ty/agg/include/agg_pattern_filters_rgba.h
diff --git a/...cs/agg/include/agg_pixfmt_amask_adaptor.h → ...ty/agg/include/agg_pixfmt_amask_adaptor.h b/...cs/agg/include/agg_pixfmt_amask_adaptor.h → ...ty/agg/include/agg_pixfmt_amask_adaptor.h
diff --git a/...ce/graphics/agg/include/agg_pixfmt_base.h → 3rdparty/agg/include/agg_pixfmt_base.h b/...ce/graphics/agg/include/agg_pixfmt_base.h → 3rdparty/agg/include/agg_pixfmt_base.h
diff --git a/...ce/graphics/agg/include/agg_pixfmt_gray.h → 3rdparty/agg/include/agg_pixfmt_gray.h b/...ce/graphics/agg/include/agg_pixfmt_gray.h → 3rdparty/agg/include/agg_pixfmt_gray.h
diff --git a/source/graphics/agg/include/agg_pixfmt_rgb.h → 3rdparty/agg/include/agg_pixfmt_rgb.h b/source/graphics/agg/include/agg_pixfmt_rgb.h → 3rdparty/agg/include/agg_pixfmt_rgb.h
diff --git a/...phics/agg/include/agg_pixfmt_rgb_packed.h → 3rdparty/agg/include/agg_pixfmt_rgb_packed.h b/...phics/agg/include/agg_pixfmt_rgb_packed.h → 3rdparty/agg/include/agg_pixfmt_rgb_packed.h
diff --git a/...ce/graphics/agg/include/agg_pixfmt_rgba.h → 3rdparty/agg/include/agg_pixfmt_rgba.h b/...ce/graphics/agg/include/agg_pixfmt_rgba.h → 3rdparty/agg/include/agg_pixfmt_rgba.h
diff --git a/...phics/agg/include/agg_pixfmt_transposer.h → 3rdparty/agg/include/agg_pixfmt_transposer.h b/...phics/agg/include/agg_pixfmt_transposer.h → 3rdparty/agg/include/agg_pixfmt_transposer.h
diff --git a/...ics/agg/include/agg_rasterizer_cells_aa.h → ...rty/agg/include/agg_rasterizer_cells_aa.h b/...ics/agg/include/agg_rasterizer_cells_aa.h → ...rty/agg/include/agg_rasterizer_cells_aa.h
diff --git a/.../agg/include/agg_rasterizer_compound_aa.h → .../agg/include/agg_rasterizer_compound_aa.h b/.../agg/include/agg_rasterizer_compound_aa.h → .../agg/include/agg_rasterizer_compound_aa.h
diff --git a/...hics/agg/include/agg_rasterizer_outline.h → ...arty/agg/include/agg_rasterizer_outline.h b/...hics/agg/include/agg_rasterizer_outline.h → ...arty/agg/include/agg_rasterizer_outline.h
diff --git a/...s/agg/include/agg_rasterizer_outline_aa.h → ...y/agg/include/agg_rasterizer_outline_aa.h b/...s/agg/include/agg_rasterizer_outline_aa.h → ...y/agg/include/agg_rasterizer_outline_aa.h
diff --git a/.../agg/include/agg_rasterizer_scanline_aa.h → .../agg/include/agg_rasterizer_scanline_aa.h b/.../agg/include/agg_rasterizer_scanline_aa.h → .../agg/include/agg_rasterizer_scanline_aa.h
diff --git a/...lude/agg_rasterizer_scanline_aa_nogamma.h → ...lude/agg_rasterizer_scanline_aa_nogamma.h b/...lude/agg_rasterizer_scanline_aa_nogamma.h → ...lude/agg_rasterizer_scanline_aa_nogamma.h
diff --git a/...hics/agg/include/agg_rasterizer_sl_clip.h → ...arty/agg/include/agg_rasterizer_sl_clip.h b/...hics/agg/include/agg_rasterizer_sl_clip.h → ...arty/agg/include/agg_rasterizer_sl_clip.h
diff --git a/.../graphics/agg/include/agg_renderer_base.h → 3rdparty/agg/include/agg_renderer_base.h b/.../graphics/agg/include/agg_renderer_base.h → 3rdparty/agg/include/agg_renderer_base.h
diff --git a/...aphics/agg/include/agg_renderer_markers.h → 3rdparty/agg/include/agg_renderer_markers.h b/...aphics/agg/include/agg_renderer_markers.h → 3rdparty/agg/include/agg_renderer_markers.h
diff --git a/...graphics/agg/include/agg_renderer_mclip.h → 3rdparty/agg/include/agg_renderer_mclip.h b/...graphics/agg/include/agg_renderer_mclip.h → 3rdparty/agg/include/agg_renderer_mclip.h
diff --git a/...ics/agg/include/agg_renderer_outline_aa.h → ...rty/agg/include/agg_renderer_outline_aa.h b/...ics/agg/include/agg_renderer_outline_aa.h → ...rty/agg/include/agg_renderer_outline_aa.h
diff --git a/.../agg/include/agg_renderer_outline_image.h → .../agg/include/agg_renderer_outline_image.h b/.../agg/include/agg_renderer_outline_image.h → .../agg/include/agg_renderer_outline_image.h
diff --git a/...ics/agg/include/agg_renderer_primitives.h → ...rty/agg/include/agg_renderer_primitives.h b/...ics/agg/include/agg_renderer_primitives.h → ...rty/agg/include/agg_renderer_primitives.h
diff --git a/...cs/agg/include/agg_renderer_raster_text.h → ...ty/agg/include/agg_renderer_raster_text.h b/...cs/agg/include/agg_renderer_raster_text.h → ...ty/agg/include/agg_renderer_raster_text.h
diff --git a/...phics/agg/include/agg_renderer_scanline.h → 3rdparty/agg/include/agg_renderer_scanline.h b/...phics/agg/include/agg_renderer_scanline.h → 3rdparty/agg/include/agg_renderer_scanline.h
diff --git a/...aphics/agg/include/agg_rendering_buffer.h → 3rdparty/agg/include/agg_rendering_buffer.h b/...aphics/agg/include/agg_rendering_buffer.h → 3rdparty/agg/include/agg_rendering_buffer.h
diff --git a/...gg/include/agg_rendering_buffer_dynarow.h → ...gg/include/agg_rendering_buffer_dynarow.h b/...gg/include/agg_rendering_buffer_dynarow.h → ...gg/include/agg_rendering_buffer_dynarow.h
diff --git a/...e/graphics/agg/include/agg_rounded_rect.h → 3rdparty/agg/include/agg_rounded_rect.h b/...e/graphics/agg/include/agg_rounded_rect.h → 3rdparty/agg/include/agg_rounded_rect.h
diff --git a/...e/graphics/agg/include/agg_scanline_bin.h → 3rdparty/agg/include/agg_scanline_bin.h b/...e/graphics/agg/include/agg_scanline_bin.h → 3rdparty/agg/include/agg_scanline_bin.h
diff --git a/...gg/include/agg_scanline_boolean_algebra.h → ...gg/include/agg_scanline_boolean_algebra.h b/...gg/include/agg_scanline_boolean_algebra.h → ...gg/include/agg_scanline_boolean_algebra.h
diff --git a/source/graphics/agg/include/agg_scanline_p.h → 3rdparty/agg/include/agg_scanline_p.h b/source/graphics/agg/include/agg_scanline_p.h → 3rdparty/agg/include/agg_scanline_p.h
diff --git a/...ics/agg/include/agg_scanline_storage_aa.h → ...rty/agg/include/agg_scanline_storage_aa.h b/...ics/agg/include/agg_scanline_storage_aa.h → ...rty/agg/include/agg_scanline_storage_aa.h
diff --git a/...cs/agg/include/agg_scanline_storage_bin.h → ...ty/agg/include/agg_scanline_storage_bin.h b/...cs/agg/include/agg_scanline_storage_bin.h → ...ty/agg/include/agg_scanline_storage_bin.h
diff --git a/source/graphics/agg/include/agg_scanline_u.h → 3rdparty/agg/include/agg_scanline_u.h b/source/graphics/agg/include/agg_scanline_u.h → 3rdparty/agg/include/agg_scanline_u.h
diff --git a/...e/graphics/agg/include/agg_shorten_path.h → 3rdparty/agg/include/agg_shorten_path.h b/...e/graphics/agg/include/agg_shorten_path.h → 3rdparty/agg/include/agg_shorten_path.h
diff --git a/source/graphics/agg/include/agg_simul_eq.h → 3rdparty/agg/include/agg_simul_eq.h b/source/graphics/agg/include/agg_simul_eq.h → 3rdparty/agg/include/agg_simul_eq.h
diff --git a/...graphics/agg/include/agg_span_allocator.h → 3rdparty/agg/include/agg_span_allocator.h b/...graphics/agg/include/agg_span_allocator.h → 3rdparty/agg/include/agg_span_allocator.h
diff --git a/...graphics/agg/include/agg_span_converter.h → 3rdparty/agg/include/agg_span_converter.h b/...graphics/agg/include/agg_span_converter.h → 3rdparty/agg/include/agg_span_converter.h
diff --git a/...e/graphics/agg/include/agg_span_gouraud.h → 3rdparty/agg/include/agg_span_gouraud.h b/...e/graphics/agg/include/agg_span_gouraud.h → 3rdparty/agg/include/agg_span_gouraud.h
diff --git a/...phics/agg/include/agg_span_gouraud_gray.h → 3rdparty/agg/include/agg_span_gouraud_gray.h b/...phics/agg/include/agg_span_gouraud_gray.h → 3rdparty/agg/include/agg_span_gouraud_gray.h
diff --git a/...phics/agg/include/agg_span_gouraud_rgba.h → 3rdparty/agg/include/agg_span_gouraud_rgba.h b/...phics/agg/include/agg_span_gouraud_rgba.h → 3rdparty/agg/include/agg_span_gouraud_rgba.h
diff --git a/.../graphics/agg/include/agg_span_gradient.h → 3rdparty/agg/include/agg_span_gradient.h b/.../graphics/agg/include/agg_span_gradient.h → 3rdparty/agg/include/agg_span_gradient.h
diff --git a/...ics/agg/include/agg_span_gradient_alpha.h → ...rty/agg/include/agg_span_gradient_alpha.h b/...ics/agg/include/agg_span_gradient_alpha.h → ...rty/agg/include/agg_span_gradient_alpha.h
diff --git a/...s/agg/include/agg_span_gradient_contour.h → ...y/agg/include/agg_span_gradient_contour.h b/...s/agg/include/agg_span_gradient_contour.h → ...y/agg/include/agg_span_gradient_contour.h
diff --git a/...ics/agg/include/agg_span_gradient_image.h → ...rty/agg/include/agg_span_gradient_image.h b/...ics/agg/include/agg_span_gradient_image.h → ...rty/agg/include/agg_span_gradient_image.h
diff --git a/...phics/agg/include/agg_span_image_filter.h → 3rdparty/agg/include/agg_span_image_filter.h b/...phics/agg/include/agg_span_image_filter.h → 3rdparty/agg/include/agg_span_image_filter.h
diff --git a/.../agg/include/agg_span_image_filter_gray.h → .../agg/include/agg_span_image_filter_gray.h b/.../agg/include/agg_span_image_filter_gray.h → .../agg/include/agg_span_image_filter_gray.h
diff --git a/...s/agg/include/agg_span_image_filter_rgb.h → ...y/agg/include/agg_span_image_filter_rgb.h b/...s/agg/include/agg_span_image_filter_rgb.h → ...y/agg/include/agg_span_image_filter_rgb.h
diff --git a/.../agg/include/agg_span_image_filter_rgba.h → .../agg/include/agg_span_image_filter_rgba.h b/.../agg/include/agg_span_image_filter_rgba.h → .../agg/include/agg_span_image_filter_rgba.h
diff --git a/...g/include/agg_span_interpolator_adaptor.h → ...g/include/agg_span_interpolator_adaptor.h b/...g/include/agg_span_interpolator_adaptor.h → ...g/include/agg_span_interpolator_adaptor.h
diff --git a/...gg/include/agg_span_interpolator_linear.h → ...gg/include/agg_span_interpolator_linear.h b/...gg/include/agg_span_interpolator_linear.h → ...gg/include/agg_span_interpolator_linear.h
diff --git a/...agg/include/agg_span_interpolator_persp.h → ...agg/include/agg_span_interpolator_persp.h b/...agg/include/agg_span_interpolator_persp.h → ...agg/include/agg_span_interpolator_persp.h
diff --git a/...agg/include/agg_span_interpolator_trans.h → ...agg/include/agg_span_interpolator_trans.h b/...agg/include/agg_span_interpolator_trans.h → ...agg/include/agg_span_interpolator_trans.h
diff --git a/...phics/agg/include/agg_span_pattern_gray.h → 3rdparty/agg/include/agg_span_pattern_gray.h b/...phics/agg/include/agg_span_pattern_gray.h → 3rdparty/agg/include/agg_span_pattern_gray.h
diff --git a/...aphics/agg/include/agg_span_pattern_rgb.h → 3rdparty/agg/include/agg_span_pattern_rgb.h b/...aphics/agg/include/agg_span_pattern_rgb.h → 3rdparty/agg/include/agg_span_pattern_rgb.h
diff --git a/...phics/agg/include/agg_span_pattern_rgba.h → 3rdparty/agg/include/agg_span_pattern_rgba.h b/...phics/agg/include/agg_span_pattern_rgba.h → 3rdparty/agg/include/agg_span_pattern_rgba.h
diff --git a/source/graphics/agg/include/agg_span_solid.h → 3rdparty/agg/include/agg_span_solid.h b/source/graphics/agg/include/agg_span_solid.h → 3rdparty/agg/include/agg_span_solid.h
diff --git a/...ics/agg/include/agg_span_subdiv_adaptor.h → ...rty/agg/include/agg_span_subdiv_adaptor.h b/...ics/agg/include/agg_span_subdiv_adaptor.h → ...rty/agg/include/agg_span_subdiv_adaptor.h
diff --git a/...e/graphics/agg/include/agg_trans_affine.h → 3rdparty/agg/include/agg_trans_affine.h b/...e/graphics/agg/include/agg_trans_affine.h → 3rdparty/agg/include/agg_trans_affine.h
diff --git a/...graphics/agg/include/agg_trans_bilinear.h → 3rdparty/agg/include/agg_trans_bilinear.h b/...graphics/agg/include/agg_trans_bilinear.h → 3rdparty/agg/include/agg_trans_bilinear.h
diff --git a/...phics/agg/include/agg_trans_double_path.h → 3rdparty/agg/include/agg_trans_double_path.h b/...phics/agg/include/agg_trans_double_path.h → 3rdparty/agg/include/agg_trans_double_path.h
diff --git a/...phics/agg/include/agg_trans_perspective.h → 3rdparty/agg/include/agg_trans_perspective.h b/...phics/agg/include/agg_trans_perspective.h → 3rdparty/agg/include/agg_trans_perspective.h
diff --git a/...phics/agg/include/agg_trans_single_path.h → 3rdparty/agg/include/agg_trans_single_path.h b/...phics/agg/include/agg_trans_single_path.h → 3rdparty/agg/include/agg_trans_single_path.h
diff --git a/...graphics/agg/include/agg_trans_viewport.h → 3rdparty/agg/include/agg_trans_viewport.h b/...graphics/agg/include/agg_trans_viewport.h → 3rdparty/agg/include/agg_trans_viewport.h
diff --git a/...cs/agg/include/agg_trans_warp_magnifier.h → ...ty/agg/include/agg_trans_warp_magnifier.h b/...cs/agg/include/agg_trans_warp_magnifier.h → ...ty/agg/include/agg_trans_warp_magnifier.h
diff --git a/.../graphics/agg/include/agg_vcgen_bspline.h → 3rdparty/agg/include/agg_vcgen_bspline.h b/.../graphics/agg/include/agg_vcgen_bspline.h → 3rdparty/agg/include/agg_vcgen_bspline.h
diff --git a/.../graphics/agg/include/agg_vcgen_contour.h → 3rdparty/agg/include/agg_vcgen_contour.h b/.../graphics/agg/include/agg_vcgen_contour.h → 3rdparty/agg/include/agg_vcgen_contour.h
diff --git a/source/graphics/agg/include/agg_vcgen_dash.h → 3rdparty/agg/include/agg_vcgen_dash.h b/source/graphics/agg/include/agg_vcgen_dash.h → 3rdparty/agg/include/agg_vcgen_dash.h
diff --git a/...hics/agg/include/agg_vcgen_markers_term.h → ...arty/agg/include/agg_vcgen_markers_term.h b/...hics/agg/include/agg_vcgen_markers_term.h → ...arty/agg/include/agg_vcgen_markers_term.h
diff --git a/...hics/agg/include/agg_vcgen_smooth_poly1.h → ...arty/agg/include/agg_vcgen_smooth_poly1.h b/...hics/agg/include/agg_vcgen_smooth_poly1.h → ...arty/agg/include/agg_vcgen_smooth_poly1.h
diff --git a/...e/graphics/agg/include/agg_vcgen_stroke.h → 3rdparty/agg/include/agg_vcgen_stroke.h b/...e/graphics/agg/include/agg_vcgen_stroke.h → 3rdparty/agg/include/agg_vcgen_stroke.h
diff --git a/...s/agg/include/agg_vcgen_vertex_sequence.h → ...y/agg/include/agg_vcgen_vertex_sequence.h b/...s/agg/include/agg_vcgen_vertex_sequence.h → ...y/agg/include/agg_vcgen_vertex_sequence.h
diff --git a/...raphics/agg/include/agg_vertex_sequence.h → 3rdparty/agg/include/agg_vertex_sequence.h b/...raphics/agg/include/agg_vertex_sequence.h → 3rdparty/agg/include/agg_vertex_sequence.h
diff --git a/...hics/agg/include/agg_vpgen_clip_polygon.h → ...arty/agg/include/agg_vpgen_clip_polygon.h b/...hics/agg/include/agg_vpgen_clip_polygon.h → ...arty/agg/include/agg_vpgen_clip_polygon.h
diff --git a/...ics/agg/include/agg_vpgen_clip_polyline.h → ...rty/agg/include/agg_vpgen_clip_polyline.h b/...ics/agg/include/agg_vpgen_clip_polyline.h → ...rty/agg/include/agg_vpgen_clip_polyline.h
diff --git a/...phics/agg/include/agg_vpgen_segmentator.h → 3rdparty/agg/include/agg_vpgen_segmentator.h b/...phics/agg/include/agg_vpgen_segmentator.h → 3rdparty/agg/include/agg_vpgen_segmentator.h
diff --git a/...raphics/agg/include/util/agg_color_conv.h → 3rdparty/agg/include/util/agg_color_conv.h b/...raphics/agg/include/util/agg_color_conv.h → 3rdparty/agg/include/util/agg_color_conv.h
diff --git a/...s/agg/include/util/agg_color_conv_rgb16.h → ...y/agg/include/util/agg_color_conv_rgb16.h b/...s/agg/include/util/agg_color_conv_rgb16.h → ...y/agg/include/util/agg_color_conv_rgb16.h
diff --git a/...cs/agg/include/util/agg_color_conv_rgb8.h → ...ty/agg/include/util/agg_color_conv_rgb8.h b/...cs/agg/include/util/agg_color_conv_rgb8.h → ...ty/agg/include/util/agg_color_conv_rgb8.h
diff --git a/source/graphics/agg/src/agg_arc.cpp → 3rdparty/agg/src/agg_arc.cpp b/source/graphics/agg/src/agg_arc.cpp → 3rdparty/agg/src/agg_arc.cpp
diff --git a/source/graphics/agg/src/agg_arrowhead.cpp → 3rdparty/agg/src/agg_arrowhead.cpp b/source/graphics/agg/src/agg_arrowhead.cpp → 3rdparty/agg/src/agg_arrowhead.cpp
diff --git a/source/graphics/agg/src/agg_bezier_arc.cpp → 3rdparty/agg/src/agg_bezier_arc.cpp b/source/graphics/agg/src/agg_bezier_arc.cpp → 3rdparty/agg/src/agg_bezier_arc.cpp
diff --git a/source/graphics/agg/src/agg_bspline.cpp → 3rdparty/agg/src/agg_bspline.cpp b/source/graphics/agg/src/agg_bspline.cpp → 3rdparty/agg/src/agg_bspline.cpp
diff --git a/source/graphics/agg/src/agg_color_rgba.cpp → 3rdparty/agg/src/agg_color_rgba.cpp b/source/graphics/agg/src/agg_color_rgba.cpp → 3rdparty/agg/src/agg_color_rgba.cpp
diff --git a/source/graphics/agg/src/agg_curves.cpp → 3rdparty/agg/src/agg_curves.cpp b/source/graphics/agg/src/agg_curves.cpp → 3rdparty/agg/src/agg_curves.cpp
diff --git a/...ics/agg/src/agg_embedded_raster_fonts.cpp → ...rty/agg/src/agg_embedded_raster_fonts.cpp b/...ics/agg/src/agg_embedded_raster_fonts.cpp → ...rty/agg/src/agg_embedded_raster_fonts.cpp
diff --git a/source/graphics/agg/src/agg_gsv_text.cpp → 3rdparty/agg/src/agg_gsv_text.cpp b/source/graphics/agg/src/agg_gsv_text.cpp → 3rdparty/agg/src/agg_gsv_text.cpp
diff --git a/...ce/graphics/agg/src/agg_image_filters.cpp → 3rdparty/agg/src/agg_image_filters.cpp b/...ce/graphics/agg/src/agg_image_filters.cpp → 3rdparty/agg/src/agg_image_filters.cpp
diff --git a/...e/graphics/agg/src/agg_line_aa_basics.cpp → 3rdparty/agg/src/agg_line_aa_basics.cpp b/...e/graphics/agg/src/agg_line_aa_basics.cpp → 3rdparty/agg/src/agg_line_aa_basics.cpp
diff --git a/.../graphics/agg/src/agg_line_profile_aa.cpp → 3rdparty/agg/src/agg_line_profile_aa.cpp b/.../graphics/agg/src/agg_line_profile_aa.cpp → 3rdparty/agg/src/agg_line_profile_aa.cpp
diff --git a/source/graphics/agg/src/agg_rounded_rect.cpp → 3rdparty/agg/src/agg_rounded_rect.cpp b/source/graphics/agg/src/agg_rounded_rect.cpp → 3rdparty/agg/src/agg_rounded_rect.cpp
diff --git a/source/graphics/agg/src/agg_sqrt_tables.cpp → 3rdparty/agg/src/agg_sqrt_tables.cpp b/source/graphics/agg/src/agg_sqrt_tables.cpp → 3rdparty/agg/src/agg_sqrt_tables.cpp
diff --git a/source/graphics/agg/src/agg_trans_affine.cpp → 3rdparty/agg/src/agg_trans_affine.cpp b/source/graphics/agg/src/agg_trans_affine.cpp → 3rdparty/agg/src/agg_trans_affine.cpp
diff --git a/...raphics/agg/src/agg_trans_double_path.cpp → 3rdparty/agg/src/agg_trans_double_path.cpp b/...raphics/agg/src/agg_trans_double_path.cpp → 3rdparty/agg/src/agg_trans_double_path.cpp
diff --git a/...raphics/agg/src/agg_trans_single_path.cpp → 3rdparty/agg/src/agg_trans_single_path.cpp b/...raphics/agg/src/agg_trans_single_path.cpp → 3rdparty/agg/src/agg_trans_single_path.cpp
diff --git a/...hics/agg/src/agg_trans_warp_magnifier.cpp → ...arty/agg/src/agg_trans_warp_magnifier.cpp b/...hics/agg/src/agg_trans_warp_magnifier.cpp → ...arty/agg/src/agg_trans_warp_magnifier.cpp
diff --git a/...ce/graphics/agg/src/agg_vcgen_bspline.cpp → 3rdparty/agg/src/agg_vcgen_bspline.cpp b/...ce/graphics/agg/src/agg_vcgen_bspline.cpp → 3rdparty/agg/src/agg_vcgen_bspline.cpp
diff --git a/...ce/graphics/agg/src/agg_vcgen_contour.cpp → 3rdparty/agg/src/agg_vcgen_contour.cpp b/...ce/graphics/agg/src/agg_vcgen_contour.cpp → 3rdparty/agg/src/agg_vcgen_contour.cpp
diff --git a/source/graphics/agg/src/agg_vcgen_dash.cpp → 3rdparty/agg/src/agg_vcgen_dash.cpp b/source/graphics/agg/src/agg_vcgen_dash.cpp → 3rdparty/agg/src/agg_vcgen_dash.cpp
diff --git a/...aphics/agg/src/agg_vcgen_markers_term.cpp → 3rdparty/agg/src/agg_vcgen_markers_term.cpp b/...aphics/agg/src/agg_vcgen_markers_term.cpp → 3rdparty/agg/src/agg_vcgen_markers_term.cpp
diff --git a/...aphics/agg/src/agg_vcgen_smooth_poly1.cpp → 3rdparty/agg/src/agg_vcgen_smooth_poly1.cpp b/...aphics/agg/src/agg_vcgen_smooth_poly1.cpp → 3rdparty/agg/src/agg_vcgen_smooth_poly1.cpp
diff --git a/source/graphics/agg/src/agg_vcgen_stroke.cpp → 3rdparty/agg/src/agg_vcgen_stroke.cpp b/source/graphics/agg/src/agg_vcgen_stroke.cpp → 3rdparty/agg/src/agg_vcgen_stroke.cpp
diff --git a/...aphics/agg/src/agg_vpgen_clip_polygon.cpp → 3rdparty/agg/src/agg_vpgen_clip_polygon.cpp b/...aphics/agg/src/agg_vpgen_clip_polygon.cpp → 3rdparty/agg/src/agg_vpgen_clip_polygon.cpp
diff --git a/...phics/agg/src/agg_vpgen_clip_polyline.cpp → 3rdparty/agg/src/agg_vpgen_clip_polyline.cpp b/...phics/agg/src/agg_vpgen_clip_polyline.cpp → 3rdparty/agg/src/agg_vpgen_clip_polyline.cpp
diff --git a/...raphics/agg/src/agg_vpgen_segmentator.cpp → 3rdparty/agg/src/agg_vpgen_segmentator.cpp b/...raphics/agg/src/agg_vpgen_segmentator.cpp → 3rdparty/agg/src/agg_vpgen_segmentator.cpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,11 +1,6 @@
 cmake_minimum_required(VERSION 3.3)
 
-set(LUNASVG_MAJOR_VERSION 0)
-set(LUNASVG_MINOR_VERSION 1)
-set(LUNASVG_PATCH_VERSION 0)
-set(LUNASVG_VERSION ${LUNASVG_MAJOR_VERSION}.${LUNASVG_MINOR_VERSION}.${LUNASVG_PATCH_VERSION})
-
-project(lunasvg VERSION ${LUNASVG_VERSION} LANGUAGES CXX)
+project(lunasvg VERSION 1.0.0 LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 11)
 
@@ -27,6 +22,10 @@ if(LUNASVG_ENABLE_CAIRO)
     pkg_check_modules(CAIRO REQUIRED cairo)
     target_include_directories(lunasvg PRIVATE ${CAIRO_INCLUDE_DIRS})
     target_link_libraries(lunasvg ${CAIRO_LIBRARIES})
+    add_subdirectory(source/backends/cairo)
+else()
+    add_subdirectory(3rdparty/agg)
+    add_subdirectory(source/backends/agg)
 endif()
 
 set(LUNASVG_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib)
@@ -44,4 +43,3 @@ install(TARGETS lunasvg
     ARCHIVE     DESTINATION    ${LUNASVG_LIBDIR}
     INCLUDES    DESTINATION    ${LUNASVG_INCDIR}
 )
-
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ int main()
 - Basic Shapes : rect, circle, ellipse, line, polyline, polygon, path.
 - Paint Servers : solidColor, linearGradient, radialGradient, pattern.
 - Clipping, Masking and Compositing : clipPath, mask, group opacity.
-- Document Structure: defs, svg, g, use, symbol.
+- Document Structures: defs, svg, g, use, symbol.
 - Coordinate Systems, Transformations and Units.
 - Texts (TODO) : text, tspan, tref, textPath.
 - Animations (TODO) : animate, animateColor, animateMotion, animateTransform

diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
@@ -1,9 +1,25 @@
 add_subdirectory(geometry)
 add_subdirectory(graphics)
-add_subdirectory(properties)
 
 target_sources(lunasvg 
 PRIVATE
+    "${CMAKE_CURRENT_LIST_DIR}/cssproperty.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/svgcolor.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/svgenumeration.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/svglength.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/svglengthlist.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/svgnumber.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/svgnumberlist.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/svgpath.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/svgpoint.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/svgpointlist.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/svgpreserveaspectratio.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/svgproperty.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/svgpropertyutils.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/svgrect.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/svgstring.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/svgstringlist.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/svgtransform.cpp"
     "${CMAKE_CURRENT_LIST_DIR}/rendercontext.cpp"
     "${CMAKE_CURRENT_LIST_DIR}/svgdefselement.cpp"
     "${CMAKE_CURRENT_LIST_DIR}/svgdocument.cpp"

diff --git a/source/graphics/cairo/CMakeLists.txt → source/backends/agg/CMakeLists.txt b/source/graphics/cairo/CMakeLists.txt → source/backends/agg/CMakeLists.txt
diff --git a/source/graphics/agg/canvasimpl.cpp → source/backends/agg/canvasimpl.cpp b/source/graphics/agg/canvasimpl.cpp → source/backends/agg/canvasimpl.cpp
@@ -313,7 +313,7 @@ template<typename source_t, typename span_generator_t>
 void CanvasImpl::render_pattern(const Pattern* pattern, const agg::trans_affine& matrix)
 {
     typedef agg::span_interpolator_linear<> span_interpolator_t;
-    typedef agg::span_allocator<typename pixel_format_t::color_type> span_allocator_t;
+    typedef agg::span_allocator<agg::rgba8> span_allocator_t;
     typedef agg::renderer_scanline_aa<renderer_base_t, span_allocator_t, span_generator_t> pattern_renderer_t;
 
     agg::trans_affine transform(to_agg_transform(pattern->matrix()));
@@ -353,7 +353,7 @@ void CanvasImpl::render_scanlines(const Paint& paint, const agg::trans_affine& m
         {
             const RadialGradient* radial = static_cast<const RadialGradient*>(g);
             agg::gradient_radial_focus gradient_function(KGradientScale, KGradientScale*(radial->fx() - radial->cx())/ radial->r(), KGradientScale*(radial->fy() - radial->cy())/ radial->r());
-            render_gradient(gradient_function, radial, paint.opacity(), matrix);
+            render_gradient(gradient_function, g, paint.opacity(), matrix);
         }
     }
     else if(paint.type() == PaintTypePattern)

diff --git a/source/graphics/agg/canvasimpl.h → source/backends/agg/canvasimpl.h b/source/graphics/agg/canvasimpl.h → source/backends/agg/canvasimpl.h
diff --git a/source/graphics/agg/CMakeLists.txt → source/backends/cairo/CMakeLists.txt b/source/graphics/agg/CMakeLists.txt → source/backends/cairo/CMakeLists.txt
@@ -1,6 +1,3 @@
-add_subdirectory(include)
-add_subdirectory(src)
-
 target_sources(lunasvg
 PRIVATE
     "${CMAKE_CURRENT_LIST_DIR}/canvasimpl.cpp"

diff --git a/source/graphics/cairo/canvasimpl.cpp → source/backends/cairo/canvasimpl.cpp b/source/graphics/cairo/canvasimpl.cpp → source/backends/cairo/canvasimpl.cpp
diff --git a/source/graphics/cairo/canvasimpl.h → source/backends/cairo/canvasimpl.h b/source/graphics/cairo/canvasimpl.h → source/backends/cairo/canvasimpl.h
diff --git a/source/properties/cssproperty.cpp → source/cssproperty.cpp b/source/properties/cssproperty.cpp → source/cssproperty.cpp
diff --git a/source/properties/cssproperty.h → source/cssproperty.h b/source/properties/cssproperty.h → source/cssproperty.h
@@ -1,5 +1,5 @@
-#ifndef DOMSVGSTYLE_H
-#define DOMSVGSTYLE_H
+#ifndef CSSPROPERTY_H
+#define CSSPROPERTY_H
 
 #include "svgproperty.h"
 
@@ -138,4 +138,4 @@ class DOMSVGStyle : public DOMSVGProperty<CSSPropertyList>
 
 } // namespace lunasvg
 
-#endif // DOMSVGSTYLE_H
+#endif // CSSPROPERTY_H
diff --git a/source/geometry/affinetransform.cpp b/source/geometry/affinetransform.cpp
@@ -42,36 +42,11 @@ void AffineTransform::setMatrix(double m00, double m10, double m01, double m11,
     m_matrix[4] = m02; m_matrix[5] = m12;
 }
 
-void AffineTransform::multiply(const double* a, const double* b)
+void AffineTransform::makeIdentity()
 {
-    double m00 = a[0] * b[0] + a[1] * b[2];
-    double m10 = a[0] * b[1] + a[1] * b[3];
-    double m01 = a[2] * b[0] + a[3] * b[2];
-    double m11 = a[2] * b[1] + a[3] * b[3];
-    double m02 = a[4] * b[0] + a[5] * b[2] + b[4];
-    double m12 = a[4] * b[1] + a[5] * b[3] + b[5];
-
-    m_matrix[0] = m00; m_matrix[1] = m10;
-    m_matrix[2] = m01; m_matrix[3] = m11;
-    m_matrix[4] = m02; m_matrix[5] = m12;
-}
-
-AffineTransform& AffineTransform::multiply(const AffineTransform& transform)
-{
-    const double* a = m_matrix;
-    const double* b = transform.m_matrix;
-    multiply(b, a);
-
-    return *this;
-}
-
-AffineTransform& AffineTransform::postmultiply(const AffineTransform& transform)
-{
-    const double* a = m_matrix;
-    const double* b = transform.m_matrix;
-    multiply(a, b);
-
-    return *this;
+    m_matrix[0] = 1.0; m_matrix[1] = 0.0;
+    m_matrix[2] = 0.0; m_matrix[3] = 1.0;
+    m_matrix[4] = 0.0; m_matrix[5] = 0.0;
 }
 
 AffineTransform AffineTransform::inverted() const
@@ -94,21 +69,42 @@ AffineTransform AffineTransform::inverted() const
                            m02, m12);
 }
 
-void AffineTransform::reset()
+AffineTransform AffineTransform::operator*(const AffineTransform& transform) const
 {
-    m_matrix[0] = 1.0; m_matrix[1] = 0.0;
-    m_matrix[2] = 0.0; m_matrix[3] = 1.0;
-    m_matrix[4] = 0.0; m_matrix[5] = 0.0;
+    const double* a = m_matrix;
+    const double* b = transform.m_matrix;
+
+    double m00 = a[0] * b[0] + a[1] * b[2];
+    double m10 = a[0] * b[1] + a[1] * b[3];
+    double m01 = a[2] * b[0] + a[3] * b[2];
+    double m11 = a[2] * b[1] + a[3] * b[3];
+    double m02 = a[4] * b[0] + a[5] * b[2] + b[4];
+    double m12 = a[4] * b[1] + a[5] * b[3] + b[5];
+
+    return AffineTransform(m00, m10,
+                           m01, m11,
+                           m02, m12);
 }
 
-AffineTransform AffineTransform::makeIdentity()
+AffineTransform& AffineTransform::operator*=(const AffineTransform& transform)
 {
-    return AffineTransform(1, 0,
-                           0, 1,
-                           0, 0);
+    *this = *this * transform;
+    return *this;
 }
 
-AffineTransform AffineTransform::makeRotate(double radians)
+AffineTransform& AffineTransform::multiply(const AffineTransform& transform)
+{
+    *this = transform * *this;
+    return *this;
+}
+
+AffineTransform& AffineTransform::postmultiply(const AffineTransform& transform)
+{
+    *this = *this * transform;
+    return *this;
+}
+
+AffineTransform AffineTransform::fromRotate(double radians)
 {
     double c = std::cos(radians);
     double s = std::sin(radians);
@@ -118,7 +114,7 @@ AffineTransform AffineTransform::makeRotate(double radians)
                            0, 0);
 }
 
-AffineTransform AffineTransform::makeRotate(double radians, double cx, double cy)
+AffineTransform AffineTransform::fromRotate(double radians, double cx, double cy)
 {
     double c = std::cos(radians);
     double s = std::sin(radians);
@@ -131,14 +127,14 @@ AffineTransform AffineTransform::makeRotate(double radians, double cx, double cy
                            x, y);
 }
 
-AffineTransform AffineTransform::makeScale(double sx, double sy)
+AffineTransform AffineTransform::fromScale(double sx, double sy)
 {
     return AffineTransform(sx, 0,
                            0, sy,
                            0, 0);
 }
 
-AffineTransform AffineTransform::makeShear(double shx, double shy)
+AffineTransform AffineTransform::fromShear(double shx, double shy)
 {
     double x = std::tan(shx);
     double y = std::tan(shy);
@@ -148,36 +144,36 @@ AffineTransform AffineTransform::makeShear(double shx, double shy)
                            0, 0);
 }
 
-AffineTransform AffineTransform::makeTranslate(double tx, double ty)
+AffineTransform AffineTransform::fromTranslate(double tx, double ty)
 {
     return AffineTransform(1, 0,
                            0, 1,
                            tx, ty);
 }
 
-void AffineTransform::rotate(double radians)
+AffineTransform& AffineTransform::rotate(double radians)
 {
-    multiply(makeRotate(radians));
+    return multiply(fromRotate(radians));
 }
 
-void AffineTransform::rotate(double radians, double cx, double cy)
+AffineTransform& AffineTransform::rotate(double radians, double cx, double cy)
 {
-    multiply(makeRotate(radians, cx, cy));
+    return multiply(fromRotate(radians, cx, cy));
 }
 
-void AffineTransform::scale(double sx, double sy)
+AffineTransform& AffineTransform::scale(double sx, double sy)
 {
-    multiply(makeScale(sx, sy));
+    return multiply(fromScale(sx, sy));
 }
 
-void AffineTransform::shear(double shx, double shy)
+AffineTransform& AffineTransform::shear(double shx, double shy)
 {
-    multiply(makeShear(shx, shy));
+    return multiply(fromShear(shx, shy));
 }
 
-void AffineTransform::translate(double cx, double cy)
+AffineTransform& AffineTransform::translate(double cx, double cy)
 {
-    multiply(makeTranslate(cx, cy));
+    return multiply(fromTranslate(cx, cy));
 }
 
 void AffineTransform::map(double x, double y, double& _x, double& _y) const
@@ -186,10 +182,22 @@ void AffineTransform::map(double x, double y, double& _x, double& _y) const
     _y = x * m_matrix[1] + y * m_matrix[3] + m_matrix[5];
 }
 
+void AffineTransform::map(const double* src, double* dst, int size) const
+{
+    for(int i = 0;i < size;i+=2)
+        map(src[i], src[i+1], dst[i], dst[i+1]);
+}
+
+void AffineTransform::map(const Point* src, Point* dst, int size) const
+{
+    for(int i = 0;i < size;i++)
+        map(src[i].x, src[i].y, dst[i].x, dst[i].y);
+}
+
 Point AffineTransform::mapPoint(const Point& point) const
 {
     Point p;
-    map(point.x, point.y, p.x, p.y);
+    map(&point, &p, 1);
     return p;
 }
 
@@ -205,10 +213,7 @@ Rect AffineTransform::mapRect(const Rect& rect) const
     p[3].x = rect.x;
     p[3].y = rect.y + rect.height;
 
-    map(p[0].x, p[0].y, p[0].x, p[0].y);
-    map(p[1].x, p[1].y, p[1].x, p[1].y);
-    map(p[2].x, p[2].y, p[2].x, p[2].y);
-    map(p[3].x, p[3].y, p[3].x, p[3].y);
+    map(p, p, 4);
 
     double l = p[0].x;
     double t = p[0].y;

diff --git a/source/geometry/affinetransform.h b/source/geometry/affinetransform.h
@@ -14,27 +14,31 @@ class AffineTransform
     AffineTransform(double m00, double m10, double m01, double m11, double m02, double m12);
 
     void setMatrix(double m00, double m10, double m01, double m11, double m02, double m12);
-    void multiply(const double* a, const double* b);
+    void makeIdentity();
+    AffineTransform inverted() const;
+
+    AffineTransform operator*(const AffineTransform& transform) const;
+    AffineTransform& operator*=(const AffineTransform& transform);
+
     AffineTransform& multiply(const AffineTransform& transform);
     AffineTransform& postmultiply(const AffineTransform& transform);
-    void reset();
+    AffineTransform& rotate(double radians);
+    AffineTransform& rotate(double radians, double cx, double cy);
+    AffineTransform& scale(double sx, double sy);
+    AffineTransform& shear(double shx, double shy);
+    AffineTransform& translate(double cx, double cy);
+
+    static AffineTransform fromRotate(double radians);
+    static AffineTransform fromRotate(double radians, double cx, double cy);
+    static AffineTransform fromScale(double sx, double sy);
+    static AffineTransform fromShear(double shx, double shy);
+    static AffineTransform fromTranslate(double tx, double ty);
+
     void map(double x, double y, double& _x, double& _y) const;
+    void map(const double* src, double* dst, int size) const;
+    void map(const Point* src, Point* dst, int size) const;
     Point mapPoint(const Point& point) const;
     Rect mapRect(const Rect& rect) const;
-    AffineTransform inverted() const;
-
-    void rotate(double radians);
-    void rotate(double radians, double cx, double cy);
-    void scale(double sx, double sy);
-    void shear(double angleX, double angleY);
-    void translate(double cx, double cy);
-
-    static AffineTransform makeIdentity();
-    static AffineTransform makeRotate(double radians);
-    static AffineTransform makeRotate(double radians, double cx, double cy);
-    static AffineTransform makeScale(double sx, double sy);
-    static AffineTransform makeShear(double shx, double shy);
-    static AffineTransform makeTranslate(double tx, double ty);
 
     bool isIdentity() const;
     double determinant() const;