[mapguide-commits] r4561 - in trunk/MgDev: Common/Renderers
Server/src/Services/Drawing
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sat Jan 30 14:07:04 EST 2010
Author: waltweltonlair
Date: 2010-01-30 14:07:03 -0500 (Sat, 30 Jan 2010)
New Revision: 4561
Modified:
trunk/MgDev/Common/Renderers/AGGW2DRewriter.cpp
trunk/MgDev/Common/Renderers/AGGW2DRewriter.h
trunk/MgDev/Common/Renderers/GDW2DRewriter.cpp
trunk/MgDev/Common/Renderers/GDW2DRewriter.h
trunk/MgDev/Common/Renderers/W2DRewriter.h
trunk/MgDev/Server/src/Services/Drawing/ServerDrawingService.cpp
trunk/MgDev/Server/src/Services/Drawing/ServerDrawingServiceUtil.cpp
trunk/MgDev/Server/src/Services/Drawing/ServerDrawingServiceUtil.h
Log:
Some code cleanup...
Modified: trunk/MgDev/Common/Renderers/AGGW2DRewriter.cpp
===================================================================
--- trunk/MgDev/Common/Renderers/AGGW2DRewriter.cpp 2010-01-30 18:42:48 UTC (rev 4560)
+++ trunk/MgDev/Common/Renderers/AGGW2DRewriter.cpp 2010-01-30 19:07:03 UTC (rev 4561)
@@ -28,20 +28,20 @@
//------------------------------------------------------------------
////////////////////////////////////////////////////////////////////
-WT_Result agr_open (WT_File & /*file*/)
+WT_Result agr_open(WT_File & /*file*/)
{
return WT_Result::Success;
}
-WT_Result agr_close (WT_File & file)
+WT_Result agr_close(WT_File & file)
{
file.set_stream_user_data(WD_Null);
return WT_Result::Success;
}
-WT_Result agr_read (WT_File & file, int desired_bytes, int & bytes_read, void * buffer)
+WT_Result agr_read(WT_File & file, int desired_bytes, int & bytes_read, void * buffer)
{
bytes_read = (int)((AGGRenderer*)file.stream_user_data())->_GetInputStream()->read(buffer, desired_bytes);
@@ -70,7 +70,7 @@
////////////////////////////////////////////////////////////////////
-WT_Result agr_process_units (WT_Units & units, WT_File & file)
+WT_Result agr_process_units(WT_Units & units, WT_File & file)
{
AGGRenderer* rewriter = (AGGRenderer*)file.stream_user_data();
//do not write the units -- the destination W2D has different units
@@ -86,7 +86,7 @@
}
-WT_Result agr_process_color (WT_Color & color, WT_File & file)
+WT_Result agr_process_color(WT_Color & color, WT_File & file)
{
file.rendition().color() = color;
@@ -94,7 +94,7 @@
}
-WT_Result agr_process_lineWeight (WT_Line_Weight & lineWeight, WT_File & file)
+WT_Result agr_process_lineWeight(WT_Line_Weight & lineWeight, WT_File & file)
{
file.rendition().line_weight() = lineWeight;
@@ -102,7 +102,7 @@
}
-WT_Result agr_process_viewport (WT_Viewport & viewport, WT_File & file)
+WT_Result agr_process_viewport(WT_Viewport & viewport, WT_File & file)
{
AGGRenderer* rewriter = (AGGRenderer*)file.stream_user_data();
@@ -129,14 +129,14 @@
}
-WT_Result agr_process_colorMap (WT_Color_Map & colorMap, WT_File & file)
+WT_Result agr_process_colorMap(WT_Color_Map & colorMap, WT_File & file)
{
file.rendition().color_map() = colorMap;
return WT_Result::Success;
}
-WT_Result agr_process_contourSet (WT_Contour_Set & contourSet, WT_File & file)
+WT_Result agr_process_contourSet(WT_Contour_Set & contourSet, WT_File & file)
{
if (file.rendition().visibility().visible() == WD_False)
return WT_Result::Success;
@@ -201,14 +201,14 @@
}
-WT_Result agr_process_fill (WT_Fill & fill, WT_File & file)
+WT_Result agr_process_fill(WT_Fill & fill, WT_File & file)
{
file.rendition().fill() = fill;
return WT_Result::Success;
}
-WT_Result agr_process_font (WT_Font & font, WT_File & file)
+WT_Result agr_process_font(WT_Font & font, WT_File & file)
{
/*AGGRenderer* rewriter = (AGGRenderer*)file.stream_user_data();*/
file.rendition().font() = font;
@@ -216,7 +216,7 @@
}
-WT_Result agr_process_gouraudPolyline (WT_Gouraud_Polyline & /*gouraudPolyline*/, WT_File & /*file*/)
+WT_Result agr_process_gouraudPolyline(WT_Gouraud_Polyline & /*gouraudPolyline*/, WT_File & /*file*/)
{
//AGGRenderer* rewriter = (AGGRenderer*)file.stream_user_data();
//TODO: if the polyline is clipped, the colors will be wrong
@@ -226,7 +226,7 @@
}
-WT_Result agr_process_gouraudPolytriangle (WT_Gouraud_Polytriangle & /*gouraudPolytriangle*/, WT_File & /*file*/)
+WT_Result agr_process_gouraudPolytriangle(WT_Gouraud_Polytriangle & /*gouraudPolytriangle*/, WT_File & /*file*/)
{
//AGGRenderer* rewriter = (AGGRenderer*)file.stream_user_data();
//TODO: clipping for polytriangles is needed
@@ -235,7 +235,7 @@
}
-WT_Result agr_process_image (WT_Image & image, WT_File & file)
+WT_Result agr_process_image(WT_Image & image, WT_File & file)
{
if (file.rendition().visibility().visible() == WD_False)
return WT_Result::Success;
@@ -330,7 +330,7 @@
}
-WT_Result agr_process_origin (WT_Origin & origin, WT_File & file)
+WT_Result agr_process_origin(WT_Origin & origin, WT_File & file)
{
//AGGRenderer* rewriter = (AGGRenderer*)file.stream_user_data();
@@ -345,7 +345,7 @@
}
-WT_Result agr_process_filledEllipse (WT_Filled_Ellipse & filledEllipse, WT_File & file)
+WT_Result agr_process_filledEllipse(WT_Filled_Ellipse & filledEllipse, WT_File & file)
{
if (file.rendition().visibility().visible() == WD_False)
return WT_Result::Success;
@@ -397,7 +397,7 @@
}
-WT_Result agr_process_outlineEllipse (WT_Outline_Ellipse & outlineEllipse, WT_File & file)
+WT_Result agr_process_outlineEllipse(WT_Outline_Ellipse & outlineEllipse, WT_File & file)
{
if (file.rendition().visibility().visible() == WD_False)
return WT_Result::Success;
@@ -453,7 +453,7 @@
}
-WT_Result agr_process_polygon (WT_Polygon & polygon, WT_File & file)
+WT_Result agr_process_polygon(WT_Polygon & polygon, WT_File & file)
{
if (file.rendition().visibility().visible() == WD_False)
return WT_Result::Success;
@@ -489,7 +489,7 @@
}
-WT_Result agr_process_polytriangle (WT_Polytriangle & polytriangle, WT_File & file)
+WT_Result agr_process_polytriangle(WT_Polytriangle & polytriangle, WT_File & file)
{
if (file.rendition().visibility().visible() == WD_False)
return WT_Result::Success;
@@ -558,7 +558,7 @@
}
-WT_Result agr_process_pngGroup4Image (WT_PNG_Group4_Image & pngGroup4Image, WT_File & file)
+WT_Result agr_process_pngGroup4Image(WT_PNG_Group4_Image & pngGroup4Image, WT_File & file)
{
if (file.rendition().visibility().visible() == WD_False)
return WT_Result::Success;
@@ -616,7 +616,7 @@
}
-WT_Result agr_process_polyline (WT_Polyline & polyline, WT_File & file)
+WT_Result agr_process_polyline(WT_Polyline & polyline, WT_File & file)
{
if (file.rendition().visibility().visible() == WD_False)
return WT_Result::Success;
@@ -665,7 +665,7 @@
}
-WT_Result agr_process_text (WT_Text & text, WT_File & file)
+WT_Result agr_process_text(WT_Text & text, WT_File & file)
{
if (file.rendition().visibility().visible() == WD_False)
return WT_Result::Success;
@@ -737,7 +737,7 @@
}
-WT_Result agr_process_visibility (WT_Visibility & visibility, WT_File & file)
+WT_Result agr_process_visibility(WT_Visibility & visibility, WT_File & file)
{
//AGGRenderer* rewriter = (AGGRenderer*)file.stream_user_data();
file.rendition().visibility() = visibility;
@@ -745,7 +745,7 @@
}
-WT_Result agr_process_codePage (WT_Code_Page & /*codePage*/, WT_File & /*file*/)
+WT_Result agr_process_codePage(WT_Code_Page & /*codePage*/, WT_File & /*file*/)
{
//AGGRenderer* rewriter = (AGGRenderer*)file.stream_user_data();
//(*rewriter->GetW2DTargetImage()).desired_rendition().code_page() = codePage;
@@ -753,7 +753,7 @@
}
-WT_Result agr_process_plotInfo (WT_Plot_Info & /*plotInfo*/, WT_File & /*file*/)
+WT_Result agr_process_plotInfo(WT_Plot_Info & /*plotInfo*/, WT_File & /*file*/)
{
//AGGRenderer* rewriter = (AGGRenderer*)file.stream_user_data();
//plotInfo.serialize(*rewriter->GetW2DTargetImage());
@@ -761,7 +761,7 @@
}
-WT_Result agr_process_background (WT_Background & /*background*/, WT_File & /*file*/)
+WT_Result agr_process_background(WT_Background & /*background*/, WT_File & /*file*/)
{
//AGGRenderer* rewriter = (AGGRenderer*)file.stream_user_data();
//background.serialize(*rewriter->GetW2DTargetImage());
@@ -769,7 +769,7 @@
}
-WT_Result agr_process_polymarker (WT_Polymarker & /*polymarker*/, WT_File & /*file*/)
+WT_Result agr_process_polymarker(WT_Polymarker & /*polymarker*/, WT_File & /*file*/)
{
//AGGRenderer* rewriter = (AGGRenderer*)file.stream_user_data();
@@ -784,7 +784,7 @@
}
-WT_Result agr_process_markerSize (WT_Marker_Size & /*markerSize*/, WT_File & /*file*/)
+WT_Result agr_process_markerSize(WT_Marker_Size & /*markerSize*/, WT_File & /*file*/)
{
//AGGRenderer* rewriter = (AGGRenderer*)file.stream_user_data();
@@ -796,66 +796,66 @@
}
-WT_Result agr_process_markerSymbol (WT_Marker_Symbol & /*markerSymbol*/, WT_File & /*file*/)
+WT_Result agr_process_markerSymbol(WT_Marker_Symbol & /*markerSymbol*/, WT_File & /*file*/)
{
return WT_Result::Success;
}
-WT_Result agr_process_mergeControl (WT_Merge_Control & /*mergeControl*/, WT_File & /*file*/)
+WT_Result agr_process_mergeControl(WT_Merge_Control & /*mergeControl*/, WT_File & /*file*/)
{
return WT_Result::Success;
}
-WT_Result agr_process_projection (WT_Projection & /*projection*/, WT_File & /*file*/)
+WT_Result agr_process_projection(WT_Projection & /*projection*/, WT_File & /*file*/)
{
return WT_Result::Success;
}
-WT_Result agr_process_inkedArea (WT_Inked_Area & /*inkedArea*/, WT_File & /*file*/)
+WT_Result agr_process_inkedArea(WT_Inked_Area & /*inkedArea*/, WT_File & /*file*/)
{
return WT_Result::Success;
}
-WT_Result agr_process_alignment (WT_Alignment & /*alignment*/, WT_File & /*file*/)
+WT_Result agr_process_alignment(WT_Alignment & /*alignment*/, WT_File & /*file*/)
{
return WT_Result::Success;
}
-WT_Result agr_process_penPattern (WT_Pen_Pattern & /*penPattern*/, WT_File & /*file*/)
+WT_Result agr_process_penPattern(WT_Pen_Pattern & /*penPattern*/, WT_File & /*file*/)
{
return WT_Result::Success;
}
-WT_Result agr_process_linePattern (WT_Line_Pattern & /*linePattern*/, WT_File & /*file*/)
+WT_Result agr_process_linePattern(WT_Line_Pattern & /*linePattern*/, WT_File & /*file*/)
{
return WT_Result::Success;
}
-WT_Result agr_process_fillPattern (WT_Fill_Pattern & /*fillPattern*/, WT_File & /*file*/)
+WT_Result agr_process_fillPattern(WT_Fill_Pattern & /*fillPattern*/, WT_File & /*file*/)
{
return WT_Result::Success;
}
-WT_Result agr_process_dashPattern (WT_Dash_Pattern & /*dashPattern*/, WT_File & /*file*/)
+WT_Result agr_process_dashPattern(WT_Dash_Pattern & /*dashPattern*/, WT_File & /*file*/)
{
return WT_Result::Success;
}
-WT_Result agr_process_lineStyle (WT_Line_Style & /*lineStyle*/, WT_File & /*file*/)
+WT_Result agr_process_lineStyle(WT_Line_Style & /*lineStyle*/, WT_File & /*file*/)
{
return WT_Result::Success;
}
-WT_Result agr_process_layer (WT_Layer & layer, WT_File & file)
+WT_Result agr_process_layer(WT_Layer & layer, WT_File & file)
{
AGGRenderer* rewriter = (AGGRenderer*)file.stream_user_data();
Modified: trunk/MgDev/Common/Renderers/AGGW2DRewriter.h
===================================================================
--- trunk/MgDev/Common/Renderers/AGGW2DRewriter.h 2010-01-30 18:42:48 UTC (rev 4560)
+++ trunk/MgDev/Common/Renderers/AGGW2DRewriter.h 2010-01-30 19:07:03 UTC (rev 4561)
@@ -21,80 +21,80 @@
#include "whiptk/whip_toolkit.h"
// Standard action routines.
-WT_Result agr_open (WT_File & file);
-WT_Result agr_close (WT_File & file);
-WT_Result agr_read (WT_File & file, int desired_bytes, int &bytes_read, void * buffer);
-WT_Result agr_seek (WT_File & file, int distance, int &amount_seeked);
+WT_Result agr_open(WT_File & file);
+WT_Result agr_close(WT_File & file);
+WT_Result agr_read(WT_File & file, int desired_bytes, int &bytes_read, void * buffer);
+WT_Result agr_seek(WT_File & file, int distance, int &amount_seeked);
-//WT_Result agr_process_author (WT_Author & author, WT_File & file);
-//WT_Result agr_process_creator (WT_Creator & creator, WT_File & file);
-//WT_Result agr_process_created (WT_Creation_Time & created, WT_File & file);
-//WT_Result agr_process_modified (WT_Modification_Time & modified, WT_File & file);
-//WT_Result agr_process_sourceFilename (WT_Source_Filename & sourceFilename, WT_File & file);
-//WT_Result agr_process_sourceCreationTime (WT_Source_Creation_Time & sourceCreated, WT_File & file);
-//WT_Result agr_process_sourceModificationTime (WT_Source_Modification_Time & sourceModified, WT_File & file);
-WT_Result agr_process_units (WT_Units & units, WT_File & file);
-//WT_Result agr_process_embed (WT_Embed & embed, WT_File & file);
-//WT_Result agr_process_namedView (WT_Named_View & namedView, WT_File & file);
-//WT_Result agr_process_view (WT_View & view, WT_File & file);
-WT_Result agr_process_plotInfo (WT_Plot_Info & plotInfo, WT_File & file);
-WT_Result agr_process_background (WT_Background & background, WT_File & file);
-WT_Result agr_process_color (WT_Color & color, WT_File & file);
-WT_Result agr_process_lineWeight (WT_Line_Weight & lineWeight, WT_File & file);
-WT_Result agr_process_lineStyle (WT_Line_Style & lineStyle, WT_File & file);
-WT_Result agr_process_linePattern (WT_Line_Pattern & linePattern, WT_File & file);
-WT_Result agr_process_layer (WT_Layer & layer, WT_File & file);
-WT_Result agr_process_viewport (WT_Viewport & viewport, WT_File & file);
-WT_Result agr_process_visibility (WT_Visibility & visibility, WT_File & file);
-WT_Result agr_process_codePage (WT_Code_Page & codePage, WT_File & file);
-WT_Result agr_process_colorMap (WT_Color_Map & colorMap, WT_File & file);
-//WT_Result agr_process_comments (WT_Comments & comments, WT_File & file);
-WT_Result agr_process_contourSet (WT_Contour_Set & contourSet, WT_File & file);
-//WT_Result agr_process_copyright (WT_Copyright & copyright, WT_File & file);
-WT_Result agr_process_dashPattern (WT_Dash_Pattern & dashPattern, WT_File & file);
-//WT_Result agr_process_description (WT_Description & description, WT_File & file);
-WT_Result agr_process_fill (WT_Fill & fill, WT_File & file);
-WT_Result agr_process_filledEllipse (WT_Filled_Ellipse & filledEllipse, WT_File & file);
-WT_Result agr_process_font (WT_Font & font, WT_File & file);
-WT_Result agr_process_gouraudPolyline (WT_Gouraud_Polyline & gouraudPolyline, WT_File & file);
-WT_Result agr_process_gouraudPolytriangle (WT_Gouraud_Polytriangle & gouraudPolytriangle, WT_File & file);
-WT_Result agr_process_image (WT_Image & image, WT_File & file);
-//WT_Result agr_process_keywords (WT_Keywords & keywords, WT_File & file);
-WT_Result agr_process_markerSize (WT_Marker_Size & markerSize, WT_File & file);
-WT_Result agr_process_markerSymbol (WT_Marker_Symbol & markerSymbol, WT_File & file);
-WT_Result agr_process_mergeControl (WT_Merge_Control & mergeControl, WT_File & file);
-//WT_Result agr_process_namedViewList (WT_Named_View_List & namedViewList, WT_File & file);
-WT_Result agr_process_origin (WT_Origin & origin, WT_File & file);
-WT_Result agr_process_outlineEllipse (WT_Outline_Ellipse & outlineEllipse, WT_File & file);
-WT_Result agr_process_polygon (WT_Polygon & polygon, WT_File & file);
-WT_Result agr_process_polymarker (WT_Polymarker & polymarker, WT_File & file);
-WT_Result agr_process_polytriangle (WT_Polytriangle & polytriangle, WT_File & file);
-WT_Result agr_process_projection (WT_Projection & projection, WT_File & file);
-//WT_Result agr_process_subject (WT_Subject & subject, WT_File & file);
-//WT_Result agr_process_title (WT_Title & title, WT_File & file);
-//WT_Result agr_process_unknown (WT_Unknown & unknown, WT_File & file);
-//WT_Result agr_process_url (WT_URL & url, WT_File & file);
-WT_Result agr_process_pngGroup4Image (WT_PNG_Group4_Image & pngGroup4Image, WT_File & file);
-WT_Result agr_process_polyline (WT_Polyline & polyline, WT_File & file);
-WT_Result agr_process_text (WT_Text & text, WT_File & file);
-WT_Result agr_process_inkedArea (WT_Inked_Area & inkedArea, WT_File & file);
-//WT_Result agr_process_plotOptimized (WT_Plot_Optimized & plotOptimized, WT_File & file);
-//WT_Result agr_process_groupBegin (WT_Group_Begin & groupBegin, WT_File & file);
-//WT_Result agr_process_groupEnd (WT_Group_End & groupEnd, WT_File & file);
-//WT_Result agr_process_embeddedFont (WT_Embedded_Font & embeddedFont, WT_File & file);
-//WT_Result agr_process_trustedFontList (WT_Trusted_Font_List & tustedFontList, WT_File & file);
-//WT_Result agr_process_blockref (WT_BlockRef & blockref, WT_File & file);
-//WT_Result agr_process_blockMeaning (WT_Block_Meaning & blockMeaning, WT_File & file);
-//WT_Result agr_process_encryption (WT_Encryption & encryption, WT_File & file);
-//WT_Result agr_process_orientation (WT_Orientation & orientation, WT_File & file);
-WT_Result agr_process_alignment (WT_Alignment & alignment, WT_File & file);
-//WT_Result agr_process_password (WT_Password & password, WT_File & file);
-//WT_Result agr_process_guid (WT_Guid & guid, WT_File & file);
-//WT_Result agr_process_fileTime (WT_FileTime & fileTime, WT_File & file);
-//WT_Result agr_process_userData (WT_UserData & userData, WT_File & file);
-WT_Result agr_process_penPattern (WT_Pen_Pattern & penPattern, WT_File & file);
-WT_Result agr_process_fillPattern (WT_Fill_Pattern & fillPattern, WT_File & file);
-//WT_Result agr_process_DigitalSign (WT_SignData & digitalSing, WT_File & file);
-//WT_Result agr_process_dwf_header (WT_DWF_Header & dwf_header, WT_File & file);
+//WT_Result agr_process_author(WT_Author & author, WT_File & file);
+//WT_Result agr_process_creator(WT_Creator & creator, WT_File & file);
+//WT_Result agr_process_created(WT_Creation_Time & created, WT_File & file);
+//WT_Result agr_process_modified(WT_Modification_Time & modified, WT_File & file);
+//WT_Result agr_process_sourceFilename(WT_Source_Filename & sourceFilename, WT_File & file);
+//WT_Result agr_process_sourceCreationTime(WT_Source_Creation_Time & sourceCreated, WT_File & file);
+//WT_Result agr_process_sourceModificationTime(WT_Source_Modification_Time & sourceModified, WT_File & file);
+WT_Result agr_process_units(WT_Units & units, WT_File & file);
+//WT_Result agr_process_embed(WT_Embed & embed, WT_File & file);
+//WT_Result agr_process_namedView(WT_Named_View & namedView, WT_File & file);
+//WT_Result agr_process_view(WT_View & view, WT_File & file);
+WT_Result agr_process_plotInfo(WT_Plot_Info & plotInfo, WT_File & file);
+WT_Result agr_process_background(WT_Background & background, WT_File & file);
+WT_Result agr_process_color(WT_Color & color, WT_File & file);
+WT_Result agr_process_lineWeight(WT_Line_Weight & lineWeight, WT_File & file);
+WT_Result agr_process_lineStyle(WT_Line_Style & lineStyle, WT_File & file);
+WT_Result agr_process_linePattern(WT_Line_Pattern & linePattern, WT_File & file);
+WT_Result agr_process_layer(WT_Layer & layer, WT_File & file);
+WT_Result agr_process_viewport(WT_Viewport & viewport, WT_File & file);
+WT_Result agr_process_visibility(WT_Visibility & visibility, WT_File & file);
+WT_Result agr_process_codePage(WT_Code_Page & codePage, WT_File & file);
+WT_Result agr_process_colorMap(WT_Color_Map & colorMap, WT_File & file);
+//WT_Result agr_process_comments(WT_Comments & comments, WT_File & file);
+WT_Result agr_process_contourSet(WT_Contour_Set & contourSet, WT_File & file);
+//WT_Result agr_process_copyright(WT_Copyright & copyright, WT_File & file);
+WT_Result agr_process_dashPattern(WT_Dash_Pattern & dashPattern, WT_File & file);
+//WT_Result agr_process_description(WT_Description & description, WT_File & file);
+WT_Result agr_process_fill(WT_Fill & fill, WT_File & file);
+WT_Result agr_process_filledEllipse(WT_Filled_Ellipse & filledEllipse, WT_File & file);
+WT_Result agr_process_font(WT_Font & font, WT_File & file);
+WT_Result agr_process_gouraudPolyline(WT_Gouraud_Polyline & gouraudPolyline, WT_File & file);
+WT_Result agr_process_gouraudPolytriangle(WT_Gouraud_Polytriangle & gouraudPolytriangle, WT_File & file);
+WT_Result agr_process_image(WT_Image & image, WT_File & file);
+//WT_Result agr_process_keywords(WT_Keywords & keywords, WT_File & file);
+WT_Result agr_process_markerSize(WT_Marker_Size & markerSize, WT_File & file);
+WT_Result agr_process_markerSymbol(WT_Marker_Symbol & markerSymbol, WT_File & file);
+WT_Result agr_process_mergeControl(WT_Merge_Control & mergeControl, WT_File & file);
+//WT_Result agr_process_namedViewList(WT_Named_View_List & namedViewList, WT_File & file);
+WT_Result agr_process_origin(WT_Origin & origin, WT_File & file);
+WT_Result agr_process_outlineEllipse(WT_Outline_Ellipse & outlineEllipse, WT_File & file);
+WT_Result agr_process_polygon(WT_Polygon & polygon, WT_File & file);
+WT_Result agr_process_polymarker(WT_Polymarker & polymarker, WT_File & file);
+WT_Result agr_process_polytriangle(WT_Polytriangle & polytriangle, WT_File & file);
+WT_Result agr_process_projection(WT_Projection & projection, WT_File & file);
+//WT_Result agr_process_subject(WT_Subject & subject, WT_File & file);
+//WT_Result agr_process_title(WT_Title & title, WT_File & file);
+//WT_Result agr_process_unknown(WT_Unknown & unknown, WT_File & file);
+//WT_Result agr_process_url(WT_URL & url, WT_File & file);
+WT_Result agr_process_pngGroup4Image(WT_PNG_Group4_Image & pngGroup4Image, WT_File & file);
+WT_Result agr_process_polyline(WT_Polyline & polyline, WT_File & file);
+WT_Result agr_process_text(WT_Text & text, WT_File & file);
+WT_Result agr_process_inkedArea(WT_Inked_Area & inkedArea, WT_File & file);
+//WT_Result agr_process_plotOptimized(WT_Plot_Optimized & plotOptimized, WT_File & file);
+//WT_Result agr_process_groupBegin(WT_Group_Begin & groupBegin, WT_File & file);
+//WT_Result agr_process_groupEnd(WT_Group_End & groupEnd, WT_File & file);
+//WT_Result agr_process_embeddedFont(WT_Embedded_Font & embeddedFont, WT_File & file);
+//WT_Result agr_process_trustedFontList(WT_Trusted_Font_List & tustedFontList, WT_File & file);
+//WT_Result agr_process_blockref(WT_BlockRef & blockref, WT_File & file);
+//WT_Result agr_process_blockMeaning(WT_Block_Meaning & blockMeaning, WT_File & file);
+//WT_Result agr_process_encryption(WT_Encryption & encryption, WT_File & file);
+//WT_Result agr_process_orientation(WT_Orientation & orientation, WT_File & file);
+WT_Result agr_process_alignment(WT_Alignment & alignment, WT_File & file);
+//WT_Result agr_process_password(WT_Password & password, WT_File & file);
+//WT_Result agr_process_guid(WT_Guid & guid, WT_File & file);
+//WT_Result agr_process_fileTime(WT_FileTime & fileTime, WT_File & file);
+//WT_Result agr_process_userData(WT_UserData & userData, WT_File & file);
+WT_Result agr_process_penPattern(WT_Pen_Pattern & penPattern, WT_File & file);
+WT_Result agr_process_fillPattern(WT_Fill_Pattern & fillPattern, WT_File & file);
+//WT_Result agr_process_DigitalSign(WT_SignData & digitalSing, WT_File & file);
+//WT_Result agr_process_dwf_header(WT_DWF_Header & dwf_header, WT_File & file);
#endif
Modified: trunk/MgDev/Common/Renderers/GDW2DRewriter.cpp
===================================================================
--- trunk/MgDev/Common/Renderers/GDW2DRewriter.cpp 2010-01-30 18:42:48 UTC (rev 4560)
+++ trunk/MgDev/Common/Renderers/GDW2DRewriter.cpp 2010-01-30 19:07:03 UTC (rev 4561)
@@ -32,20 +32,20 @@
//------------------------------------------------------------------
////////////////////////////////////////////////////////////////////
-WT_Result gdr_open (WT_File & /*file*/)
+WT_Result gdr_open(WT_File & /*file*/)
{
return WT_Result::Success;
}
-WT_Result gdr_close (WT_File & file)
+WT_Result gdr_close(WT_File & file)
{
file.set_stream_user_data(WD_Null);
return WT_Result::Success;
}
-WT_Result gdr_read (WT_File & file, int desired_bytes, int & bytes_read, void * buffer)
+WT_Result gdr_read(WT_File & file, int desired_bytes, int & bytes_read, void * buffer)
{
bytes_read = (int)((GDRenderer*)file.stream_user_data())->_GetInputStream()->read(buffer, desired_bytes);
@@ -74,7 +74,7 @@
////////////////////////////////////////////////////////////////////
-WT_Result gdr_process_units (WT_Units & units, WT_File & file)
+WT_Result gdr_process_units(WT_Units & units, WT_File & file)
{
GDRenderer* rewriter = (GDRenderer*)file.stream_user_data();
//do not write the units -- the destination W2D has different units
@@ -90,7 +90,7 @@
}
-WT_Result gdr_process_color (WT_Color & color, WT_File & file)
+WT_Result gdr_process_color(WT_Color & color, WT_File & file)
{
GDRenderer* rewriter = (GDRenderer*)file.stream_user_data();
@@ -107,7 +107,7 @@
}
-WT_Result gdr_process_lineWeight (WT_Line_Weight & lineWeight, WT_File & file)
+WT_Result gdr_process_lineWeight(WT_Line_Weight & lineWeight, WT_File & file)
{
//GDRenderer* rewriter = (GDRenderer*)file.stream_user_data();
@@ -119,7 +119,7 @@
}
-WT_Result gdr_process_viewport (WT_Viewport & viewport, WT_File & file)
+WT_Result gdr_process_viewport(WT_Viewport & viewport, WT_File & file)
{
GDRenderer* rewriter = (GDRenderer*)file.stream_user_data();
@@ -146,14 +146,14 @@
}
-WT_Result gdr_process_colorMap (WT_Color_Map & colorMap, WT_File & file)
+WT_Result gdr_process_colorMap(WT_Color_Map & colorMap, WT_File & file)
{
file.rendition().color_map() = colorMap;
return WT_Result::Success;
}
-WT_Result gdr_process_contourSet (WT_Contour_Set & contourSet, WT_File & file)
+WT_Result gdr_process_contourSet(WT_Contour_Set & contourSet, WT_File & file)
{
if (file.rendition().visibility().visible() == WD_False)
return WT_Result::Success;
@@ -180,8 +180,7 @@
WT_Integer32* cntrcounts = contourSet.counts();
int totalPts = contourSet.total_points();
- const RS_D_Point* dst_cntr = rewriter->ProcessW2DPoints(
- file, (WT_Logical_Point*)contourSet.points(), totalPts, true);
+ const RS_D_Point* dst_cntr = rewriter->ProcessW2DPoints(file, (WT_Logical_Point*)contourSet.points(), totalPts, true);
if (dst_cntr)
{
@@ -199,14 +198,14 @@
}
-WT_Result gdr_process_fill (WT_Fill & fill, WT_File & file)
+WT_Result gdr_process_fill(WT_Fill & fill, WT_File & file)
{
file.rendition().fill() = fill;
return WT_Result::Success;
}
-WT_Result gdr_process_font (WT_Font & font, WT_File & file)
+WT_Result gdr_process_font(WT_Font & font, WT_File & file)
{
/*GDRenderer* rewriter = (GDRenderer*)file.stream_user_data();*/
@@ -215,7 +214,7 @@
}
-WT_Result gdr_process_gouraudPolyline (WT_Gouraud_Polyline & /*gouraudPolyline*/, WT_File & /*file*/)
+WT_Result gdr_process_gouraudPolyline(WT_Gouraud_Polyline & /*gouraudPolyline*/, WT_File & /*file*/)
{
//GDRenderer* rewriter = (GDRenderer*)file.stream_user_data();
//TODO: if the polyline is clipped, the colors will be wrong
@@ -225,7 +224,7 @@
}
-WT_Result gdr_process_gouraudPolytriangle (WT_Gouraud_Polytriangle & /*gouraudPolytriangle*/, WT_File & /*file*/)
+WT_Result gdr_process_gouraudPolytriangle(WT_Gouraud_Polytriangle & /*gouraudPolytriangle*/, WT_File & /*file*/)
{
//GDRenderer* rewriter = (GDRenderer*)file.stream_user_data();
//TODO: clipping for polytriangles is needed
@@ -234,7 +233,7 @@
}
-WT_Result gdr_process_image (WT_Image & image, WT_File & file)
+WT_Result gdr_process_image(WT_Image & image, WT_File & file)
{
if (file.rendition().visibility().visible() == WD_False)
return WT_Result::Success;
@@ -370,7 +369,7 @@
}
-WT_Result gdr_process_origin (WT_Origin & origin, WT_File & file)
+WT_Result gdr_process_origin(WT_Origin & origin, WT_File & file)
{
GDRenderer* rewriter = (GDRenderer*)file.stream_user_data();
@@ -389,7 +388,7 @@
}
-WT_Result gdr_process_filledEllipse (WT_Filled_Ellipse & filledEllipse, WT_File & file)
+WT_Result gdr_process_filledEllipse(WT_Filled_Ellipse & filledEllipse, WT_File & file)
{
if (file.rendition().visibility().visible() == WD_False)
return WT_Result::Success;
@@ -413,8 +412,7 @@
WT_Logical_Point oldpos = filledEllipse.position();
- const RS_D_Point* dstpts = rewriter->ProcessW2DPoints(
- file, (WT_Logical_Point*)&oldpos, 1, false);
+ const RS_D_Point* dstpts = rewriter->ProcessW2DPoints(file, (WT_Logical_Point*)&oldpos, 1, false);
int major = ROUND(rewriter->ScaleW2DNumber(file, filledEllipse.major()));
int minor = ROUND(rewriter->ScaleW2DNumber(file, filledEllipse.minor()));
@@ -449,7 +447,7 @@
}
-WT_Result gdr_process_outlineEllipse (WT_Outline_Ellipse & outlineEllipse, WT_File & file)
+WT_Result gdr_process_outlineEllipse(WT_Outline_Ellipse & outlineEllipse, WT_File & file)
{
if (file.rendition().visibility().visible() == WD_False)
return WT_Result::Success;
@@ -473,8 +471,7 @@
WT_Logical_Point oldpos = outlineEllipse.position();
- const RS_D_Point* dstpts = rewriter->ProcessW2DPoints(
- file, (WT_Logical_Point*)&oldpos, 1, false);
+ const RS_D_Point* dstpts = rewriter->ProcessW2DPoints(file, (WT_Logical_Point*)&oldpos, 1, false);
int major = ROUND(rewriter->ScaleW2DNumber(file, outlineEllipse.major()));
int minor = ROUND(rewriter->ScaleW2DNumber(file, outlineEllipse.minor()));
@@ -531,7 +528,7 @@
}
-WT_Result gdr_process_polygon (WT_Polygon & polygon, WT_File & file)
+WT_Result gdr_process_polygon(WT_Polygon & polygon, WT_File & file)
{
if (file.rendition().visibility().visible() == WD_False)
return WT_Result::Success;
@@ -571,7 +568,7 @@
}
-WT_Result gdr_process_polytriangle (WT_Polytriangle & polytriangle, WT_File & file)
+WT_Result gdr_process_polytriangle(WT_Polytriangle & polytriangle, WT_File & file)
{
if (file.rendition().visibility().visible() == WD_False)
return WT_Result::Success;
@@ -614,7 +611,7 @@
}
-WT_Result gdr_process_pngGroup4Image (WT_PNG_Group4_Image & pngGroup4Image, WT_File & file)
+WT_Result gdr_process_pngGroup4Image(WT_PNG_Group4_Image & pngGroup4Image, WT_File & file)
{
if (file.rendition().visibility().visible() == WD_False)
return WT_Result::Success;
@@ -704,7 +701,7 @@
}
-WT_Result gdr_process_polyline (WT_Polyline & polyline, WT_File & file)
+WT_Result gdr_process_polyline(WT_Polyline & polyline, WT_File & file)
{
if (file.rendition().visibility().visible() == WD_False)
return WT_Result::Success;
@@ -770,7 +767,7 @@
}
-WT_Result gdr_process_text (WT_Text & text, WT_File & file)
+WT_Result gdr_process_text(WT_Text & text, WT_File & file)
{
if (file.rendition().visibility().visible() == WD_False)
return WT_Result::Success;
@@ -840,7 +837,7 @@
}
-WT_Result gdr_process_visibility (WT_Visibility & visibility, WT_File & file)
+WT_Result gdr_process_visibility(WT_Visibility & visibility, WT_File & file)
{
//GDRenderer* rewriter = (GDRenderer*)file.stream_user_data();
file.rendition().visibility() = visibility;
@@ -848,7 +845,7 @@
}
-WT_Result gdr_process_codePage (WT_Code_Page & /*codePage*/, WT_File & /*file*/)
+WT_Result gdr_process_codePage(WT_Code_Page & /*codePage*/, WT_File & /*file*/)
{
//GDRenderer* rewriter = (GDRenderer*)file.stream_user_data();
//(*rewriter->GetW2DTargetImage()).desired_rendition().code_page() = codePage;
@@ -856,7 +853,7 @@
}
-WT_Result gdr_process_plotInfo (WT_Plot_Info & /*plotInfo*/, WT_File & /*file*/)
+WT_Result gdr_process_plotInfo(WT_Plot_Info & /*plotInfo*/, WT_File & /*file*/)
{
//GDRenderer* rewriter = (GDRenderer*)file.stream_user_data();
//plotInfo.serialize(*rewriter->GetW2DTargetImage());
@@ -864,7 +861,7 @@
}
-WT_Result gdr_process_background (WT_Background & /*background*/, WT_File & /*file*/)
+WT_Result gdr_process_background(WT_Background & /*background*/, WT_File & /*file*/)
{
//GDRenderer* rewriter = (GDRenderer*)file.stream_user_data();
//background.serialize(*rewriter->GetW2DTargetImage());
@@ -872,7 +869,7 @@
}
-WT_Result gdr_process_polymarker (WT_Polymarker & polymarker, WT_File & file)
+WT_Result gdr_process_polymarker(WT_Polymarker & polymarker, WT_File & file)
{
GDRenderer* rewriter = (GDRenderer*)file.stream_user_data();
@@ -887,7 +884,7 @@
}
-WT_Result gdr_process_markerSize (WT_Marker_Size & /*markerSize*/, WT_File & /*file*/)
+WT_Result gdr_process_markerSize(WT_Marker_Size & /*markerSize*/, WT_File & /*file*/)
{
//GDRenderer* rewriter = (GDRenderer*)file.stream_user_data();
@@ -899,66 +896,66 @@
}
-WT_Result gdr_process_markerSymbol (WT_Marker_Symbol & /*markerSymbol*/, WT_File & /*file*/)
+WT_Result gdr_process_markerSymbol(WT_Marker_Symbol & /*markerSymbol*/, WT_File & /*file*/)
{
return WT_Result::Success;
}
-WT_Result gdr_process_mergeControl (WT_Merge_Control & /*mergeControl*/, WT_File & /*file*/)
+WT_Result gdr_process_mergeControl(WT_Merge_Control & /*mergeControl*/, WT_File & /*file*/)
{
return WT_Result::Success;
}
-WT_Result gdr_process_projection (WT_Projection & /*projection*/, WT_File & /*file*/)
+WT_Result gdr_process_projection(WT_Projection & /*projection*/, WT_File & /*file*/)
{
return WT_Result::Success;
}
-WT_Result gdr_process_inkedArea (WT_Inked_Area & /*inkedArea*/, WT_File & /*file*/)
+WT_Result gdr_process_inkedArea(WT_Inked_Area & /*inkedArea*/, WT_File & /*file*/)
{
return WT_Result::Success;
}
-WT_Result gdr_process_alignment (WT_Alignment & /*alignment*/, WT_File & /*file*/)
+WT_Result gdr_process_alignment(WT_Alignment & /*alignment*/, WT_File & /*file*/)
{
return WT_Result::Success;
}
-WT_Result gdr_process_penPattern (WT_Pen_Pattern & /*penPattern*/, WT_File & /*file*/)
+WT_Result gdr_process_penPattern(WT_Pen_Pattern & /*penPattern*/, WT_File & /*file*/)
{
return WT_Result::Success;
}
-WT_Result gdr_process_linePattern (WT_Line_Pattern & /*linePattern*/, WT_File & /*file*/)
+WT_Result gdr_process_linePattern(WT_Line_Pattern & /*linePattern*/, WT_File & /*file*/)
{
return WT_Result::Success;
}
-WT_Result gdr_process_fillPattern (WT_Fill_Pattern & /*fillPattern*/, WT_File & /*file*/)
+WT_Result gdr_process_fillPattern(WT_Fill_Pattern & /*fillPattern*/, WT_File & /*file*/)
{
return WT_Result::Success;
}
-WT_Result gdr_process_dashPattern (WT_Dash_Pattern & /*dashPattern*/, WT_File & /*file*/)
+WT_Result gdr_process_dashPattern(WT_Dash_Pattern & /*dashPattern*/, WT_File & /*file*/)
{
return WT_Result::Success;
}
-WT_Result gdr_process_lineStyle (WT_Line_Style & /*lineStyle*/, WT_File & /*file*/)
+WT_Result gdr_process_lineStyle(WT_Line_Style & /*lineStyle*/, WT_File & /*file*/)
{
return WT_Result::Success;
}
-WT_Result gdr_process_layer (WT_Layer & layer, WT_File & file)
+WT_Result gdr_process_layer(WT_Layer & layer, WT_File & file)
{
GDRenderer* rewriter = (GDRenderer*)file.stream_user_data();
Modified: trunk/MgDev/Common/Renderers/GDW2DRewriter.h
===================================================================
--- trunk/MgDev/Common/Renderers/GDW2DRewriter.h 2010-01-30 18:42:48 UTC (rev 4560)
+++ trunk/MgDev/Common/Renderers/GDW2DRewriter.h 2010-01-30 19:07:03 UTC (rev 4561)
@@ -21,80 +21,80 @@
#include "whiptk/whip_toolkit.h"
// Standard action routines.
-WT_Result gdr_open (WT_File & file);
-WT_Result gdr_close (WT_File & file);
-WT_Result gdr_read (WT_File & file, int desired_bytes, int &bytes_read, void * buffer);
-WT_Result gdr_seek (WT_File & file, int distance, int &amount_seeked);
+WT_Result gdr_open(WT_File & file);
+WT_Result gdr_close(WT_File & file);
+WT_Result gdr_read(WT_File & file, int desired_bytes, int &bytes_read, void * buffer);
+WT_Result gdr_seek(WT_File & file, int distance, int &amount_seeked);
-//WT_Result gdr_process_author (WT_Author & author, WT_File & file);
-//WT_Result gdr_process_creator (WT_Creator & creator, WT_File & file);
-//WT_Result gdr_process_created (WT_Creation_Time & created, WT_File & file);
-//WT_Result gdr_process_modified (WT_Modification_Time & modified, WT_File & file);
-//WT_Result gdr_process_sourceFilename (WT_Source_Filename & sourceFilename, WT_File & file);
-//WT_Result gdr_process_sourceCreationTime (WT_Source_Creation_Time & sourceCreated, WT_File & file);
-//WT_Result gdr_process_sourceModificationTime (WT_Source_Modification_Time & sourceModified, WT_File & file);
-WT_Result gdr_process_units (WT_Units & units, WT_File & file);
-//WT_Result gdr_process_embed (WT_Embed & embed, WT_File & file);
-//WT_Result gdr_process_namedView (WT_Named_View & namedView, WT_File & file);
-//WT_Result gdr_process_view (WT_View & view, WT_File & file);
-WT_Result gdr_process_plotInfo (WT_Plot_Info & plotInfo, WT_File & file);
-WT_Result gdr_process_background (WT_Background & background, WT_File & file);
-WT_Result gdr_process_color (WT_Color & color, WT_File & file);
-WT_Result gdr_process_lineWeight (WT_Line_Weight & lineWeight, WT_File & file);
-WT_Result gdr_process_lineStyle (WT_Line_Style & lineStyle, WT_File & file);
-WT_Result gdr_process_linePattern (WT_Line_Pattern & linePattern, WT_File & file);
-WT_Result gdr_process_layer (WT_Layer & layer, WT_File & file);
-WT_Result gdr_process_viewport (WT_Viewport & viewport, WT_File & file);
-WT_Result gdr_process_visibility (WT_Visibility & visibility, WT_File & file);
-WT_Result gdr_process_codePage (WT_Code_Page & codePage, WT_File & file);
-WT_Result gdr_process_colorMap (WT_Color_Map & colorMap, WT_File & file);
-//WT_Result gdr_process_comments (WT_Comments & comments, WT_File & file);
-WT_Result gdr_process_contourSet (WT_Contour_Set & contourSet, WT_File & file);
-//WT_Result gdr_process_copyright (WT_Copyright & copyright, WT_File & file);
-WT_Result gdr_process_dashPattern (WT_Dash_Pattern & dashPattern, WT_File & file);
-//WT_Result gdr_process_description (WT_Description & description, WT_File & file);
-WT_Result gdr_process_fill (WT_Fill & fill, WT_File & file);
-WT_Result gdr_process_filledEllipse (WT_Filled_Ellipse & filledEllipse, WT_File & file);
-WT_Result gdr_process_font (WT_Font & font, WT_File & file);
-WT_Result gdr_process_gouraudPolyline (WT_Gouraud_Polyline & gouraudPolyline, WT_File & file);
-WT_Result gdr_process_gouraudPolytriangle (WT_Gouraud_Polytriangle & gouraudPolytriangle, WT_File & file);
-WT_Result gdr_process_image (WT_Image & image, WT_File & file);
-//WT_Result gdr_process_keywords (WT_Keywords & keywords, WT_File & file);
-WT_Result gdr_process_markerSize (WT_Marker_Size & markerSize, WT_File & file);
-WT_Result gdr_process_markerSymbol (WT_Marker_Symbol & markerSymbol, WT_File & file);
-WT_Result gdr_process_mergeControl (WT_Merge_Control & mergeControl, WT_File & file);
-//WT_Result gdr_process_namedViewList (WT_Named_View_List & namedViewList, WT_File & file);
-WT_Result gdr_process_origin (WT_Origin & origin, WT_File & file);
-WT_Result gdr_process_outlineEllipse (WT_Outline_Ellipse & outlineEllipse, WT_File & file);
-WT_Result gdr_process_polygon (WT_Polygon & polygon, WT_File & file);
-WT_Result gdr_process_polymarker (WT_Polymarker & polymarker, WT_File & file);
-WT_Result gdr_process_polytriangle (WT_Polytriangle & polytriangle, WT_File & file);
-WT_Result gdr_process_projection (WT_Projection & projection, WT_File & file);
-//WT_Result gdr_process_subject (WT_Subject & subject, WT_File & file);
-//WT_Result gdr_process_title (WT_Title & title, WT_File & file);
-//WT_Result gdr_process_unknown (WT_Unknown & unknown, WT_File & file);
-//WT_Result gdr_process_url (WT_URL & url, WT_File & file);
-WT_Result gdr_process_pngGroup4Image (WT_PNG_Group4_Image & pngGroup4Image, WT_File & file);
-WT_Result gdr_process_polyline (WT_Polyline & polyline, WT_File & file);
-WT_Result gdr_process_text (WT_Text & text, WT_File & file);
-WT_Result gdr_process_inkedArea (WT_Inked_Area & inkedArea, WT_File & file);
-//WT_Result gdr_process_plotOptimized (WT_Plot_Optimized & plotOptimized, WT_File & file);
-//WT_Result gdr_process_groupBegin (WT_Group_Begin & groupBegin, WT_File & file);
-//WT_Result gdr_process_groupEnd (WT_Group_End & groupEnd, WT_File & file);
-//WT_Result gdr_process_embeddedFont (WT_Embedded_Font & embeddedFont, WT_File & file);
-//WT_Result gdr_process_trustedFontList (WT_Trusted_Font_List & tustedFontList, WT_File & file);
-//WT_Result gdr_process_blockref (WT_BlockRef & blockref, WT_File & file);
-//WT_Result gdr_process_blockMeaning (WT_Block_Meaning & blockMeaning, WT_File & file);
-//WT_Result gdr_process_encryption (WT_Encryption & encryption, WT_File & file);
-//WT_Result gdr_process_orientation (WT_Orientation & orientation, WT_File & file);
-WT_Result gdr_process_alignment (WT_Alignment & alignment, WT_File & file);
-//WT_Result gdr_process_password (WT_Password & password, WT_File & file);
-//WT_Result gdr_process_guid (WT_Guid & guid, WT_File & file);
-//WT_Result gdr_process_fileTime (WT_FileTime & fileTime, WT_File & file);
-//WT_Result gdr_process_userData (WT_UserData & userData, WT_File & file);
-WT_Result gdr_process_penPattern (WT_Pen_Pattern & penPattern, WT_File & file);
-WT_Result gdr_process_fillPattern (WT_Fill_Pattern & fillPattern, WT_File & file);
-//WT_Result gdr_process_DigitalSign (WT_SignData & digitalSing, WT_File & file);
-//WT_Result gdr_process_dwf_header (WT_DWF_Header & dwf_header, WT_File & file);
+//WT_Result gdr_process_author(WT_Author & author, WT_File & file);
+//WT_Result gdr_process_creator(WT_Creator & creator, WT_File & file);
+//WT_Result gdr_process_created(WT_Creation_Time & created, WT_File & file);
+//WT_Result gdr_process_modified(WT_Modification_Time & modified, WT_File & file);
+//WT_Result gdr_process_sourceFilename(WT_Source_Filename & sourceFilename, WT_File & file);
+//WT_Result gdr_process_sourceCreationTime(WT_Source_Creation_Time & sourceCreated, WT_File & file);
+//WT_Result gdr_process_sourceModificationTime(WT_Source_Modification_Time & sourceModified, WT_File & file);
+WT_Result gdr_process_units(WT_Units & units, WT_File & file);
+//WT_Result gdr_process_embed(WT_Embed & embed, WT_File & file);
+//WT_Result gdr_process_namedView(WT_Named_View & namedView, WT_File & file);
+//WT_Result gdr_process_view(WT_View & view, WT_File & file);
+WT_Result gdr_process_plotInfo(WT_Plot_Info & plotInfo, WT_File & file);
+WT_Result gdr_process_background(WT_Background & background, WT_File & file);
+WT_Result gdr_process_color(WT_Color & color, WT_File & file);
+WT_Result gdr_process_lineWeight(WT_Line_Weight & lineWeight, WT_File & file);
+WT_Result gdr_process_lineStyle(WT_Line_Style & lineStyle, WT_File & file);
+WT_Result gdr_process_linePattern(WT_Line_Pattern & linePattern, WT_File & file);
+WT_Result gdr_process_layer(WT_Layer & layer, WT_File & file);
+WT_Result gdr_process_viewport(WT_Viewport & viewport, WT_File & file);
+WT_Result gdr_process_visibility(WT_Visibility & visibility, WT_File & file);
+WT_Result gdr_process_codePage(WT_Code_Page & codePage, WT_File & file);
+WT_Result gdr_process_colorMap(WT_Color_Map & colorMap, WT_File & file);
+//WT_Result gdr_process_comments(WT_Comments & comments, WT_File & file);
+WT_Result gdr_process_contourSet(WT_Contour_Set & contourSet, WT_File & file);
+//WT_Result gdr_process_copyright(WT_Copyright & copyright, WT_File & file);
+WT_Result gdr_process_dashPattern(WT_Dash_Pattern & dashPattern, WT_File & file);
+//WT_Result gdr_process_description(WT_Description & description, WT_File & file);
+WT_Result gdr_process_fill(WT_Fill & fill, WT_File & file);
+WT_Result gdr_process_filledEllipse(WT_Filled_Ellipse & filledEllipse, WT_File & file);
+WT_Result gdr_process_font(WT_Font & font, WT_File & file);
+WT_Result gdr_process_gouraudPolyline(WT_Gouraud_Polyline & gouraudPolyline, WT_File & file);
+WT_Result gdr_process_gouraudPolytriangle(WT_Gouraud_Polytriangle & gouraudPolytriangle, WT_File & file);
+WT_Result gdr_process_image(WT_Image & image, WT_File & file);
+//WT_Result gdr_process_keywords(WT_Keywords & keywords, WT_File & file);
+WT_Result gdr_process_markerSize(WT_Marker_Size & markerSize, WT_File & file);
+WT_Result gdr_process_markerSymbol(WT_Marker_Symbol & markerSymbol, WT_File & file);
+WT_Result gdr_process_mergeControl(WT_Merge_Control & mergeControl, WT_File & file);
+//WT_Result gdr_process_namedViewList(WT_Named_View_List & namedViewList, WT_File & file);
+WT_Result gdr_process_origin(WT_Origin & origin, WT_File & file);
+WT_Result gdr_process_outlineEllipse(WT_Outline_Ellipse & outlineEllipse, WT_File & file);
+WT_Result gdr_process_polygon(WT_Polygon & polygon, WT_File & file);
+WT_Result gdr_process_polymarker(WT_Polymarker & polymarker, WT_File & file);
+WT_Result gdr_process_polytriangle(WT_Polytriangle & polytriangle, WT_File & file);
+WT_Result gdr_process_projection(WT_Projection & projection, WT_File & file);
+//WT_Result gdr_process_subject(WT_Subject & subject, WT_File & file);
+//WT_Result gdr_process_title(WT_Title & title, WT_File & file);
+//WT_Result gdr_process_unknown(WT_Unknown & unknown, WT_File & file);
+//WT_Result gdr_process_url(WT_URL & url, WT_File & file);
+WT_Result gdr_process_pngGroup4Image(WT_PNG_Group4_Image & pngGroup4Image, WT_File & file);
+WT_Result gdr_process_polyline(WT_Polyline & polyline, WT_File & file);
+WT_Result gdr_process_text(WT_Text & text, WT_File & file);
+WT_Result gdr_process_inkedArea(WT_Inked_Area & inkedArea, WT_File & file);
+//WT_Result gdr_process_plotOptimized(WT_Plot_Optimized & plotOptimized, WT_File & file);
+//WT_Result gdr_process_groupBegin(WT_Group_Begin & groupBegin, WT_File & file);
+//WT_Result gdr_process_groupEnd(WT_Group_End & groupEnd, WT_File & file);
+//WT_Result gdr_process_embeddedFont(WT_Embedded_Font & embeddedFont, WT_File & file);
+//WT_Result gdr_process_trustedFontList(WT_Trusted_Font_List & tustedFontList, WT_File & file);
+//WT_Result gdr_process_blockref(WT_BlockRef & blockref, WT_File & file);
+//WT_Result gdr_process_blockMeaning(WT_Block_Meaning & blockMeaning, WT_File & file);
+//WT_Result gdr_process_encryption(WT_Encryption & encryption, WT_File & file);
+//WT_Result gdr_process_orientation(WT_Orientation & orientation, WT_File & file);
+WT_Result gdr_process_alignment(WT_Alignment & alignment, WT_File & file);
+//WT_Result gdr_process_password(WT_Password & password, WT_File & file);
+//WT_Result gdr_process_guid(WT_Guid & guid, WT_File & file);
+//WT_Result gdr_process_fileTime(WT_FileTime & fileTime, WT_File & file);
+//WT_Result gdr_process_userData(WT_UserData & userData, WT_File & file);
+WT_Result gdr_process_penPattern(WT_Pen_Pattern & penPattern, WT_File & file);
+WT_Result gdr_process_fillPattern(WT_Fill_Pattern & fillPattern, WT_File & file);
+//WT_Result gdr_process_DigitalSign(WT_SignData & digitalSing, WT_File & file);
+//WT_Result gdr_process_dwf_header(WT_DWF_Header & dwf_header, WT_File & file);
#endif
Modified: trunk/MgDev/Common/Renderers/W2DRewriter.h
===================================================================
--- trunk/MgDev/Common/Renderers/W2DRewriter.h 2010-01-30 18:42:48 UTC (rev 4560)
+++ trunk/MgDev/Common/Renderers/W2DRewriter.h 2010-01-30 19:07:03 UTC (rev 4561)
@@ -21,10 +21,10 @@
#include "whiptk/whip_toolkit.h"
// Standard action routines.
-WT_Result simple_open (WT_File & file);
-WT_Result simple_close (WT_File & file);
-WT_Result simple_read (WT_File & file, int desired_bytes, int &bytes_read, void * buffer);
-WT_Result simple_seek (WT_File & file, int distance, int &amount_seeked);
+WT_Result simple_open(WT_File & file);
+WT_Result simple_close(WT_File & file);
+WT_Result simple_read(WT_File & file, int desired_bytes, int &bytes_read, void * buffer);
+WT_Result simple_seek(WT_File & file, int distance, int &amount_seeked);
void RotateRGBAImage(const WT_Unsigned_Integer16 rows,
const WT_Unsigned_Integer16 columns,
@@ -35,75 +35,75 @@
const WT_Logical_Point* dstpts,
WT_File & file);
-WT_Result simple_process_author (WT_Author & author, WT_File & file);
-WT_Result simple_process_creator (WT_Creator & creator, WT_File & file);
-WT_Result simple_process_created (WT_Creation_Time & created, WT_File & file);
-WT_Result simple_process_modified (WT_Modification_Time & modified, WT_File & file);
-WT_Result simple_process_sourceFilename (WT_Source_Filename & sourceFilename, WT_File & file);
-WT_Result simple_process_sourceCreationTime (WT_Source_Creation_Time & sourceCreated, WT_File & file);
-WT_Result simple_process_sourceModificationTime (WT_Source_Modification_Time & sourceModified, WT_File & file);
-WT_Result simple_process_units (WT_Units & units, WT_File & file);
-WT_Result simple_process_embed (WT_Embed & embed, WT_File & file);
-WT_Result simple_process_namedView (WT_Named_View & namedView, WT_File & file);
-WT_Result simple_process_view (WT_View & view, WT_File & file);
-WT_Result simple_process_plotInfo (WT_Plot_Info & plotInfo, WT_File & file);
-WT_Result simple_process_background (WT_Background & background, WT_File & file);
-WT_Result simple_process_color (WT_Color & color, WT_File & file);
-WT_Result simple_process_lineWeight (WT_Line_Weight & lineWeight, WT_File & file);
-WT_Result simple_process_lineStyle (WT_Line_Style & lineStyle, WT_File & file);
-WT_Result simple_process_linePattern (WT_Line_Pattern & linePattern, WT_File & file);
-WT_Result simple_process_layer (WT_Layer & layer, WT_File & file);
-WT_Result simple_process_viewport (WT_Viewport & viewport, WT_File & file);
-WT_Result simple_process_visibility (WT_Visibility & visibility, WT_File & file);
-WT_Result simple_process_codePage (WT_Code_Page & codePage, WT_File & file);
-WT_Result simple_process_colorMap (WT_Color_Map & colorMap, WT_File & file);
-WT_Result simple_process_comments (WT_Comments & comments, WT_File & file);
-WT_Result simple_process_contourSet (WT_Contour_Set & contourSet, WT_File & file);
-WT_Result simple_process_copyright (WT_Copyright & copyright, WT_File & file);
-WT_Result simple_process_dashPattern (WT_Dash_Pattern & dashPattern, WT_File & file);
-WT_Result simple_process_description (WT_Description & description, WT_File & file);
-WT_Result simple_process_fill (WT_Fill & fill, WT_File & file);
-WT_Result simple_process_filledEllipse (WT_Filled_Ellipse & filledEllipse, WT_File & file);
-WT_Result simple_process_font (WT_Font & font, WT_File & file);
-WT_Result simple_process_gouraudPolyline (WT_Gouraud_Polyline & gouraudPolyline, WT_File & file);
-WT_Result simple_process_gouraudPolytriangle (WT_Gouraud_Polytriangle & gouraudPolytriangle, WT_File & file);
-WT_Result simple_process_image (WT_Image & image, WT_File & file);
-WT_Result simple_process_keywords (WT_Keywords & keywords, WT_File & file);
-WT_Result simple_process_markerSize (WT_Marker_Size & markerSize, WT_File & file);
-WT_Result simple_process_markerSymbol (WT_Marker_Symbol & markerSymbol, WT_File & file);
-WT_Result simple_process_mergeControl (WT_Merge_Control & mergeControl, WT_File & file);
-WT_Result simple_process_namedViewList (WT_Named_View_List & namedViewList, WT_File & file);
-WT_Result simple_process_origin (WT_Origin & origin, WT_File & file);
-WT_Result simple_process_outlineEllipse (WT_Outline_Ellipse & outlineEllipse, WT_File & file);
-WT_Result simple_process_polygon (WT_Polygon & polygon, WT_File & file);
-WT_Result simple_process_polymarker (WT_Polymarker & polymarker, WT_File & file);
-WT_Result simple_process_polytriangle (WT_Polytriangle & polytriangle, WT_File & file);
-WT_Result simple_process_projection (WT_Projection & projection, WT_File & file);
-WT_Result simple_process_subject (WT_Subject & subject, WT_File & file);
-WT_Result simple_process_title (WT_Title & title, WT_File & file);
-WT_Result simple_process_unknown (WT_Unknown & unknown, WT_File & file);
-WT_Result simple_process_url (WT_URL & url, WT_File & file);
-WT_Result simple_process_pngGroup4Image (WT_PNG_Group4_Image & pngGroup4Image, WT_File & file);
-WT_Result simple_process_polyline (WT_Polyline & polyline, WT_File & file);
-WT_Result simple_process_text (WT_Text & text, WT_File & file);
-WT_Result simple_process_inkedArea (WT_Inked_Area & inkedArea, WT_File & file);
-WT_Result simple_process_plotOptimized (WT_Plot_Optimized & plotOptimized, WT_File & file);
-WT_Result simple_process_groupBegin (WT_Group_Begin & groupBegin, WT_File & file);
-WT_Result simple_process_groupEnd (WT_Group_End & groupEnd, WT_File & file);
-WT_Result simple_process_embeddedFont (WT_Embedded_Font & embeddedFont, WT_File & file);
-WT_Result simple_process_trustedFontList (WT_Trusted_Font_List & tustedFontList, WT_File & file);
-WT_Result simple_process_blockref (WT_BlockRef & blockref, WT_File & file);
-WT_Result simple_process_blockMeaning (WT_Block_Meaning & blockMeaning, WT_File & file);
-WT_Result simple_process_encryption (WT_Encryption & encryption, WT_File & file);
-WT_Result simple_process_orientation (WT_Orientation & orientation, WT_File & file);
-WT_Result simple_process_alignment (WT_Alignment & alignment, WT_File & file);
-WT_Result simple_process_password (WT_Password & password, WT_File & file);
-WT_Result simple_process_guid (WT_Guid & guid, WT_File & file);
-WT_Result simple_process_fileTime (WT_FileTime & fileTime, WT_File & file);
-WT_Result simple_process_userData (WT_UserData & userData, WT_File & file);
-WT_Result simple_process_penPattern (WT_Pen_Pattern & penPattern, WT_File & file);
-WT_Result simple_process_fillPattern (WT_Fill_Pattern & fillPattern, WT_File & file);
-WT_Result simple_process_DigitalSign (WT_SignData & digitalSing, WT_File & file);
-WT_Result simple_process_dwf_header (WT_DWF_Header & dwf_header, WT_File & file);
+WT_Result simple_process_author(WT_Author & author, WT_File & file);
+WT_Result simple_process_creator(WT_Creator & creator, WT_File & file);
+WT_Result simple_process_created(WT_Creation_Time & created, WT_File & file);
+WT_Result simple_process_modified(WT_Modification_Time & modified, WT_File & file);
+WT_Result simple_process_sourceFilename(WT_Source_Filename & sourceFilename, WT_File & file);
+WT_Result simple_process_sourceCreationTime(WT_Source_Creation_Time & sourceCreated, WT_File & file);
+WT_Result simple_process_sourceModificationTime(WT_Source_Modification_Time & sourceModified, WT_File & file);
+WT_Result simple_process_units(WT_Units & units, WT_File & file);
+WT_Result simple_process_embed(WT_Embed & embed, WT_File & file);
+WT_Result simple_process_namedView(WT_Named_View & namedView, WT_File & file);
+WT_Result simple_process_view(WT_View & view, WT_File & file);
+WT_Result simple_process_plotInfo(WT_Plot_Info & plotInfo, WT_File & file);
+WT_Result simple_process_background(WT_Background & background, WT_File & file);
+WT_Result simple_process_color(WT_Color & color, WT_File & file);
+WT_Result simple_process_lineWeight(WT_Line_Weight & lineWeight, WT_File & file);
+WT_Result simple_process_lineStyle(WT_Line_Style & lineStyle, WT_File & file);
+WT_Result simple_process_linePattern(WT_Line_Pattern & linePattern, WT_File & file);
+WT_Result simple_process_layer(WT_Layer & layer, WT_File & file);
+WT_Result simple_process_viewport(WT_Viewport & viewport, WT_File & file);
+WT_Result simple_process_visibility(WT_Visibility & visibility, WT_File & file);
+WT_Result simple_process_codePage(WT_Code_Page & codePage, WT_File & file);
+WT_Result simple_process_colorMap(WT_Color_Map & colorMap, WT_File & file);
+WT_Result simple_process_comments(WT_Comments & comments, WT_File & file);
+WT_Result simple_process_contourSet(WT_Contour_Set & contourSet, WT_File & file);
+WT_Result simple_process_copyright(WT_Copyright & copyright, WT_File & file);
+WT_Result simple_process_dashPattern(WT_Dash_Pattern & dashPattern, WT_File & file);
+WT_Result simple_process_description(WT_Description & description, WT_File & file);
+WT_Result simple_process_fill(WT_Fill & fill, WT_File & file);
+WT_Result simple_process_filledEllipse(WT_Filled_Ellipse & filledEllipse, WT_File & file);
+WT_Result simple_process_font(WT_Font & font, WT_File & file);
+WT_Result simple_process_gouraudPolyline(WT_Gouraud_Polyline & gouraudPolyline, WT_File & file);
+WT_Result simple_process_gouraudPolytriangle(WT_Gouraud_Polytriangle & gouraudPolytriangle, WT_File & file);
+WT_Result simple_process_image(WT_Image & image, WT_File & file);
+WT_Result simple_process_keywords(WT_Keywords & keywords, WT_File & file);
+WT_Result simple_process_markerSize(WT_Marker_Size & markerSize, WT_File & file);
+WT_Result simple_process_markerSymbol(WT_Marker_Symbol & markerSymbol, WT_File & file);
+WT_Result simple_process_mergeControl(WT_Merge_Control & mergeControl, WT_File & file);
+WT_Result simple_process_namedViewList(WT_Named_View_List & namedViewList, WT_File & file);
+WT_Result simple_process_origin(WT_Origin & origin, WT_File & file);
+WT_Result simple_process_outlineEllipse(WT_Outline_Ellipse & outlineEllipse, WT_File & file);
+WT_Result simple_process_polygon(WT_Polygon & polygon, WT_File & file);
+WT_Result simple_process_polymarker(WT_Polymarker & polymarker, WT_File & file);
+WT_Result simple_process_polytriangle(WT_Polytriangle & polytriangle, WT_File & file);
+WT_Result simple_process_projection(WT_Projection & projection, WT_File & file);
+WT_Result simple_process_subject(WT_Subject & subject, WT_File & file);
+WT_Result simple_process_title(WT_Title & title, WT_File & file);
+WT_Result simple_process_unknown(WT_Unknown & unknown, WT_File & file);
+WT_Result simple_process_url(WT_URL & url, WT_File & file);
+WT_Result simple_process_pngGroup4Image(WT_PNG_Group4_Image & pngGroup4Image, WT_File & file);
+WT_Result simple_process_polyline(WT_Polyline & polyline, WT_File & file);
+WT_Result simple_process_text(WT_Text & text, WT_File & file);
+WT_Result simple_process_inkedArea(WT_Inked_Area & inkedArea, WT_File & file);
+WT_Result simple_process_plotOptimized(WT_Plot_Optimized & plotOptimized, WT_File & file);
+WT_Result simple_process_groupBegin(WT_Group_Begin & groupBegin, WT_File & file);
+WT_Result simple_process_groupEnd(WT_Group_End & groupEnd, WT_File & file);
+WT_Result simple_process_embeddedFont(WT_Embedded_Font & embeddedFont, WT_File & file);
+WT_Result simple_process_trustedFontList(WT_Trusted_Font_List & tustedFontList, WT_File & file);
+WT_Result simple_process_blockref(WT_BlockRef & blockref, WT_File & file);
+WT_Result simple_process_blockMeaning(WT_Block_Meaning & blockMeaning, WT_File & file);
+WT_Result simple_process_encryption(WT_Encryption & encryption, WT_File & file);
+WT_Result simple_process_orientation(WT_Orientation & orientation, WT_File & file);
+WT_Result simple_process_alignment(WT_Alignment & alignment, WT_File & file);
+WT_Result simple_process_password(WT_Password & password, WT_File & file);
+WT_Result simple_process_guid(WT_Guid & guid, WT_File & file);
+WT_Result simple_process_fileTime(WT_FileTime & fileTime, WT_File & file);
+WT_Result simple_process_userData(WT_UserData & userData, WT_File & file);
+WT_Result simple_process_penPattern(WT_Pen_Pattern & penPattern, WT_File & file);
+WT_Result simple_process_fillPattern(WT_Fill_Pattern & fillPattern, WT_File & file);
+WT_Result simple_process_DigitalSign(WT_SignData & digitalSing, WT_File & file);
+WT_Result simple_process_dwf_header(WT_DWF_Header & dwf_header, WT_File & file);
#endif
Modified: trunk/MgDev/Server/src/Services/Drawing/ServerDrawingService.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Drawing/ServerDrawingService.cpp 2010-01-30 18:42:48 UTC (rev 4560)
+++ trunk/MgDev/Server/src/Services/Drawing/ServerDrawingService.cpp 2010-01-30 19:07:03 UTC (rev 4561)
@@ -102,8 +102,7 @@
if (0 == resource)
{
- throw new MgNullArgumentException(
- L"MgServerDrawingService.DescribeDrawing", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullArgumentException(L"MgServerDrawingService.DescribeDrawing", __LINE__, __WFILE__, NULL, L"", NULL);
}
else
{
@@ -191,8 +190,7 @@
if (0 == resource)
{
- throw new MgNullArgumentException(
- L"MgServerDrawingService.GetSection", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullArgumentException(L"MgServerDrawingService.GetSection", __LINE__, __WFILE__, NULL, L"", NULL);
}
else if (sectionName.empty())
{
@@ -535,7 +533,8 @@
do
{
result = file.process_next_object();
- } while (WT_Result::Success == result);
+ }
+ while (WT_Result::Success == result);
// Finished processing the W2D
file.close();
@@ -727,7 +726,8 @@
do
{
result = infile.process_next_object();
- } while (WT_Result::Success == result);
+ }
+ while (WT_Result::Success == result);
// Finished processing the W2D file
outfile.close();
Modified: trunk/MgDev/Server/src/Services/Drawing/ServerDrawingServiceUtil.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Drawing/ServerDrawingServiceUtil.cpp 2010-01-30 18:42:48 UTC (rev 4560)
+++ trunk/MgDev/Server/src/Services/Drawing/ServerDrawingServiceUtil.cpp 2010-01-30 19:07:03 UTC (rev 4561)
@@ -43,7 +43,7 @@
}
-WT_Result MgServerDrawingServiceUtil::MgWt_read (WT_File &file, int desired_bytes, int &bytes_read, void * buffer)
+WT_Result MgServerDrawingServiceUtil::MgWt_read(WT_File &file, int desired_bytes, int &bytes_read, void * buffer)
{
FILE * fp = (FILE *) file.stream_user_data();
if (feof(fp))
@@ -57,13 +57,13 @@
}
-WT_Result MgServerDrawingServiceUtil::MgWt_open (WT_File &)
+WT_Result MgServerDrawingServiceUtil::MgWt_open(WT_File &)
{
return WT_Result::Success;
}
-WT_Result MgServerDrawingServiceUtil::MgWt_close (WT_File &file)
+WT_Result MgServerDrawingServiceUtil::MgWt_close(WT_File &file)
{
FILE * fp = (FILE *) file.stream_user_data();
fclose (fp);
Modified: trunk/MgDev/Server/src/Services/Drawing/ServerDrawingServiceUtil.h
===================================================================
--- trunk/MgDev/Server/src/Services/Drawing/ServerDrawingServiceUtil.h 2010-01-30 18:42:48 UTC (rev 4560)
+++ trunk/MgDev/Server/src/Services/Drawing/ServerDrawingServiceUtil.h 2010-01-30 19:07:03 UTC (rev 4561)
@@ -61,7 +61,6 @@
private:
// Unimplemented Methods
-
MgServerDrawingServiceUtil(const MgServerDrawingServiceUtil& util);
MgServerDrawingServiceUtil& operator=(const MgServerDrawingServiceUtil& util);
@@ -69,9 +68,9 @@
public:
- static WT_Result MgWt_open (WT_File &file);
- static WT_Result MgWt_close (WT_File &file);
- static WT_Result MgWt_read (WT_File &file, int desired_bytes, int &bytes_read, void * buffer);
+ static WT_Result MgWt_open(WT_File &file);
+ static WT_Result MgWt_close(WT_File &file);
+ static WT_Result MgWt_read(WT_File &file, int desired_bytes, int &bytes_read, void * buffer);
static WT_Result MgWt_process_layer(WT_Layer &layer, WT_File &file);
static WT_Result MgWt_process_color(WT_Color &color, WT_File &file);
More information about the mapguide-commits
mailing list