git-svn-id:...

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@55191 954022d7-b5bf-4e40-9824-e11837661b57

DesktopEditor/agg-2.4/include/agg_renderer_scanline.h

@@ -142,7 +142,7 @@ namespace agg
 
 		inline void render(int lWidth, int lHeight, unsigned char* pData, int x, int y)
 		{
-			BYTE* pMemory = pData;
+            unsigned char* pMemory = pData;
 			for (int j = 0; j < lHeight; ++j)
 			{
 				m_ren->blend_solid_hspan(x, y + j, lWidth, m_color, pMemory);

DesktopEditor/agg-2.4/svg/agg_svg_attributes.h

@@ -175,7 +175,7 @@ namespace svg
         }
 
         //-----------------------------------------------------------------------
-        const attr* attr_stack::attribute(unsigned idx) const
+        const attr* attribute(unsigned idx) const
         {
             return &m_attributes[m_sessions.last().start_attr_index + idx];
         }
@@ -307,7 +307,7 @@ namespace svg
             stroke_linecap_e     stroke_linecap;
             double               stroke_miterlimit;
 
-            transformer          transformer;
+            agg::svg::transformer          transformer;
             double               object_bbox[4];
 
             values() :