[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 1315
Date : Wed Jun 14 10:51:43 BST 2006
Changed paths:
M /Trunk/XaraLX/Kernel/bmapprev.cpp
M /Trunk/XaraLX/Kernel/bmpcomp.cpp
M /Trunk/XaraLX/Kernel/colcomp.cpp
M /Trunk/XaraLX/Kernel/filters.cpp
M /Trunk/XaraLX/Kernel/group.cpp
M /Trunk/XaraLX/Kernel/guides.cpp
M /Trunk/XaraLX/Kernel/impexpop.cpp
M /Trunk/XaraLX/Kernel/layer.cpp
M /Trunk/XaraLX/Kernel/nbevcont.cpp
M /Trunk/XaraLX/Kernel/ncntrcnt.cpp
M /Trunk/XaraLX/Kernel/ndclpcnt.cpp
M /Trunk/XaraLX/Kernel/ndmldpth.cpp
M /Trunk/XaraLX/Kernel/nodebldr.cpp
M /Trunk/XaraLX/Kernel/nodeblnd.cpp
M /Trunk/XaraLX/Kernel/nodebmp.cpp
M /Trunk/XaraLX/Kernel/nodecont.cpp
M /Trunk/XaraLX/Kernel/nodeelip.cpp
M /Trunk/XaraLX/Kernel/nodemldr.cpp
M /Trunk/XaraLX/Kernel/nodemold.cpp
M /Trunk/XaraLX/Kernel/nodepath.cpp
M /Trunk/XaraLX/Kernel/noderect.cpp
M /Trunk/XaraLX/Kernel/nodershp.cpp
M /Trunk/XaraLX/Kernel/nodetext.cpp
M /Trunk/XaraLX/Kernel/nodetxts.cpp
M /Trunk/XaraLX/Kernel/ppstroke.cpp
M /Trunk/XaraLX/wxOil/compatdef.h
M /Trunk/XaraLX/wxOil/filedlgs.cpp
M /Trunk/XaraLX/wxOil/oilbitmap.cpp
More EPS work
Diff:
Index: Trunk/XaraLX/Kernel/filters.cpp
===================================================================
--- Trunk/XaraLX/Kernel/filters.cpp (revision 1314)
+++ Trunk/XaraLX/Kernel/filters.cpp (revision 1315)
@@ -841,7 +841,7 @@
// Corel EPS filters.
-PORTNOTE("filter","Removed EPS filters usage")
+PORTNOTE("filter","Removed Corel EPS filters usage")
ADD_FILTER(Corel3EPSFilter)
ADD_FILTER(Corel4EPSFilter)
@@ -1843,12 +1843,7 @@
// We need special handling for Camelot EPS
// (NB. but not native files - do not change this to IS_KIND_OF!)
-PORTNOTE("filter","Removed EPSFilter usage")
-#ifndef EXCLUDE_FROM_XARALX
BOOL IsCamelotEPS = IS_A(pRegion, CamelotEPSRenderRegion);
-#else
- BOOL IsCamelotEPS = FALSE;
-#endif
// Get the DC for this export operation
// This can be NULL, in the case of bitmap export, or a CMetaFileDC in the case
@@ -1856,27 +1851,19 @@
// pDC otherwise the CATCH handlers will fail as there is no ExportFile. Also the
// progress bar message will fail.
// The CDC can be Null if we are talking about bitmap export
-// CNativeDC* pCDC = pRegion->GetRenderDC();
+ CNativeDC* pCDC = pRegion->GetRenderDC();
ExportDC* pDC = NULL;
NumNodes = 0;
// At present, it appears that only EPS derived filters have a file attached and so
// are the only ones which use an ExportDC. All bitmap filters use NULL.
-PORTNOTE("filter","Removed EPSFilter usage")
-#ifndef EXCLUDE_FROM_XARALX
if( pCDC != NULL && this->IS_KIND_OF(EPSFilter))
- pDC = (ExportDC*)pCDC;
-#endif
+ pDC = (ExportDC*)CCDC::ConvertFromNativeDC(pCDC);
// Find out how big the document and document components are...
// (We only do this for EPS files)
-PORTNOTE("filter","Removed EPSFilter usage")
if(
-#ifndef EXCLUDE_FROM_XARALX
this->IS_KIND_OF(EPSFilter) &&
-#else
- FALSE &&
-#endif
!IsCamelotEPS)
{
// First, we ask the document itself
@@ -1933,11 +1920,9 @@
BOOL bVisibleLayersOnly = ExportVisibleLayersOnly();
BOOL bSelectedOnly = ExportSelectionOnly(MaskedRender);
-PORTNOTE("filter","Removed EPSFilter usage")
-#ifndef EXCLUDE_FROM_XARALX
if (IsCamelotEPS)
{
- //TRY
+ try
{
// Special 3-stage rendering needed for Camelot EPS to be renderable.
View *pView = DocView::GetSelected();
@@ -1960,21 +1945,18 @@
// Finished render region - close down region (i.e. output trailer).
((EPSRenderRegion *) pRegion)->CloseDown();
}
-#if 0
- CATCH(CFileException, e)
+
+ catch(CFileException)
{
// Didn't work - report failure to caller.
if (pDC)
pDC->ExportFile->SetThrowExceptions(FALSE);
return FALSE;
}
- END_CATCH
-#endif
// All ok
return TRUE;
}
else
-#endif
{
FilterRenderCallback MyCallback(this, TRUE, bVisibleLayersOnly, bSelectedOnly);
pRegion->RenderTree(pNode, FALSE, FALSE, &MyCallback);
Index: Trunk/XaraLX/Kernel/nodemldr.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodemldr.cpp (revision 1314)
+++ Trunk/XaraLX/Kernel/nodemldr.cpp (revision 1315)
@@ -110,8 +110,8 @@
#include "ndmldink.h"
#include "ndmldgrp.h"
//#include "nodeattr.h" - in camtypes.h [AUTOMATICALLY REMOVED]
-//#include "nativeps.h" // The old style EPS native filter, used in v1.1
-//#include "cameleps.h"
+#include "nativeps.h" // The old style EPS native filter, used in v1.1
+#include "cameleps.h"
#include "aw_eps.h"
//#include "oilprog.h"
@@ -1330,8 +1330,6 @@
if (pRender==NULL)
return TRUE;
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
// dont export to native documents
if (pRender->IS_KIND_OF(NativeRenderRegion))
return FALSE;
@@ -1351,9 +1349,6 @@
#else
return FALSE;
#endif
-#else
- return FALSE;
-#endif
}
@@ -1376,8 +1371,6 @@
void NodeMoulder::PreExportRender(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
if (pRegion->IS_KIND_OF(CamelotEPSRenderRegion))
{
PreExportCAMEPS(pRegion);
@@ -1390,7 +1383,6 @@
return;
}
#endif
-#endif
}
/*********************************************************************************************
@@ -1412,14 +1404,11 @@
BOOL NodeMoulder::ExportRender(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
if (pRegion->IS_KIND_OF(CamelotEPSRenderRegion))
return PostExportCAMEPS(pRegion);
if (pRegion->IS_KIND_OF(ArtWorksEPSRenderRegion))
return PostExportAWEPS(pRegion);
-#endif
#endif
return FALSE;
}
@@ -1443,16 +1432,13 @@
{
#ifdef DO_EXPORT
// Make sure this token goes out only in Native documents
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
if (pRegion->IS_KIND_OF(NativeRenderRegion))
{
EPSExportDC *pDC = (EPSExportDC *) pRegion->GetRenderDC();
- pDC->OutputToken("csdo"); // Camelot "start mould destin" token
+ pDC->OutputToken(_T("csdo")); // Camelot "start mould destin" token
pDC->OutputNewLine();
}
#endif
-#endif
}
@@ -1460,17 +1446,14 @@
{
#ifdef DO_EXPORT
// Make sure this token goes out only in Native documents
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
if (pRegion->IS_KIND_OF(NativeRenderRegion))
{
EPSExportDC *pDC = (EPSExportDC *) pRegion->GetRenderDC();
- pDC->OutputToken("cedo"); // Camelot "end mould destin" token
+ pDC->OutputToken(_T("cedo")); // Camelot "end mould destin" token
pDC->OutputNewLine();
return TRUE;
}
#endif
-#endif
// Otherwise render as paths (e.g. in EPS)
return FALSE;
}
Index: Trunk/XaraLX/Kernel/ncntrcnt.cpp
===================================================================
--- Trunk/XaraLX/Kernel/ncntrcnt.cpp (revision 1314)
+++ Trunk/XaraLX/Kernel/ncntrcnt.cpp (revision 1315)
@@ -2594,15 +2594,15 @@
void NodeContourController::PreExportRender(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
if (pRegion->IsKindOf(CC_RUNTIME_CLASS(EPSRenderRegion)))
{
// Output "start group" token
EPSExportDC *pDC = (EPSExportDC *) pRegion->GetRenderDC();
- pDC->OutputToken("u");
+ pDC->OutputToken(_T("u"));
pDC->OutputNewLine();
}
+PORTNOTE("cmx", "Removed use of CMXRenderRegion")
+#ifndef EXCLUDE_FROM_XARALX
else if(pRegion->IsKindOf(CC_RUNTIME_CLASS(CMXRenderRegion)))
{
// mark start of a group...
@@ -2617,18 +2617,18 @@
BOOL NodeContourController::ExportRender(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
if (pRegion->IsKindOf(CC_RUNTIME_CLASS(EPSRenderRegion)))
{
// Output "end group" token
EPSExportDC *pDC = (EPSExportDC *) pRegion->GetRenderDC();
- pDC->OutputToken("U");
+ pDC->OutputToken(_T("U"));
pDC->OutputNewLine();
// Tell caller we rendered ourselves ok
return TRUE;
}
+PORTNOTE("cmx", "Removed use of CMXRenderRegion")
+#ifndef EXCLUDE_FROM_XARALX
else if(pRegion->IsKindOf(CC_RUNTIME_CLASS(CMXRenderRegion)))
{
// mark start of a group...
Index: Trunk/XaraLX/Kernel/nodeblnd.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodeblnd.cpp (revision 1314)
+++ Trunk/XaraLX/Kernel/nodeblnd.cpp (revision 1315)
@@ -109,7 +109,7 @@
#include "ophist.h"
//#include "rndrgn.h"
#include "aw_eps.h"
-//#include "cameleps.h"
+#include "cameleps.h"
#include "objchge.h"
#include "nodebldr.h"
//#include "app.h" - in camtypes.h [AUTOMATICALLY REMOVED]
@@ -1655,8 +1655,6 @@
void NodeBlend::PreExportRender(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
if (IS_A(pRegion, CamelotEPSRenderRegion))
// We ust want the paths in EPS.
return;
@@ -1676,7 +1674,7 @@
pDC->OutputValue(INT32(m_NotAntialiased)); // The "don't antialias blend steps" flag
pDC->OutputValue(INT32(m_NumBlendSteps)); // Num blend steps
pDC->OutputValue(INT32(1)); // Version (Important that this is the last param!!!)
- pDC->OutputToken("csbd"); // Camelot "start blend" token
+ pDC->OutputToken(_T("csbd")); // Camelot "start blend" token
pDC->OutputNewLine();
}
else
@@ -1692,13 +1690,12 @@
pDC->OutputValue(INT32(1)); // Version
pDC->OutputValue(INT32(0)); // Expanded flag
pDC->OutputValue(GetNumInkObjects()); // Num objects we are blending
- pDC->OutputToken("asbd"); // ArtWorks "start blend" token
+ pDC->OutputToken(_T("asbd")); // ArtWorks "start blend" token
pDC->OutputNewLine();
}
}
}
#endif
-#endif
}
/*********************************************************************************************
@@ -1710,7 +1707,7 @@
Inputs: pRegion = ptr to the export render region to export to
Outputs:
Returns: TRUE if ok, FALSE if something went wrong
- Purpose: Called after this node and all of its children have been rendered to the export region.
+ Purpose: Called afterCamelotEPSFilter this node and all of its children have been rendered to the export region.
This outputs the "end blend" command.
Supports ArtWorks EPS and Camelot EPS
Errors:
@@ -1720,8 +1717,6 @@
BOOL NodeBlend::ExportRender(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
if (IS_A(pRegion, CamelotEPSRenderRegion))
// We just want the paths in EPS.
return FALSE;
@@ -1732,19 +1727,18 @@
if (pRegion->IS_KIND_OF(CamelotEPSRenderRegion))
{
- pDC->OutputToken("cebd"); // Camelot "end blend" token
+ pDC->OutputToken(_T("cebd")); // Camelot "end blend" token
pDC->OutputNewLine();
}
else if (IsArtWorksEPSCompatible())
{
- pDC->OutputToken("aebd"); // ArtWorks "end blend" token
+ pDC->OutputToken(_T("aebd")); // ArtWorks "end blend" token
pDC->OutputNewLine();
}
// Tell caller we rendered ourselves ok
return TRUE;
}
#endif
-#endif
// Render this node in the normal way
return FALSE;
}
Index: Trunk/XaraLX/Kernel/nodebldr.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodebldr.cpp (revision 1314)
+++ Trunk/XaraLX/Kernel/nodebldr.cpp (revision 1315)
@@ -124,8 +124,8 @@
//#include "fixmem.h" - in camtypes.h [AUTOMATICALLY REMOVED]
#include "aw_eps.h"
-//#include "nativeps.h" // The old style EPS native filter, used in v1.1
-//#include "cameleps.h"
+#include "nativeps.h" // The old style EPS native filter, used in v1.1
+#include "cameleps.h"
#include "attrmap.h"
#include "progress.h"
@@ -6906,8 +6906,6 @@
void NodeBlender::PreExportRender(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
// Ensure that we are initialised (if it can be done!!)
if (!Reinit())
return;
@@ -6932,7 +6930,7 @@
pDC->OutputValue(m_ObjIndexEnd); // Index to object at end of blend
pDC->OutputValue(m_PathIndexStart); // Path index to el num of start path
pDC->OutputValue(m_PathIndexEnd); // Path index to el num of end path
- pDC->OutputToken("csbr"); // Camelot "start blender" token
+ pDC->OutputToken(_T("csbr")); // Camelot "start blender" token
pDC->OutputNewLine();
}
@@ -6951,7 +6949,7 @@
pDC->OutputValue(INT32(GetNumBlendSteps()+1)); // The number of blend steps (+1 for AW)
pDC->OutputValue(GetAWStartPathIndex()); // Get start path index
pDC->OutputValue(GetAWEndPathIndex()); // Get end path index
- pDC->OutputToken("asbr"); // ArtWorks "start blender" token
+ pDC->OutputToken(_T("asbr")); // ArtWorks "start blender" token
pDC->OutputNewLine();
// Blend is done
@@ -6972,7 +6970,6 @@
//pRefStart->GetFirstBlendPath()->GetNodePath()->Render(pRegion);
//pRefEnd ->GetFirstBlendPath()->GetNodePath()->Render(pRegion);
#endif
-#endif
}
/*********************************************************************************************
@@ -6994,8 +6991,6 @@
BOOL NodeBlender::ExportRender(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
// Ensure that we are initialised (if it can be done!!)
if (!Reinit())
return FALSE;
@@ -7011,7 +7006,7 @@
}
else if (pRegion->IS_KIND_OF(NativeRenderRegion))
{
- pDC->OutputToken("cebr"); // Camelot "end blender" token
+ pDC->OutputToken(_T("cebr")); // Camelot "end blender" token
pDC->OutputNewLine();
}
else
@@ -7022,7 +7017,7 @@
{
if (pNodeBlend->IsArtWorksEPSCompatible())
{
- pDC->OutputToken("aebr"); // ArtWorks "end blender" token
+ pDC->OutputToken(_T("aebr")); // ArtWorks "end blender" token
pDC->OutputNewLine();
}
}
@@ -7031,7 +7026,6 @@
return TRUE;
}
#endif
-#endif
// Render this node in the normal way
return FALSE;
}
Index: Trunk/XaraLX/Kernel/bmapprev.cpp
===================================================================
--- Trunk/XaraLX/Kernel/bmapprev.cpp (revision 1314)
+++ Trunk/XaraLX/Kernel/bmapprev.cpp (revision 1315)
@@ -456,7 +456,7 @@
case GIF:
case TI_GIF:
{
-PORTNOTETRACE("other", "Removed CamelotEPSFilter check" );
+PORTNOTETRACE("other", "Removed GIFExportOptions check" );
#if !defined(EXCLUDE_FROM_XARALX)
GIFExportOptions* pGIFOptions = (GIFExportOptions*)m_pExportOptions;
ERROR3IF(!pGIFOptions->IS_KIND_OF(GIFExportOptions), "pGIFOptions isn't");
@@ -472,7 +472,7 @@
}
case MAKE_BITMAP_FILTER:
{
-PORTNOTETRACE("other", "Removed CamelotEPSFilter check" );
+PORTNOTETRACE("other", "Removed MakeBitmapExportOptions check" );
#if !defined(EXCLUDE_FROM_XARALX)
MakeBitmapExportOptions* pMkBOptions = (MakeBitmapExportOptions*)m_pExportOptions;
ERROR3IF(!pMkBOptions->IS_KIND_OF(MakeBitmapExportOptions), "pMkBOptions isn't");
Index: Trunk/XaraLX/Kernel/group.cpp
===================================================================
--- Trunk/XaraLX/Kernel/group.cpp (revision 1314)
+++ Trunk/XaraLX/Kernel/group.cpp (revision 1315)
@@ -228,8 +228,6 @@
void NodeGroup::PreExportRender(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
if (pRegion->IsKindOf(CC_RUNTIME_CLASS(EPSRenderRegion)))
{
// Output "start group" token
@@ -237,6 +235,8 @@
pDC->OutputToken(_T("u"));
pDC->OutputNewLine();
}
+PORTNOTE("cmx", "Removed use of CMXRenderRegion")
+#ifndef EXCLUDE_FROM_XARALX
else if(pRegion->IsKindOf(CC_RUNTIME_CLASS(CMXRenderRegion)))
{
// mark start of a group...
@@ -251,8 +251,6 @@
BOOL NodeGroup::ExportRender(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
if (pRegion->IsKindOf(CC_RUNTIME_CLASS(EPSRenderRegion)))
{
// Output "end group" token
@@ -263,6 +261,8 @@
// Tell caller we rendered ourselves ok
return TRUE;
}
+PORTNOTE("cmx", "Removed use of CMXRenderRegion")
+#ifndef EXCLUDE_FROM_XARALX
else if(pRegion->IsKindOf(CC_RUNTIME_CLASS(CMXRenderRegion)))
{
// mark start of a group...
Index: Trunk/XaraLX/Kernel/nbevcont.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nbevcont.cpp (revision 1314)
+++ Trunk/XaraLX/Kernel/nbevcont.cpp (revision 1315)
@@ -123,15 +123,15 @@
// text class includes
#include "nodetxts.h"
//#include "txtattr.h" - in camtypes.h [AUTOMATICALLY REMOVED]
-//#include "textops.h"
+#include "textops.h"
//#include "arrows.h" - in camtypes.h [AUTOMATICALLY REMOVED]
//#include "bevinfo.h"
// Save/load
//#include "cxfrec.h" // CXaraFileRecord - in camtypes.h [AUTOMATICALLY REMOVED]
#include "attrbev.h"
-//#include "bevtool.h"
-//#include "blndtool.h"
+#include "bevtool.h"
+#include "blndtool.h"
#include "blobs.h"
//#include "tool.h" - in camtypes.h [AUTOMATICALLY REMOVED]
//#include "bevres.h"
@@ -846,16 +846,11 @@
br = BoundingRectangle;
// is the bevel tool active ?
-PORTNOTE("other","Use of BevelTool removed from NodeBevelController::GetBlobBoundingRect");
-#ifndef EXCLUDE_FROM_XARALX
if (Tool::GetCurrentID() != TOOLID_BEVELTOOL ||
!BevelTool::AmActive())
{
return NodeGroup::GetBlobBoundingRect();
}
-#else
- return NodeGroup::GetBlobBoundingRect();
-#endif
DocRect BlobRect;
@@ -1153,11 +1148,8 @@
// with bevels!). (Actually NodeCompound::OnChildChange())
}
-PORTNOTE("other","Removed OpCreateBevel from NodeBevelController::OnChildChange");
-#ifndef EXCLUDE_FROM_XARALX
if (pUndoOp->IsKindOf(CC_RUNTIME_CLASS(OpCreateBevel)))
return CC_OK;
-#endif
// first, invalidate my region
// if (pParam->GetChangeType() == OBJCHANGE_FINISHED)
@@ -1204,13 +1196,10 @@
// Karim 20/12/2000 added to fix an update bug - shadow & bevel some text,
// enter some more & shadow doesn't get correct bounds from bevel.
-//PORTNOTE("other","Removed OpTextUndoable from NodeBevelController::OnChildChange");
-#ifndef EXCLUDE_FROM_XARALX
else if (pUndoOp->IS_KIND_OF (OpTextUndoable))
{
RegenerateNode(pUndoOp, FALSE, FALSE);
}
-#endif
else if (pUndoOp->IsKindOf(CC_RUNTIME_CLASS(TransOperation)) &&
!pUndoOp->IS_KIND_OF(OpMovePathPoint))
@@ -2033,8 +2022,6 @@
TRACEUSER( "MarkH", _T("PreExport Rendering NODEBEVEL! <------------------------
"));
#ifdef DO_EXPORT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
if (pRender->IsKindOf(CC_RUNTIME_CLASS(EPSRenderRegion)))
{
// Output "start group" token
@@ -2057,6 +2044,8 @@
}
}
}
+PORTNOTE("cmx", "Removed use of CMXRenderRegion")
+#ifndef EXCLUDE_FROM_XARALX
else if(pRender->IsKindOf(CC_RUNTIME_CLASS(CMXRenderRegion)))
{
// mark start of a group...
@@ -2071,8 +2060,6 @@
BOOL NodeBevelController::ExportRender(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
if (pRegion->IsKindOf(CC_RUNTIME_CLASS(EPSRenderRegion)))
{
// Output "end group" token
@@ -2086,6 +2073,8 @@
// Tell caller we rendered ourselves ok
return TRUE;
}
+PORTNOTE("cmx", "Removed use of CMXRenderRegion")
+#ifndef EXCLUDE_FROM_XARALX
else if(pRegion->IsKindOf(CC_RUNTIME_CLASS(CMXRenderRegion)))
{
// mark start of a group...
@@ -2094,12 +2083,11 @@
return TRUE;
}
-
+#endif
if(m_pBevel)
m_pBevel->SetConvertingFlag();
#endif
-#endif
// Render this node in the normal way
return FALSE;
}
@@ -2357,8 +2345,6 @@
if (pOp)
{
// can't contour a bevelled object
-PORTNOTE("other","Removed OpCreateContour from NodeBevelController::AllowOp");
-#ifndef EXCLUDE_FROM_XARALX
if (pOp->IsKindOf(CC_RUNTIME_CLASS(OpCreateContour)) ||
pOp->IsKindOf(CC_RUNTIME_CLASS(OpChangeContourWidth)))
{
@@ -2369,7 +2355,6 @@
allowed = FALSE;
pParam->SetReasonForDenial(_R(IDS_CANT_REMOVE_BLEND_WHEN_BEVELLED));
}
-#endif
}
if (pParam->GetDirection() != OBJCHANGE_CALLEDBYCHILD ||
Index: Trunk/XaraLX/Kernel/nodeelip.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodeelip.cpp (revision 1314)
+++ Trunk/XaraLX/Kernel/nodeelip.cpp (revision 1315)
@@ -106,7 +106,7 @@
#include "nodeelip.h"
//#include "app.h"
-//#include "aw_eps.h"
+#include "aw_eps.h"
#include "blobs.h"
//#include "docview.h" - in camtypes.h [AUTOMATICALLY REMOVED]
//#include "opsmpshp.h"
@@ -241,8 +241,6 @@
void NodeEllipse::PreExportRender(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
if (pRegion->IsKindOf(CC_RUNTIME_CLASS(ArtWorksEPSRenderRegion)))
{
// Output "ArtWorks ellipse" token
@@ -254,11 +252,10 @@
pDC->OutputCoord(Parallel[2]);
// And the token itself
- pDC->OutputToken("ae");
+ pDC->OutputToken(_T("ae"));
pDC->OutputNewLine();
}
#endif
-#endif
}
Index: Trunk/XaraLX/Kernel/layer.cpp
===================================================================
--- Trunk/XaraLX/Kernel/layer.cpp (revision 1314)
+++ Trunk/XaraLX/Kernel/layer.cpp (revision 1315)
@@ -113,18 +113,18 @@
#include "aw_eps.h"
#include "ccdc.h"
//#include "rndrgn.h" - in camtypes.h [AUTOMATICALLY REMOVED]
-//#include "nativeps.h" // The old style EPS native filter, used in v1.1
+#include "nativeps.h" // The old style EPS native filter, used in v1.1
//#include "ben.h"
//#include "prdlgctl.h"
#include "printctl.h"
//#include "docview.h" - in camtypes.h [AUTOMATICALLY REMOVED]
//#include "jason.h"
-//#include "sglayer.h"
-//#include "cameleps.h"
+#include "sglayer.h"
+#include "cameleps.h"
#include "colourix.h"
#include "colmsg.h"
#include "cmxrendr.h"
-//#include "ai_epsrr.h"
+#include "ai_epsrr.h"
//-#include "cmxexdc.h"
//#include "tim.h"
@@ -432,10 +432,11 @@
if (pRender->IsHitDetect() && IsLocked())
return SUBTREE_NORENDER;
- PORTNOTE("printing","Layer::RenderSubtree - removed printing code and CamelotEPSRenderRegion reference");
+if (FALSE) {}
+PORTNOTE("printing","Layer::RenderSubtree - removed printing code reference")
#ifndef EXCLUDE_FROM_XARALX
// If we are printing then we do special things
- if (pRender->IsPrinting())
+ else if (pRender->IsPrinting())
{
// Ignore non-printable layers (i.e. don't ever print background layers)
if (!IsPrintable())
@@ -466,10 +467,10 @@
}
}
+#endif
else if (IS_A(pRender,CamelotEPSRenderRegion))
return (IsVisible() && IsPrintable()) ? SUBTREE_ROOTANDCHILDREN : SUBTREE_NORENDER;
else
-#endif
{
// Normal rendering
//
@@ -552,11 +553,8 @@
{
#ifdef DO_EXPORT
// If this is export as a ART file, we want to save all the layers
-PORTNOTE("NativeRR", "Removed use of NativeRenderRegion")
-#ifndef EXCLUDE_FROM_XARALX
if (pRender->IS_KIND_OF(NativeRenderRegion))
return TRUE;
-#endif
// If there's a filter running
// and it's trying to export just one layer
@@ -573,7 +571,7 @@
// if this is an export as a CMX file, we don't want invisible layers
// as CMX doesn't support non-visible stuff so we can't save it and
// get the file looking the same
-PORTNOTE("CMXRenderRegion", "Removed use of CMXRenderRegion")
+PORTNOTE("cmx", "Removed use of CMXRenderRegion")
#ifndef EXCLUDE_FROM_XARALX
if(!IsVisible() && pRender->IS_KIND_OF(CMXRenderRegion))
return FALSE;
@@ -983,8 +981,6 @@
BOOL Layer::HidingNode()
{
- PORTNOTETRACE("other","Layer::HidingNode - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
// Call the base class first
if (!Node::HidingNode())
return FALSE;
@@ -1009,12 +1005,15 @@
}
else
{
+PORTNOTE("other", "Disabled frame gallery")
+#ifndef EXCLUDE_FROM_XARALX
// Choose the next/prev frame layer to be the new active one
Layer* pNewActiveLayer = FindPrevFrameLayer();
if (pNewActiveLayer == NULL)
pNewActiveLayer = FindNextFrameLayer();
if (pNewActiveLayer != NULL)
FrameSGallery::MakeActiveLayer(pNewActiveLayer);
+#endif
}
}
@@ -1039,7 +1038,7 @@
pLayer->SetEdited(TRUE);
#ifdef _DEBUG
// Tell the frame gallery to update its display of the frame
- BROADCAST_TO_ALL(LayerMsg(pLayer, LayerMsg::LayerReason::REDRAW_LAYER));
+ BROADCAST_TO_ALL(LayerMsg(pLayer, LayerMsg::REDRAW_LAYER));
#endif
}
@@ -1048,7 +1047,6 @@
}
}
}
-#endif
return TRUE;
}
@@ -2397,8 +2395,6 @@
void Layer::PreExportRender(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("EPSFilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
if(pRegion->IsKindOf(CC_RUNTIME_CLASS(ArtWorksEPSRenderRegion)))
{
// export layers in ArtWorks-type EPS render regions
@@ -2466,6 +2462,8 @@
pDC->OutputNewLine();
}
+PORTNOTE("cmx", "Disabled CMXRenderRegion")
+#ifndef EXCLUDE_FROM_XARALX
else if(pRegion->IsKindOf(CC_RUNTIME_CLASS(CMXRenderRegion)))
{
// mark start of a group...
@@ -2492,8 +2490,6 @@
BOOL Layer::ExportRender(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("EPSFilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
// Can only export guide layers in Native format
if (Guide && pRegion->IS_KIND_OF(NativeRenderRegion))
{
@@ -2502,6 +2498,8 @@
pDC->OutputToken(_T("ceo"));
pDC->OutputNewLine();
}
+PORTNOTE("cmx", "Disabled CMXRenderRegion")
+#ifndef EXCLUDE_FROM_XARALX
else if(pRegion->IsKindOf(CC_RUNTIME_CLASS(CMXRenderRegion)))
{
// mark start of a group...
@@ -2510,7 +2508,7 @@
return TRUE;
}
-
+#endif
// Graeme (11-4-00) - Added call to AIEPSRenderRegion to export layers in that format.
else if ( pRegion->IsKindOf ( CC_RUNTIME_CLASS ( AIEPSRenderRegion ) ) )
{
@@ -2523,9 +2521,7 @@
// Return TRUE to avoid calling the standard exporter code.
return TRUE;
}
-
#endif
-#endif
return FALSE;
}
@@ -3238,12 +3234,9 @@
if (pChangedColour == pColour)
{
-PORTNOTE("dialog","Removed LayerGallery usage");
-#ifndef EXCLUDE_FROM_XARALX
Document* pDoc = Document::GetCurrent();
if (pDoc != NULL)
LayerSGallery::ForceRedrawLayer(pDoc,this);
-#endif
}
#endif
#endif // WEBSTER
Index: Trunk/XaraLX/Kernel/nodershp.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodershp.cpp (revision 1314)
+++ Trunk/XaraLX/Kernel/nodershp.cpp (revision 1315)
@@ -106,9 +106,9 @@
//#include "app.h" - in camtypes.h [AUTOMATICALLY REMOVED]
//#include "becomea.h" - in camtypes.h [AUTOMATICALLY REMOVED]
#include "blobs.h"
-//#include "cameleps.h"
-//#include "nativeps.h" // The old style EPS native filter, used in v1.1
-//#include "swfrndr.h" // For the Flash render region class.
+#include "cameleps.h"
+#include "nativeps.h" // The old style EPS native filter, used in v1.1
+#include "swfrndr.h" // For the Flash render region class.
#include "contmenu.h"
//#include "docview.h" - in camtypes.h [AUTOMATICALLY REMOVED]
//#include "fillval.h" - in camtypes.h [AUTOMATICALLY REMOVED]
@@ -3969,17 +3969,14 @@
void NodeRegularShape::PreExportRender(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
if (pRegion->IsKindOf(CC_RUNTIME_CLASS(NativeRenderRegion)))
{
// Output "start regular shape" token
EPSExportDC *pDC = (EPSExportDC *) pRegion->GetRenderDC();
- pDC->OutputToken("csrs");
+ pDC->OutputToken(_T("csrs"));
pDC->OutputNewLine();
}
#endif
-#endif
}
@@ -4001,8 +3998,6 @@
BOOL NodeRegularShape::ExportRender(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
if (pRegion->IsKindOf(CC_RUNTIME_CLASS(NativeRenderRegion)))
{
EPSExportDC *pDC = (EPSExportDC *) pRegion->GetRenderDC();
@@ -4038,7 +4033,7 @@
pDC->OutputCoord(UTMinorAxes);
pDC->OutputValue(IsFilled);
pDC->OutputValue(IsStroked);
- pDC->OutputToken("crsp");
+ pDC->OutputToken(_T("crsp"));
pDC->OutputNewLine();
// Output the transformation matrix
@@ -4051,19 +4046,19 @@
pDC->OutputReal(billy[3].MakeDouble());
pDC->OutputUserSpaceValue(bobby[0]);
pDC->OutputUserSpaceValue(bobby[1]);
- pDC->OutputToken("crstm");
+ pDC->OutputToken(_T("crstm"));
pDC->OutputNewLine();
// Output the paths for the shape's two edges
((EPSRenderRegion*)pRegion)->ExportPath(&EdgePath1, TRUE);
- pDC->OutputToken("crsp1");
+ pDC->OutputToken(_T("crsp1"));
pDC->OutputNewLine();
((EPSRenderRegion*)pRegion)->ExportPath(&EdgePath2, TRUE);
- pDC->OutputToken("crsp2");
+ pDC->OutputToken(_T("crsp2"));
pDC->OutputNewLine();
// End the regular shape object
- pDC->OutputToken("cers");
+ pDC->OutputToken(_T("cers"));
pDC->OutputNewLine();
// Tell caller we rendered ourselves ok
@@ -4079,7 +4074,6 @@
}
#endif
-#endif
// Render the node in the normal way
return FALSE;
}
Index: Trunk/XaraLX/Kernel/bmpcomp.cpp
===================================================================
--- Trunk/XaraLX/Kernel/bmpcomp.cpp (revision 1314)
+++ Trunk/XaraLX/Kernel/bmpcomp.cpp (revision 1315)
@@ -799,9 +799,6 @@
BOOL BitmapListComponent::WriteScript(EPSFilter* pFilter)
{
#ifdef DO_EXPORT
-PORTNOTE("EPSFilter", "Removed use of EPSFilter")
-#if !defined(EXCLUDE_FROM_XARALX)
-
// This only happens in Native EPS
if (pFilter->IS_KIND_OF(CamelotNativeEPSFilter))
{
@@ -857,7 +854,6 @@
}
#endif
-#endif
return TRUE;
}
@@ -883,8 +879,6 @@
BOOL BitmapListComponent::ExportBitmapPoolItem(INT32 BitmapNum, EPSFilter* pFilter, EPSExportDC* pDC, KernelBitmap* pBitmap)
{
#ifdef DO_EXPORT
-PORTNOTE("EPSFilter", "Removed use of EPSFilter")
-#if !defined(EXCLUDE_FROM_XARALX)
ERROR2IF(pBitmap->HasBeenDeleted(), FALSE, "Trying to export a deleted bitmap");
if (pFilter->IS_KIND_OF(CamelotNativeEPSFilter))
@@ -902,7 +896,6 @@
return TRUE;
}
#endif
-#endif
return FALSE;
}
Index: Trunk/XaraLX/Kernel/ndmldpth.cpp
===================================================================
--- Trunk/XaraLX/Kernel/ndmldpth.cpp (revision 1314)
+++ Trunk/XaraLX/Kernel/ndmldpth.cpp (revision 1315)
@@ -434,14 +434,11 @@
BOOL NodeMouldPath::ExportRender(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("EPSRenderRegion", "Removed use of EPSRenderegion")
-#if !defined(EXCLUDE_FROM_XARALX)
if (pRegion->IS_KIND_OF(NativeRenderRegion))
return ExportCAMEPS(pRegion);
if (pRegion->IS_KIND_OF(ArtWorksEPSRenderRegion))
return ExportAWEPS(pRegion);
-#endif
#endif
return FALSE;
}
@@ -467,8 +464,6 @@
BOOL NodeMouldPath::ExportCAMEPS(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
EPSExportDC *pDC = (EPSExportDC *) pRegion->GetRenderDC();
// If we're hanging around in a mould then export the correct tokens
@@ -478,17 +473,16 @@
}
else
{
- pDC->OutputToken("csmp"); // Camelot "start mould path" token
+ pDC->OutputToken(_T("csmp")); // Camelot "start mould path" token
pDC->OutputNewLine();
// Call the parent class
NodePath::Render(pRegion);
- pDC->OutputToken("cemp"); // Camelot "start mould path" token
+ pDC->OutputToken(_T("cemp")); // Camelot "start mould path" token
pDC->OutputNewLine();
}
#endif
-#endif
return TRUE;
}
Index: Trunk/XaraLX/Kernel/guides.cpp
===================================================================
--- Trunk/XaraLX/Kernel/guides.cpp (revision 1314)
+++ Trunk/XaraLX/Kernel/guides.cpp (revision 1315)
@@ -472,8 +472,6 @@
// WEBSTER - markn 14/1/97
#ifndef WEBSTER
#ifdef DO_EXPORT
-PORTNOTE("EPSRenderRegion", "Removed use fo EPSRenderRegion")
-#if !defined(EXCLUDE_FROM_XARALX)
if (pRegion->IS_KIND_OF(NativeRenderRegion))
{
EPSExportDC *pDC = (EPSExportDC *) pRegion->GetRenderDC();
@@ -489,7 +487,6 @@
pDC->OutputNewLine();
}
#endif
-#endif
#endif // WEBSTER
}
@@ -511,8 +508,6 @@
// WEBSTER - markn 14/1/97
#ifndef WEBSTER
#ifdef DO_EXPORT
-PORTNOTE("EPSRenderRegion", "Removed use fo EPSRenderRegion")
-#if !defined(EXCLUDE_FROM_XARALX)
if (pRegion->IS_KIND_OF(NativeRenderRegion))
{
/*EPSExportDC *pDC = */ (EPSExportDC *) pRegion->GetRenderDC();
@@ -521,7 +516,6 @@
// pDC->OutputNewLine();
}
#endif
-#endif
#endif // WEBSTER
return TRUE;
}
@@ -597,11 +591,8 @@
if (pRender->IsPrinting())
return SUBTREE_NORENDER;
-PORTNOTE("epsrr", "Removed use of EPSRenderRegion")
-#if !defined(EXCLUDE_FROM_XARALX)
if (pRender->IS_KIND_OF(EPSRenderRegion))
return SUBTREE_NORENDER;
-#endif
return SUBTREE_ROOTANDCHILDREN;
#else
@@ -636,10 +627,7 @@
// WEBSTER - markn 14/1/97
#ifdef DO_EXPORT
#ifndef WEBSTER
-PORTNOTE("NativeRenderRegion","Removed NativeRenderRegion usage")
-#ifndef EXCLUDE_FROM_XARALX
return (pRender->IS_KIND_OF(NativeRenderRegion));
-#endif
#endif // WEBSTER
#endif
return FALSE;
@@ -1451,12 +1439,7 @@
RenderMyDragBlobs();
-PORTNOTE("keypress", "Use of KeyPress class bypassed in TransOperation::DragStarted");
-#ifndef EXCLUDE_FROM_XARALX
LeaveCopy = KeyPress::IsKeyPressed(CAMKEY(ADD));
-#else
- LeaveCopy = FALSE;
-#endif
if (pCursor == NULL)
{
@@ -1652,8 +1635,6 @@
BOOL OpGuideline::DragKeyPress(KeyPress* pKeyPress, BOOL bSolidDrag)
{
BOOL Processed = FALSE;
-PORTNOTE("keypress", "Use of KeyPress class bypassed in TransOperation::DragStarted");
-#ifndef EXCLUDE_FROM_XARALX
switch (pKeyPress->GetVirtKey())
{
case CAMKEY(ADD):
@@ -1670,7 +1651,6 @@
Processed = TRUE;
break;
}
-#endif
return Processed;
}
Index: Trunk/XaraLX/Kernel/nodemold.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodemold.cpp (revision 1314)
+++ Trunk/XaraLX/Kernel/nodemold.cpp (revision 1315)
@@ -133,7 +133,7 @@
//#include "docview.h" - in camtypes.h [AUTOMATICALLY REMOVED]
//#include "spread.h" - in camtypes.h [AUTOMATICALLY REMOVED]
#include "aw_eps.h"
-//#include "nativeps.h" // The old style EPS native filter, used in v1.1
+#include "nativeps.h" // The old style EPS native filter, used in v1.1
//#include "moldtool.h"
//#include "fillattr.h" // For AttrFillGeometry::RemovePerspective() - in camtypes.h [AUTOMATICALLY REMOVED]
//#include "resource.h" // For _R(IDS_OK)/CANCEL
@@ -2500,8 +2500,6 @@
void NodeMould::PreExportRender(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
if (pRegion->IS_KIND_OF(NativeRenderRegion))
{
PreExportCAMEPS(pRegion);
@@ -2514,7 +2512,6 @@
return;
}
#endif
-#endif
}
/*********************************************************************************************
@@ -2536,15 +2533,12 @@
BOOL NodeMould::ExportRender(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
if (pRegion->IS_KIND_OF(NativeRenderRegion))
return PostExportCAMEPS(pRegion);
if (pRegion->IS_KIND_OF(ArtWorksEPSRenderRegion))
return PostExportAWEPS(pRegion);
#endif
-#endif
return FALSE;
}
@@ -2553,8 +2547,6 @@
void NodeMould::PreExportCAMEPS(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
MouldSpace mSpace = DescribeGeometry();
EPSExportDC *pDC = (EPSExportDC *) pRegion->GetRenderDC();
@@ -2564,14 +2556,14 @@
case MOULDSPACE_ENVELOPE:
if (IsDetached())
InformWarning(_R(IDS_SAVE_WHILE_DETACHEDE), _R(IDS_OK));
- pDC->OutputToken("csev"); // Camelot "start envelope" token
+ pDC->OutputToken(_T("csev")); // Camelot "start envelope" token
break;
case MOULDSPACE_PERSPECTIVE:
if (IsDetached())
InformWarning(_R(IDS_SAVE_WHILE_DETACHEDP), _R(IDS_OK));
- pDC->OutputToken("cspr"); // Camelot "start perspective" token
+ pDC->OutputToken(_T("cspr")); // Camelot "start perspective" token
break;
default:
@@ -2585,17 +2577,16 @@
INT32 Threshold = GetGeometry()->GetThreshold();
if (Threshold != MOULD_V1THRESHOLD)
{
- pDC->OutputValue((INT32)TAG_MOULDTHRESHOLD);
- pDC->OutputToken("cso");
+ pDC->OutputValue((INT32)EOTAG_MOULDTHRESHOLD);
+ pDC->OutputToken(_T("cso"));
pDC->OutputNewLine();
pDC->OutputValue(Threshold);
- pDC->OutputToken("cmth");
+ pDC->OutputToken(_T("cmth"));
pDC->OutputNewLine();
- pDC->OutputToken("ceo");
+ pDC->OutputToken(_T("ceo"));
pDC->OutputNewLine();
}
#endif
-#endif
}
@@ -2604,25 +2595,22 @@
BOOL NodeMould::PostExportCAMEPS(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
MouldSpace mSpace = DescribeGeometry();
EPSExportDC *pDC = (EPSExportDC *) pRegion->GetRenderDC();
switch (mSpace)
{
case MOULDSPACE_ENVELOPE:
- pDC->OutputToken("ceev"); // Camelot "end envelope" token
+ pDC->OutputToken(_T("ceev")); // Camelot "end envelope" token
break;
case MOULDSPACE_PERSPECTIVE:
- pDC->OutputToken("cepr"); // Camelot "end perspective" token
+ pDC->OutputToken(_T("cepr")); // Camelot "end perspective" token
break;
default:
break;
}
pDC->OutputNewLine();
#endif
-#endif
return TRUE;
}
Index: Trunk/XaraLX/Kernel/ppstroke.cpp
===================================================================
--- Trunk/XaraLX/Kernel/ppstroke.cpp (revision 1314)
+++ Trunk/XaraLX/Kernel/ppstroke.cpp (revision 1315)
@@ -266,14 +266,11 @@
// (ChrisG 4/11/00) - Use smoothed paths with AIExport. This is only done for the export, as the smooth
// path creation function is about five times slower than the non-smoothed one.
Path * pOutput = NULL;
- PORTNOTETRACE("other","PathProcessorStroke::ProcessPath - removed AIEPSRenderRegion support");
-#ifndef EXCLUDE_FROM_XARALX
if (pRender->IsKindOf (CC_RUNTIME_CLASS (AIEPSRenderRegion)))
{
pOutput = CreateSmoothVarWidthStroke(pPath, pRender, LineWidth);
}
else
-#endif
{
pOutput = CreateVarWidthStroke(pPath, pRender, LineWidth);
}
Index: Trunk/XaraLX/Kernel/nodebmp.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodebmp.cpp (revision 1314)
+++ Trunk/XaraLX/Kernel/nodebmp.cpp (revision 1315)
@@ -110,8 +110,8 @@
//#include "fillattr.h" - in camtypes.h [AUTOMATICALLY REMOVED]
#include "lineattr.h"
//#include "progress.h"
-//#include "cameleps.h"
-//#include "ai_epsrr.h"
+#include "cameleps.h"
+#include "ai_epsrr.h"
#include "bitmpinf.h"
#include "nodepath.h"
//#include "becomea.h" - in camtypes.h [AUTOMATICALLY REMOVED]
@@ -120,7 +120,7 @@
#include "cliptype.h"
#include "attrmap.h"
-//#include "colormgr.h"
+#include "colormgr.h"
//#include "attrmgr.h" - in camtypes.h [AUTOMATICALLY REMOVED]
//#include "jason.h"
//#include "justin2.h"
@@ -624,8 +624,6 @@
BOOL NodeBitmap::ExportRender(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
if (pRegion->IsKindOf(CC_RUNTIME_CLASS(CamelotEPSRenderRegion)))
{
// Get valid transparency fill for this object
@@ -700,13 +698,13 @@
PColourCMYK CMYK;
StartCol.GetCMYKValue(&CMYK);
pDC->OutputColour(&CMYK);
- pDC->OutputToken("K");
+ pDC->OutputToken(_T("K"));
}
else
{
// Named colour
pDC->OutputNamedColour(&StartCol);
- pDC->OutputToken("X");
+ pDC->OutputToken(_T("X"));
}
pDC->OutputNewLine();
@@ -730,13 +728,13 @@
PColourCMYK CMYK;
EndCol.GetCMYKValue(&CMYK);
pDC->OutputColour(&CMYK);
- pDC->OutputToken("k");
+ pDC->OutputToken(_T("k"));
}
else
{
// Named colour
pDC->OutputNamedColour(&EndCol);
- pDC->OutputToken("x");
+ pDC->OutputToken(_T("x"));
}
pDC->OutputNewLine();
@@ -747,7 +745,7 @@
pDC->OutputCoord(Coords[i]);
// ...then the bitmap object token.
- pDC->OutputToken("cbm");
+ pDC->OutputToken(_T("cbm"));
pDC->OutputNewLine();
// ...and then the bitmap data itself.
@@ -774,12 +772,12 @@
// the viewer), telling the main program that the following
// object is really a bitmap object
- pDC->OutputValue((INT32) TAG_BITMAPFLAGS);
- pDC->OutputToken("cso"); // Start of new object type
+ pDC->OutputValue((INT32) EOTAG_BITMAPFLAGS);
+ pDC->OutputToken(_T("cso")); // Start of new object type
- pDC->OutputToken("cbot"); // Flag the next bitmap fill as an object
+ pDC->OutputToken(_T("cbot")); // Flag the next bitmap fill as an object
- pDC->OutputToken("ceo"); // End of new object type
+ pDC->OutputToken(_T("ceo")); // End of new object type
pDC->OutputNewLine();
// Now output the Bitmap fill
@@ -788,7 +786,7 @@
pDC->OutputCoord(Coords[0]);
pDC->OutputValue((INT32) CAMEPS_FILL_BITMAP);
- pDC->OutputToken("cax");
+ pDC->OutputToken(_T("cax"));
pDC->OutputNewLine();
// ...and then the bitmap data itself.
@@ -797,21 +795,21 @@
// Now output a filled path for the Viewer to render
// This will be skipped over by the new import code
pDC->OutputCoord(Coords[0]);
- pDC->OutputToken(TEXT("m"));
+ pDC->OutputToken(_T("m"));
pDC->OutputNewLine();
pDC->OutputCoord(Coords[1]);
- pDC->OutputToken(TEXT("l"));
+ pDC->OutputToken(_T("l"));
pDC->OutputNewLine();
pDC->OutputCoord(Coords[2]);
- pDC->OutputToken(TEXT("l"));
+ pDC->OutputToken(_T("l"));
pDC->OutputNewLine();
pDC->OutputCoord(Coords[3]);
- pDC->OutputToken(TEXT("l"));
+ pDC->OutputToken(_T("l"));
pDC->OutputNewLine();
pDC->OutputCoord(Coords[0]);
- pDC->OutputToken(TEXT("l"));
+ pDC->OutputToken(_T("l"));
pDC->OutputNewLine();
- pDC->OutputToken("F"); // Filled path
+ pDC->OutputToken(_T("F")); // Filled path
pDC->OutputNewLine();
}
@@ -841,6 +839,8 @@
// Tell caller we rendered ourselves ok
return TRUE;
}
+PORTNOTE("cmx", "Disabled CMXRenderRegion")
+#ifndef EXCLUDE_FROM_XARALX
else if (pRegion->IsKindOf(CC_RUNTIME_CLASS(CMXRenderRegion)))
{
// mark start of a group...
@@ -854,6 +854,7 @@
return TRUE;
}
+#endif
else if ( pRegion->IsKindOf ( CC_RUNTIME_CLASS ( AIEPSRenderRegion ) ) )
{
// Grab a pointer to the AIEPS_RenderRegion.
@@ -864,7 +865,6 @@
}
#endif
-#endif
// Render this node in the normal way
return FALSE;
}
Index: Trunk/XaraLX/Kernel/nodecont.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodecont.cpp (revision 1314)
+++ Trunk/XaraLX/Kernel/nodecont.cpp (revision 1315)
@@ -3621,15 +3621,15 @@
void NodeShadowController::PreExportRender(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
if (pRegion->IsKindOf(CC_RUNTIME_CLASS(EPSRenderRegion)))
{
// Output "start group" token
EPSExportDC *pDC = (EPSExportDC *) pRegion->GetRenderDC();
- pDC->OutputToken("u");
+ pDC->OutputToken(_T("u"));
pDC->OutputNewLine();
}
+PORTNOTE("cmx", "Removed use of CMXRenderRegion")
+#ifndef EXCLUDE_FROM_XARALX
else if(pRegion->IsKindOf(CC_RUNTIME_CLASS(CMXRenderRegion)))
{
// mark start of a group...
@@ -3644,18 +3644,18 @@
BOOL NodeShadowController::ExportRender(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
if (pRegion->IsKindOf(CC_RUNTIME_CLASS(EPSRenderRegion)))
{
// Output "end group" token
EPSExportDC *pDC = (EPSExportDC *) pRegion->GetRenderDC();
- pDC->OutputToken("U");
+ pDC->OutputToken(_T("U"));
pDC->OutputNewLine();
// Tell caller we rendered ourselves ok
return TRUE;
}
+PORTNOTE("cmx", "Removed use of CMXRenderRegion")
+#ifndef EXCLUDE_FROM_XARALX
else if(pRegion->IsKindOf(CC_RUNTIME_CLASS(CMXRenderRegion)))
{
// mark start of a group...
Index: Trunk/XaraLX/Kernel/nodetxts.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodetxts.cpp (revision 1314)
+++ Trunk/XaraLX/Kernel/nodetxts.cpp (revision 1315)
@@ -107,7 +107,7 @@
//#include "app.h" - in camtypes.h [AUTOMATICALLY REMOVED]
//#include "becomea.h" - in camtypes.h [AUTOMATICALLY REMOVED]
#include "blobs.h"
-//#include "cameleps.h"
+#include "cameleps.h"
#include "contmenu.h"
//#include "docview.h" - in camtypes.h [AUTOMATICALLY REMOVED]
//#include "fillattr.h" - in camtypes.h [AUTOMATICALLY REMOVED]
@@ -126,8 +126,8 @@
//#include "tool.h" - in camtypes.h [AUTOMATICALLY REMOVED]
//#include "txtattr.h" - in camtypes.h [AUTOMATICALLY REMOVED]
#include "textfuns.h"
-//#include "nativeps.h" // The old style EPS native filter, used in v1.1
-//#include "ai_epsrr.h"
+#include "nativeps.h" // The old style EPS native filter, used in v1.1
+#include "ai_epsrr.h"
#include "progress.h"
//#include "camfiltr.h" - in camtypes.h [AUTOMATICALLY REMOVED]
#include "cxftext.h"
@@ -2766,8 +2766,6 @@
void TextStory::PreExportRender(RenderRegion* pRegion)
{
#if EXPORT_TEXT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
BOOL exportingAsShapes = FALSE;
// Determine whether or not to export AI text as shapes (i.e. if there are any
@@ -2801,7 +2799,7 @@
pDC->OutputValue((INT32)0);
// text object token
- pDC->OutputToken("To");
+ pDC->OutputToken(_T("To"));
pDC->OutputNewLine();
// output the story matrix. We need to make this relative to the spread the
@@ -2829,7 +2827,7 @@
// null start point
pDC->OutputValue((INT32)0);
// start path
- pDC->OutputToken("Tp");
+ pDC->OutputToken(_T("Tp"));
pDC->OutputNewLine();
// export the path
@@ -2903,7 +2901,7 @@
}
// end path
- pDC->OutputToken("TP");
+ pDC->OutputToken(_T("TP"));
pDC->OutputNewLine();
if (pRegion->IsKindOf(CC_RUNTIME_CLASS(AIEPSRenderRegion)))
@@ -2919,17 +2917,17 @@
// (ChrisG - 8/11/00) Added support for automatic kerning.
if (AutoKern)
- pDC->OutputValue (1l);
+ pDC->OutputValue ((INT32)1);
else
- pDC->OutputValue (0l);
+ pDC->OutputValue ((INT32)0);
- pDC->OutputToken ("TA"); // automatic kerning TA
+ pDC->OutputToken (_T("TA")); // automatic kerning TA
pDC->OutputNewLine();
- pDC->OutputToken("0 0 0 TC"); // Character spacing TC
+ pDC->OutputToken(_T("0 0 0 TC")); // Character spacing TC
pDC->OutputNewLine();
- pDC->OutputToken("100 100 100 TW"); // Word spacing TW
+ pDC->OutputToken(_T("100 100 100 TW")); // Word spacing TW
pDC->OutputNewLine();
- pDC->OutputToken("0 0 0 Ti"); // Line indentation Ti
+ pDC->OutputToken(_T("0 0 0 Ti")); // Line indentation Ti
pDC->OutputNewLine();
// (ChrisG - 3/11/00)
@@ -2943,7 +2941,7 @@
{
// Output "extras" token for text
EPSExportDC *pDC = (EPSExportDC *) pRegion->GetRenderDC();
- EPSRenderRegion* pEPSRegion = (EPSRenderRegion*)pRegion;
+// EPSRenderRegion* pEPSRegion = (EPSRenderRegion*)pRegion;
INT32 WordWrapping = (IsWordWrapping() ? 1 : 0);
pDC->OutputValue(WordWrapping);
@@ -2961,7 +2959,7 @@
// Output version zero and token
pDC->OutputValue((INT32)0);
- pDC->OutputToken("ctex");
+ pDC->OutputToken(_T("ctex"));
pDC->OutputNewLine();
// Version one stuff
@@ -2970,12 +2968,11 @@
// Output version and token
pDC->OutputValue((INT32)1);
- pDC->OutputToken("ctex");
+ pDC->OutputToken(_T("ctex"));
pDC->OutputNewLine();*/
}
}
#endif
-#endif
}
@@ -2993,8 +2990,6 @@
BOOL TextStory::ExportRender(RenderRegion* pRegion)
{
#if EXPORT_TEXT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
// (ChrisG 8/11/00) - Reset the 'exporting text as shapes' flag, so that it's valid for
// the next text story - also don't export the 'end of text object' data if we aren't
// exporting a text object.
@@ -3014,7 +3009,7 @@
{
// Output "End text object" token
EPSExportDC *pDC = (EPSExportDC *) pRegion->GetRenderDC();
- pDC->OutputToken("TO");
+ pDC->OutputToken(_T("TO"));
pDC->OutputNewLine();
// output token if text is wrapped
@@ -3022,17 +3017,16 @@
{
if (WillStoryWrapOnPath())
{
- pDC->OutputValue((INT32)TAG_TEXTWRAPPED);
- pDC->OutputToken("cso");
+ pDC->OutputValue((INT32)EOTAG_TEXTWRAPPED);
+ pDC->OutputToken(_T("cso"));
pDC->OutputNewLine();
- pDC->OutputToken("ceo");
+ pDC->OutputToken(_T("ceo"));
pDC->OutputNewLine();
}
}
return TRUE;
}
#endif
-#endif
return FALSE;
}
Index: Trunk/XaraLX/Kernel/nodetext.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodetext.cpp (revision 1314)
+++ Trunk/XaraLX/Kernel/nodetext.cpp (revision 1315)
@@ -114,7 +114,7 @@
//#include "app.h" - in camtypes.h [AUTOMATICALLY REMOVED]
//#include "becomea.h"
#include "blobs.h"
-//#include "cameleps.h"
+#include "cameleps.h"
#include "cliptype.h"
//#include "docview.h" - in camtypes.h [AUTOMATICALLY REMOVED]
#include "gdraw.h"
@@ -130,7 +130,7 @@
#include "printctl.h"
#include "cxftext.h"
#include "nodepath.h"
-//#include "swfrndr.h"
+#include "swfrndr.h"
// Resource headers
//#include "mario.h"
@@ -140,7 +140,7 @@
#include "webattr.h" //For the GetClickableRectangle functions
#include "brshattr.h"
-//#include "ai_epsrr.h"
+#include "ai_epsrr.h"
DECLARE_SOURCE("$Revision$")
@@ -2031,7 +2031,7 @@
// render the character through the matrix with current attributes in RenderRegion
-PORTNOTE("other", "printing and AI export deactivated")
+PORTNOTE("printing", "printing deactivated")
#ifndef EXCLUDE_FROM_XARALX
// If the render region is a printing region then maybe print as shapes.
if (pRenderRegion->IsPrinting())
@@ -2044,6 +2044,7 @@
return pRenderRegion->RenderRegion::RenderChar(GetUnicodeValue(), &matrix);
}
}
+#endif
// if we're exporting to illustrator, make the text position relative to
// the page.
@@ -2065,7 +2066,6 @@
}
}
}
-#endif
// Render into the given region region as characters
BOOL Result = pRenderRegion->RenderChar(GetUnicodeValue(), &matrix);
@@ -2166,8 +2166,6 @@
BOOL TextChar::ExportRender ( RenderRegion *pRegion )
{
- PORTNOTETRACE("text","TextChar::ExportRender - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
BOOL bResult = FALSE;
// If the RenderRegion is a FlashRenderRegion, use custom Flash export code.
@@ -2190,8 +2188,6 @@
// from rendering the character out as paths as well as text. (If there's
// been an error, bResult will have been set to FALSE.)
return bResult;
-#endif
- return false;
}
/********************************************************************************************
@@ -2266,7 +2262,6 @@
{
BOOL Snapped = FALSE;
- PORTNOTETRACE("text","TextChar::Snap - do nothing");
#if !defined(EXCLUDE_FROM_RALPH)
// MILLIPOINT SnapDist = CSnap::GetSnapDist();
// MILLIPOINT SqrSnapDist = SnapDist*SnapDist;
@@ -2774,18 +2769,15 @@
BOOL CaretNode::ExportRender(RenderRegion* pRegion)
{
#if EXPORT_TEXT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
// BODGE TEXT - need to export caret in a comment!
if (pRegion->IsKindOf(CC_RUNTIME_CLASS(EPSRenderRegion)))
{
- EPSExportDC *pDC=(EPSExportDC*)pRegion->GetRenderDC();
+ /*EPSExportDC *pDC=*/(EPSExportDC*)pRegion->GetRenderDC();
// pDC->OutputToken("ctk");
// pDC->OutputNewLine();
return TRUE;
}
#endif
-#endif
return FALSE;
}
@@ -3531,8 +3523,6 @@
BOOL EOLNode::ExportRender(RenderRegion* pRegion)
{
#if EXPORT_TEXT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
// (ChrisG - 3/11/00)
if (pRegion->IsKindOf(CC_RUNTIME_CLASS(AIEPSRenderRegion)))
@@ -3547,9 +3537,6 @@
#else
return FALSE;
#endif
-#else
- return FALSE;
-#endif
}
@@ -3628,8 +3615,6 @@
BOOL KernCode::ExportRender(RenderRegion* pRegion)
{
#if EXPORT_TEXT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
if (pRegion->IsKindOf(CC_RUNTIME_CLASS(EPSRenderRegion)))
{
// Output any valid text attributes necessary
@@ -3643,12 +3628,11 @@
INT32 autokern = 0;
pDC->OutputValue(autokern);
pDC->OutputValue(-(Value.x));
- pDC->OutputToken("Tk");
+ pDC->OutputToken(_T("Tk"));
pDC->OutputNewLine();
return TRUE;
}
#endif
-#endif
return FALSE;
}
Index: Trunk/XaraLX/Kernel/impexpop.cpp
===================================================================
--- Trunk/XaraLX/Kernel/impexpop.cpp (revision 1314)
+++ Trunk/XaraLX/Kernel/impexpop.cpp (revision 1315)
@@ -129,7 +129,7 @@
//#include "barsdlgs.h" // for the import/export bar controls
#include "bitfilt.h" // BaseBitmapFilter
-//#include "cameleps.h"
+#include "cameleps.h"
//#include "oilfltrs.h" - in camtypes.h [AUTOMATICALLY REMOVED]
//#include "will3.h"
#include "bmpsdlg.h"
@@ -370,12 +370,7 @@
{
if( NULL != pFilter->pOILFilter )
{
-PORTNOTE("other", "Removed CamelotEPSFilter check" )
-#if !defined(EXCLUDE_FROM_XARALX)
if( ( pFilter->GetFlags().CanImport && !IS_A( pFilter, CamelotEPSFilter ) ) &&
-#else
- if( pFilter->GetFlags().CanImport &&
-#endif
pFilter->pOILFilter->Position == SelectedFilter )
{
TRACEUSER( "luke", _T("%s is THE filter (%d)"),
@@ -1151,8 +1146,6 @@
// Graeme (11-4-00) - Added FILTERID_AIEPS to stop the warnings when doing an
// AI format export. After all, the AIEPS filter is probably better specified
// these days than the other EPS filters.
-PORTNOTE("other", "Removed EPSFilter usage" )
-#if !defined(EXCLUDE_FROM_XARALX)
if (TheSelectedFilterID != FILTERID_CAMELOT_EPS &&
TheSelectedFilterID != FILTERID_NATIVE_EPS &&
TheSelectedFilterID != FILTERID_AIEPS
@@ -1177,7 +1170,6 @@
return;
}
}
-#endif
BOOL fExportedOk = FALSE;
Index: Trunk/XaraLX/Kernel/colcomp.cpp
===================================================================
--- Trunk/XaraLX/Kernel/colcomp.cpp (revision 1314)
+++ Trunk/XaraLX/Kernel/colcomp.cpp (revision 1315)
@@ -2124,8 +2124,6 @@
BOOL ColourListComponent::EPSStartImport(EPSFilter *pFilter)
{
- PORTNOTETRACE("filters","ColourListComponent::EPSStartImport - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
// Is this a Camelot EPS filter?
BOOL CamelotEPS = pFilter->IS_KIND_OF(CamelotEPSFilter);
@@ -2141,9 +2139,6 @@
// Must have worked
return TRUE;
-#else
- return FALSE;
-#endif
}
/********************************************************************************************
@@ -2163,8 +2158,6 @@
void ColourListComponent::EPSEndImport(EPSFilter *pFilter, BOOL Success)
{
- PORTNOTETRACE("filters","ColourListComponent::EPSEndImport - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
ERROR3IF(pNewColours == NULL, "No colour table in EndEPSImport");
// If we didn't even get to initialise, then return quietly.
@@ -2186,7 +2179,6 @@
// Finally, delete the IndexedColour table.
delete pNewColours;
pNewColours = NULL;
-#endif
}
@@ -2254,8 +2246,6 @@
BOOL ColourListComponent::WriteEPSComments(EPSFilter *pFilter)
{
#ifdef DO_EXPORT
-PORTNOTE("EPSFilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
if (pFilter->IsKindOf(CC_RUNTIME_CLASS(ArtWorksEPSFilter)))
{
// Is it a Camelot specific filter?
@@ -2379,7 +2369,6 @@
}
}
#endif
-#endif
// All ok.
return TRUE;
}
@@ -2834,35 +2823,33 @@
ProcessEPSResult ColourListComponent::ProcessEPSComment(EPSFilter *pFilter,
PCTSTR pComment)
{
- PORTNOTETRACE("filters","ColourListComponent::ProcessEPSComment - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
if (pFilter->IsKindOf(CC_RUNTIME_CLASS(ArtWorksEPSFilter)))
{
// Is it a Camelot specific filter?
BOOL CamelotEPS = pFilter->IsKindOf(CC_RUNTIME_CLASS(CamelotEPSFilter));
// ArtWorks EPS (or derivative)
- if (camStrncmp(pComment, "%%AWColourTable", 15) == 0)
+ if (camStrncmp(pComment, _T("%%AWColourTable"), 15) == 0)
{
// Found a colour table
return EPSCommentOK;
}
- else if (camStrncmp(pComment, "%%JWColourTable", 15) == 0)
+ else if (camStrncmp(pComment, _T("%%JWColourTable"), 15) == 0)
{
// Found a version 1.1 extended colour table
return EPSCommentOK;
}
- else if (camStrncmp(pComment, "%%+", 3) == 0)
+ else if (camStrncmp(pComment, _T("%%+"), 3) == 0)
{
// Found a colour - add it to the colour list for the document.
// Take a copy of this comment
- char Comment[256];
+ TCHAR Comment[256];
camStrcpy(Comment, pComment);
// Find out the colour model (c, h, r, or t)
INT32 i = 3;
- char ColModel = Comment[i++];
+ TCHAR ColModel = Comment[i++];
// Check for special types (NB a colour cannot be both a spot colour and
// a linked colour).
@@ -2895,7 +2882,7 @@
if (isdigit(Comment[i]))
{
// Yes - extract it and skip past it.
- ColourNesting = _ttol(Comment+i);
+ ColourNesting = camAtol(Comment+i);
while (isdigit(Comment[i]))
i++;
@@ -2928,7 +2915,7 @@
i++;
// Got it - copy it out of the string (skip the opening parenthesis)
- char ColName[128];
+ TCHAR ColName[128];
i = ExtractString(Comment, i+1, ColName);
String_64 ColNameS = ColName;
@@ -3056,7 +3043,6 @@
return EPSCommentOK;
}
}
-#endif
// Ignore all other comments
return EPSCommentUnknown;
}
@@ -3192,46 +3178,45 @@
void ColourListComponent::ReadEPS_CMYK(ColourCMYK *pCol, PTSTR pComment,
NewColourInfo *pColourInfo)
{
- PORTNOTETRACE("filters","ColourListComponent::ReadEPS_CMYK - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
BOOL Linked = (pColourInfo != NULL) && (pColourInfo->Type == COLOURTYPE_LINKED);
- char *Value = _tcstok(pComment, " ");
+ TCHAR *State = NULL;
+ TCHAR *Value = camStrtok(pComment, _T(" "), &State);
if (Value != NULL)
{
- if (Linked && (camStrcmp(Value, "-") == 0))
+ if (Linked && (camStrcmp(Value, _T("-")) == 0))
pColourInfo->Inherits[0] = TRUE;
else
- pCol->Cyan = atof(Value);
+ pCol->Cyan = camAtof(Value);
}
- Value = _tcstok(NULL, " ");
+ Value = camStrtok(NULL, _T(" "), &State);
if (Value != NULL)
{
- if (Linked && (camStrcmp(Value, "-") == 0))
+ if (Linked && (camStrcmp(Value, _T("-")) == 0))
pColourInfo->Inherits[1] = TRUE;
else
- pCol->Magenta = atof(Value);
+ pCol->Magenta = camAtof(Value);
}
- Value = _tcstok(NULL, " ");
+ Value = camStrtok(NULL, _T(" "), &State);
if (Value != NULL)
{
- if (Linked && (strcmp(Value, "-") == 0))
+ if (Linked && (camStrcmp(Value, _T("-")) == 0))
pColourInfo->Inherits[2] = TRUE;
else
- pCol->Yellow = atof(Value);
+ pCol->Yellow = camAtof(Value);
}
- Value = _tcstok(NULL, " ");
+ Value = camStrtok(NULL, _T(" "), &State);
if (Value != NULL)
{
- if (Linked && (camStrcmp(Value, "-") == 0))
+ if (Linked && (camStrcmp(Value, _T("-")) == 0))
pColourInfo->Inherits[3] = TRUE;
else
- pCol->Key = atof(Value);
+ pCol->Key = camAtof(Value);
}
-#endif
+
}
/********************************************************************************************
@@ -3256,40 +3241,39 @@
void ColourListComponent::ReadEPS_HSV(ColourHSVT *pCol, PTSTR pComment,
NewColourInfo *pColourInfo)
{
- PORTNOTETRACE("filters","ColourListComponent::ReadEPS_HSV - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
BOOL Linked = (pColourInfo != NULL) && (pColourInfo->Type == COLOURTYPE_LINKED);
- char *Value = _tcstok(pComment, " ");
+ TCHAR *State = NULL;
+ TCHAR *Value = camStrtok(pComment, _T(" "), &State);
if (Value != NULL)
{
- if (Linked && (camStrcmp(Value, "-") == 0))
+ if (Linked && (camStrcmp(Value, _T("-")) == 0))
pColourInfo->Inherits[0] = TRUE;
else
- pCol->Hue = atof(Value) / 360.0;
+ pCol->Hue = camAtof(Value) / 360.0;
}
- Value = _tcstok(NULL, " ");
+ Value = camStrtok(NULL, _T(" "), &State);
if (Value != NULL)
{
- if (Linked && (camStrcmp(Value, "-") == 0))
+ if (Linked && (camStrcmp(Value, _T("-")) == 0))
pColourInfo->Inherits[1] = TRUE;
else
- pCol->Saturation = atof(Value) / 100.0;
+ pCol->Saturation = camAtof(Value) / 100.0;
}
- Value = _tcstok(NULL, " ");
+ Value = camStrtok(NULL, _T(" "), &State);
if (Value != NULL)
{
- if (Linked && (camStrcmp(Value, "-") == 0))
+ if (Linked && (camStrcmp(Value, _T("-")) == 0))
pColourInfo->Inherits[2] = TRUE;
else
- pCol->Value = atof(Value) / 100.0;
+ pCol->Value = camAtof(Value) / 100.0;
}
// No transparency
pCol->Transparent = 0.0;
-#endif
+
}
/********************************************************************************************
@@ -3314,17 +3298,16 @@
void ColourListComponent::ReadEPS_Grey(ColourGreyT *pCol, PTSTR pComment,
NewColourInfo *pColourInfo)
{
- PORTNOTETRACE("filters","ColourListComponent::ReadEPS_Grey - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
BOOL Linked = (pColourInfo != NULL) && (pColourInfo->Type == COLOURTYPE_LINKED);
- char *Value = _tcstok(pComment, " ");
+ TCHAR * State=NULL;
+ TCHAR *Value = camStrtok(pComment, _T(" "), &State);
if (Value != NULL)
{
- if (Linked && (camStrcmp(Value, "-") == 0))
+ if (Linked && (camStrcmp(Value, _T("-")) == 0))
pColourInfo->Inherits[0] = TRUE;
else
- pCol->Intensity = atof(Value);
+ pCol->Intensity = camAtof(Value);
}
// Clear the reserved words to 0.
@@ -3333,7 +3316,6 @@
// No transparency
pCol->Transparent = 0.0;
-#endif
}
/********************************************************************************************
Index: Trunk/XaraLX/Kernel/ndclpcnt.cpp
===================================================================
--- Trunk/XaraLX/Kernel/ndclpcnt.cpp (revision 1314)
+++ Trunk/XaraLX/Kernel/ndclpcnt.cpp (revision 1315)
@@ -2544,8 +2544,6 @@
void NodeClipViewController::PreExportRender(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
if (pRegion->IsKindOf(CC_RUNTIME_CLASS(EPSRenderRegion)))
{
// Output "start group" token
@@ -2553,6 +2551,8 @@
pDC->OutputToken(_T("q"));
pDC->OutputNewLine();
}
+PORTNOTE("cmx", "Removed use of CMXRenderRegion")
+#ifndef EXCLUDE_FROM_XARALX
else if(pRegion->IsKindOf(CC_RUNTIME_CLASS(CMXRenderRegion)))
{
// mark start of a group...
@@ -2579,8 +2579,6 @@
BOOL NodeClipViewController::ExportRender(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
if (pRegion->IsKindOf(CC_RUNTIME_CLASS(EPSRenderRegion)))
{
// Output "end group" token
@@ -2591,6 +2589,8 @@
// Tell caller we rendered ourselves ok
return TRUE;
}
+PORTNOTE("epsfilter", "Removed use of CMXRenderRegion")
+#ifndef EXCLUDE_FROM_XARALX
else if(pRegion->IsKindOf(CC_RUNTIME_CLASS(CMXRenderRegion)))
{
// mark start of a group...
Index: Trunk/XaraLX/Kernel/nodepath.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodepath.cpp (revision 1314)
+++ Trunk/XaraLX/Kernel/nodepath.cpp (revision 1315)
@@ -2275,15 +2275,12 @@
BOOL NodePath::NeedsToExport(RenderRegion* pRender, BOOL VisibleLayersOnly, BOOL CheckSelected)
{
#ifdef DO_EXPORT
-PORTNOTE("EPSRenderRegion", "Removed use of EPSRenderRegion")
-#ifndef EXCLUDE_FROM_XARALX
if (pRender->IsKindOf(CC_RUNTIME_CLASS(EPSRenderRegion)))
{
Node* pParent=FindParent();
if (pParent!=NULL && IS_A(pParent,TextStory))
return FALSE;
}
-#endif
// If we have the check selection flag on then see if this node is:-
// - selected or not = render it
Index: Trunk/XaraLX/Kernel/noderect.cpp
===================================================================
--- Trunk/XaraLX/Kernel/noderect.cpp (revision 1314)
+++ Trunk/XaraLX/Kernel/noderect.cpp (revision 1315)
@@ -103,7 +103,7 @@
#include "noderect.h"
// Code headers
-//#include "aw_eps.h"
+#include "aw_eps.h"
#include "opsmpshp.h"
// Resource headers
@@ -268,17 +268,14 @@
void NodeRect::PreExportRender(RenderRegion* pRegion)
{
#ifdef DO_EXPORT
-PORTNOTE("epsfilter", "Removed use of EPSFilter")
-#ifndef EXCLUDE_FROM_XARALX
if (pRegion->IsKindOf(CC_RUNTIME_CLASS(ArtWorksEPSRenderRegion)))
{
// Output "ArtWorks rectangle" token
EPSExportDC *pDC = (EPSExportDC *) pRegion->GetRenderDC();
- pDC->OutputToken("ar");
+ pDC->OutputToken(_T("ar"));
pDC->OutputNewLine();
}
#endif
-#endif
}
Index: Trunk/XaraLX/wxOil/oilbitmap.cpp
===================================================================
--- Trunk/XaraLX/wxOil/oilbitmap.cpp (revision 1314)
+++ Trunk/XaraLX/wxOil/oilbitmap.cpp (revision 1315)
@@ -127,7 +127,7 @@
//#include "richard2.h"
//#include "view.h" - in camtypes.h [AUTOMATICALLY REMOVED]
//#include "colcontx.h"
-///#include "colormgr.h"
+//#include "colormgr.h"
#include "bitfilt.h" // BaseBitmapFilter
//#include "camfiltr.h" // BaseCamelotFilter - in camtypes.h [AUTOMATICALLY REMOVED]
@@ -2894,14 +2894,11 @@
return FALSE;
}
-PORTNOTETRACE("other","Removed CamelotNativeEPSFilter usage");
-#ifndef EXCLUDE_FROM_XARALX
if (!pFilter->IsKindOf(CC_RUNTIME_CLASS(CamelotEPSFilter)))
{
ENSURE(FALSE, "Trying to import a bitmap with a non-Camelot EPS filter");
return FALSE;
}
-#endif
// Sanity checks
ENSURE((pInfo->PixelDepth == 1) ||
@@ -2972,8 +2969,6 @@
// And read in the image data
// if (IsUserName("Alex")) if (BitmapType !=0) return(TRUE);
-PORTNOTETRACE("other","Removed CamelotNativeEPSFilter usage");
-#ifndef EXCLUDE_FROM_XARALX
// Read in the Bitmap info
if (pFilter->IsKindOf(CC_RUNTIME_CLASS(CamelotNativeEPSFilter)))
{
@@ -2990,7 +2985,6 @@
return TRUE;
}
else
-#endif
{
// Load it all in, in one go.
return pEPSFilter->ImportBinary(BMBytes, BMInfo->bmiHeader.biSizeImage);
Index: Trunk/XaraLX/wxOil/compatdef.h
===================================================================
--- Trunk/XaraLX/wxOil/compatdef.h (revision 1314)
+++ Trunk/XaraLX/wxOil/compatdef.h (revision 1315)
@@ -692,6 +692,9 @@
inline void Beep() {wxBell();}
+inline double camAtof(TCHAR * s) { double r=0.0; camScanf(s, "%f", &r); return r;}
+inline INT32 camAtol(TCHAR * s) { INT32 r=0; camScanf(s, "%d", &r); return r;}
+
// The following line makes normalize.pl stop skipping this file
// Leave it at the end
/* SKIPFIXTYPES: END */
Index: Trunk/XaraLX/wxOil/filedlgs.cpp
===================================================================
--- Trunk/XaraLX/wxOil/filedlgs.cpp (revision 1314)
+++ Trunk/XaraLX/wxOil/filedlgs.cpp (revision 1315)
@@ -598,12 +598,7 @@
// import list - you can't hide it from just one list. It must be availiable though
// to give it's nice little error message. Other instances of this below.
if (
-PORTNOTE("other", "Removed CamelotEPSFilter check" )
-#if !defined(EXCLUDE_FROM_XARALX)
( ( GetImport && Flags.CanImport && !IS_A( pFilter, CamelotEPSFilter ) )
-#else
- ( ( GetImport && Flags.CanImport )
-#endif
|| (!GetImport && Flags.CanExport)) && NULL != pFilter->pOILFilter &&
Flags.ShowFilter && (pFilter->IsKindOf(pTypeOfFilter)) && FilterCanCope
)
@@ -680,12 +675,7 @@
if( NULL != pFilter->pOILFilter )
{
if (
-PORTNOTE("other", "Removed CamelotEPSFilter check" )
-#if !defined(EXCLUDE_FROM_XARALX)
( ( GetImport && Flags.CanImport && !IS_A( pFilter, CamelotEPSFilter ) )
-#else
- ( ( GetImport && Flags.CanImport )
-#endif
|| (!GetImport && Flags.CanExport)) &&
Flags.ShowFilter && (pFilter->IsKindOf(pTypeOfFilter)) && FilterCanCope
)
@@ -2474,12 +2464,7 @@
// little bit of a bodge here to stop the CamelotEPSFilter from appearing in the
// import list - you can't hide it from just one list. It must be availiable though
// to give it's nice little error message. Other instances of this below.
-PORTNOTE("other", "Removed CamelotEPSFilter check" )
-#if !defined(EXCLUDE_FROM_XARALX)
if (Flags.CanImport && Flags.ShowFilter && !IS_A(pFilter, CamelotEPSFilter))
-#else
- if (Flags.CanImport && Flags.ShowFilter )
-#endif
{
// Add the space required to put this into the filter string
// (add 1 for the separating '|' character)
@@ -2508,12 +2493,7 @@
{
FilterFlags Flags = pFilter->GetFlags();
-PORTNOTE("other", "Removed CamelotEPSFilter check" )
-#if !defined(EXCLUDE_FROM_XARALX)
if (Flags.CanImport && Flags.ShowFilter && !IS_A(pFilter, CamelotEPSFilter))
-#else
- if (Flags.CanImport && Flags.ShowFilter )
-#endif
{
// Add this filter into the list
camStrcat(FilterString, pFilter->pOILFilter->ConstructFilterString());
@@ -2521,12 +2501,7 @@
pFilter->pOILFilter->Position = Position;
// see if it is the native filter
-PORTNOTE("other", "Removed CamelotEPSFilter check" )
-#if !defined(EXCLUDE_FROM_XARALX)
if (IS_A(pFilter, CamelotNativeEPSFilter))
-#else
- if( false )
-#endif
{
*NativeFilterPos = Position;
}
Xara