[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 1346
Date : Tue Jun 20 21:35:10 BST 2006
Changed paths:
M /Trunk/XaraLX/Kernel/cameleps.cpp
M /Trunk/XaraLX/Kernel/epsfiltr.cpp
M /Trunk/XaraLX/Kernel/epsstack.cpp
M /Trunk/XaraLX/Kernel/kerneldc.cpp
M /Trunk/XaraLX/Kernel/printctl.cpp
M /Trunk/XaraLX/Kernel/prnmks.h
M /Trunk/XaraLX/Kernel/view.cpp
M /Trunk/XaraLX/wxOil/compatdef.h
M /Trunk/XaraLX/wxOil/dlgmgr.cpp
M /Trunk/XaraLX/wxOil/lddirect.h
Fix some compile warnings
Diff:
Index: Trunk/XaraLX/Kernel/prnmks.h
===================================================================
--- Trunk/XaraLX/Kernel/prnmks.h (revision 1345)
+++ Trunk/XaraLX/Kernel/prnmks.h (revision 1346)
@@ -139,6 +139,9 @@
{
CC_DECLARE_MEMDUMP(LoadPrintMarks);
+ public:
+ virtual ~LoadPrintMarks() {}
+
protected:
virtual BOOL OnLoadDocument(Document* pKernelDoc);
};
@@ -521,7 +524,7 @@
public:
MarkFormatRegion();
MarkFormatRegion(const DocRect &Position);
- ~MarkFormatRegion();
+ virtual ~MarkFormatRegion();
void Empty();
void SetPosition(const DocRect& Position);
Index: Trunk/XaraLX/Kernel/view.cpp
===================================================================
--- Trunk/XaraLX/Kernel/view.cpp (revision 1345)
+++ Trunk/XaraLX/Kernel/view.cpp (revision 1346)
@@ -2875,6 +2875,7 @@
// Unlink the RenderRegion from list and error if it was not there
BOOL InList = Camelot.DeleteRenderRegion(pRender);
+ CAM_USE(InList); // Suppress unused variable warning on retail build
ERROR3IF(!InList, "DocView::RenderOptimalView tried to delete a RenderRegion not in the list");
// Instruct the render region to commit suicide. This call doesn't work on a CamelotEPS
@@ -3278,8 +3279,8 @@
MoreBands = BitmapRR.GetNextBand();
TRACEUSER( "Phil", _T("GetNextBand (After) %d, %d
"), BitmapRR.GetClipRect().lo.y, BitmapRR.GetClipRect().hi.y);
ERROR3IF(MoreMaskedBands!=MoreBands, "Bands don't match");
-if (MoreMaskedBands!=MoreBands)
- MoreBands = FALSE;
+ if (MoreMaskedBands!=MoreBands)
+ MoreBands = FALSE;
} while (MoreBands);
@@ -4101,6 +4102,7 @@
// Get the next bands ready
BOOL MoreMaskedBands = MaskedBitmap.GetNextBand();
MoreBands = BitmapRR.GetNextBand();
+ CAM_USE(MoreMaskedBands); // suppress unused variable wanring on retail builds
ERROR3IF(MoreMaskedBands!=MoreBands, "Bands don't match");
// Update progress display
Index: Trunk/XaraLX/Kernel/epsfiltr.cpp
===================================================================
--- Trunk/XaraLX/Kernel/epsfiltr.cpp (revision 1345)
+++ Trunk/XaraLX/Kernel/epsfiltr.cpp (revision 1346)
@@ -2237,7 +2237,7 @@
BOOL EPSFilter::AttachAllNodes()
{
BOOL Success = TRUE;
- NodeGroup *pGroup;
+ NodeGroup *pGroup=NULL;
if (UseLayers)
{
@@ -5556,7 +5556,7 @@
case EPSC_Ta: // Justification
{
- Justification JustVal;
+ Justification JustVal=JLEFT;
INT32 Justify;
if (!Stack.Pop(&Justify))
goto error;
Index: Trunk/XaraLX/Kernel/epsstack.cpp
===================================================================
--- Trunk/XaraLX/Kernel/epsstack.cpp (revision 1345)
+++ Trunk/XaraLX/Kernel/epsstack.cpp (revision 1346)
@@ -869,6 +869,7 @@
{
double Cyan, Magenta, Yellow, Key;
FIXEDPOINT TintValue;
+ TintValue=0; // Warning suppression
if (Tint != TINT_NONE)
{
@@ -1087,7 +1088,7 @@
{
if (UseBrackets)
{
- EPSCommand Cmd;
+ EPSCommand Cmd=EPSC_Invalid;
PopCmd(&Cmd);
if (Cmd != EPSC_ArrayEnd)
return FALSE;
@@ -1104,7 +1105,7 @@
if (UseBrackets)
{
- EPSCommand Cmd;
+ EPSCommand Cmd=EPSC_Invalid;
PopCmd(&Cmd);
if (Cmd != EPSC_ArrayStart)
return FALSE;
@@ -1298,7 +1299,7 @@
}
// First this we find should be the 'Array End' command (']')
- EPSCommand Cmd;
+ EPSCommand Cmd=EPSC_Invalid;
PopCmd(&Cmd);
if (Cmd != EPSC_ArrayEnd)
{
@@ -1329,7 +1330,7 @@
if (GetType() != EPSTYPE_COMMAND)
{
// Pop the array member
- double Double;
+ double Double=0.0;
if (!Pop(&Double))
{
delete TempArray;
@@ -1398,7 +1399,7 @@
return FALSE;
}
- EPSCommand Cmd;
+ EPSCommand Cmd=EPSC_Invalid;
PopCmd(&Cmd);
if (Cmd != EPSC_ArrayEnd)
{
Index: Trunk/XaraLX/Kernel/kerneldc.cpp
===================================================================
--- Trunk/XaraLX/Kernel/kerneldc.cpp (revision 1345)
+++ Trunk/XaraLX/Kernel/kerneldc.cpp (revision 1346)
@@ -1133,7 +1133,7 @@
while (Length > 0)
{
// Encode four bytes as five characters.
- UINT32 n;
+ UINT32 n=0;
if (Length >= 4)
{
Index: Trunk/XaraLX/Kernel/cameleps.cpp
===================================================================
--- Trunk/XaraLX/Kernel/cameleps.cpp (revision 1345)
+++ Trunk/XaraLX/Kernel/cameleps.cpp (revision 1346)
@@ -5355,7 +5355,10 @@
DocCoord DCOrigin = pDC->GetOrigin();
+PORTNOTE ("other", "Disabled postscript printing transform")
+#ifndef EXCLUDE_FROM_XARALX
if (IsCamelotEPS)
+#endif
{
dWidth *= UnitSize;
dHeight *= UnitSize;
Index: Trunk/XaraLX/Kernel/printctl.cpp
===================================================================
--- Trunk/XaraLX/Kernel/printctl.cpp (revision 1345)
+++ Trunk/XaraLX/Kernel/printctl.cpp (revision 1346)
@@ -1761,7 +1761,7 @@
BOOL PrintControl::CalcNumPaper()
{
- BOOL CanMultiCopy;
+ BOOL CanMultiCopy=TRUE;
PORTNOTE("printing", "Disabled Use of CCPrintDialog")
#ifndef EXCLUDE_FROM_XARALX
// WEBSTER-ranbirr-13/11/96
Index: Trunk/XaraLX/wxOil/compatdef.h
===================================================================
--- Trunk/XaraLX/wxOil/compatdef.h (revision 1345)
+++ Trunk/XaraLX/wxOil/compatdef.h (revision 1346)
@@ -695,6 +695,10 @@
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;}
+// Macro to get rid of unused variable warnings
+inline void CamUse(void * p) {}
+#define CAM_USE(x) do {CamUse( & x );} while(0)
+
#ifndef _MAX_PATH
#define _MAX_PATH _POSIX_PATH_MAX
#endif
Index: Trunk/XaraLX/wxOil/lddirect.h
===================================================================
--- Trunk/XaraLX/wxOil/lddirect.h (revision 1345)
+++ Trunk/XaraLX/wxOil/lddirect.h (revision 1346)
@@ -122,6 +122,7 @@
CC_DECLARE_MEMDUMP(LoadDirect);
public:
+ virtual ~LoadDirect() {}
BOOL Execute(const TCHAR* lpszFilename);
protected:
@@ -129,6 +130,7 @@
private:
BOOL ExecuteHelper(CCamApp* pApp, const TCHAR* lpszFilename);
+
};
Index: Trunk/XaraLX/wxOil/dlgmgr.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dlgmgr.cpp (revision 1345)
+++ Trunk/XaraLX/wxOil/dlgmgr.cpp (revision 1346)
@@ -1877,7 +1877,7 @@
ERROR3IF(pCAP==NULL, "Can't find CamArtProvider!");
ListItem* pItem = NULL;
- ResourceID resID;
+ ResourceID resID=0;
pItem = imagelist.FindFirstBitmap(&resID);
while (pItem)
{
Xara