[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 741
Date : Wed Mar 29 18:49:56 BST 2006
Changed paths:
M /Trunk/XaraLX/Kernel/GDrawIntf.h
M /Trunk/XaraLX/Kernel/XaDraw.h
M /Trunk/XaraLX/Kernel/XaDrwOld.cpp
M /Trunk/XaraLX/Kernel/XaDrwOld.h
M /Trunk/XaraLX/Kernel/gradtbl.cpp
M /Trunk/XaraLX/Kernel/xagdraw.h
M /Trunk/XaraLX/tools/cntrtool.cpp
M /Trunk/XaraLX/wxOil/gdrawcon.h
Fixed some broken line endings
Diff:
Index: Trunk/XaraLX/tools/cntrtool.cpp
===================================================================
--- Trunk/XaraLX/tools/cntrtool.cpp (revision 740)
+++ Trunk/XaraLX/tools/cntrtool.cpp (revision 741)
@@ -2805,7 +2805,7 @@
EnableGadget(_R(IDC_CONTOUROBJECTBIASGAIN), NumSelBlends > 0);
EnableGadget(_R(IDC_CONTOURATTRBIASGAIN), NumSelBlends > 0);
EnableGadget(_R(IDC_CONTOURSTEPS), NumSelBlends > 0);
-PORTNOTE("other", "IDC_BTN_CONTOURANTIALIAS removed as not in the resources")
+PORTNOTE("other", "_R(IDC_BTN_CONTOURANTIALIAS) removed as not in the resources")
#ifndef EXCLUDE_FROM_XARALX
EnableGadget(_R(IDC_BTN_CONTOURANTIALIAS),NumSelBlends > 0);
#endif
@@ -2829,7 +2829,7 @@
EnableGadget(_R(IDC_CONTOUROBJECTBIASGAIN), FALSE);
EnableGadget(_R(IDC_CONTOURATTRBIASGAIN), FALSE);
EnableGadget(_R(IDC_CONTOURSTEPS), FALSE);
-PORTNOTE("other", "IDC_BTN_CONTOURANTIALIAS removed as not in the resources")
+PORTNOTE("other", "_R(IDC_BTN_CONTOURANTIALIAS) removed as not in the resources")
#ifndef EXCLUDE_FROM_XARALX
EnableGadget(_R(IDC_BTN_CONTOURANTIALIAS),FALSE);
#endif
Index: Trunk/XaraLX/Kernel/gradtbl.cpp
===================================================================
--- Trunk/XaraLX/Kernel/gradtbl.cpp (revision 740)
+++ Trunk/XaraLX/Kernel/gradtbl.cpp (revision 741)
@@ -2339,7 +2339,7 @@
// then use the other colour's hue (if any)
//
// TODO: WRONG!!! This should always be doing these two tests, not just when
- // the Effect equals EFFECT_HSV_LONG. Note also that the long HSV colour
+ // the Effect equals EFFECT_HSV_LONG. Note also that the INT32 HSV colour
// generation is incorrect, although I'm not too sure why. (Gavin).
//
if (Effect == EFFECT_HSV_LONG)
Index: Trunk/XaraLX/Kernel/XaDrwOld.h
===================================================================
--- Trunk/XaraLX/Kernel/XaDrwOld.h (revision 740)
+++ Trunk/XaraLX/Kernel/XaDrwOld.h (revision 741)
@@ -1,4 +1,4 @@
-// $Id: XaDrwOld.h 662 2006-03-14 21:31:49Z alex $
+// $Id$
/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
================================XARAHEADERSTART===========================
@@ -272,10 +272,10 @@
BYTE ValueA, BYTE ValueB, BYTE ValueC, BYTE ValueD,
pcPOINT PointA, pcPOINT PointB, pcPOINT PointC, pcPOINT PointD
);
-INT32 XaBitmapOld_SetBias(double fBias);
-INT32 XaBitmapOld_SetGain(double fGain);
-INT32 XaBitmapOld_SetContone( UINT32 uContoneStyle, COLORREF rgbStart=0x000000, COLORREF rgbEnd=0xFFFFFF );
-INT32 XaBitmapOld_SetTransparencyRamp( BYTE uStart=0x00, BYTE uEnd=0xFF );
+INT32 XaBitmapOld_SetBias(double fBias);
+INT32 XaBitmapOld_SetGain(double fGain);
+INT32 XaBitmapOld_SetContone( UINT32 uContoneStyle, COLORREF rgbStart=0x000000, COLORREF rgbEnd=0xFFFFFF );
+INT32 XaBitmapOld_SetTransparencyRamp( BYTE uStart=0x00, BYTE uEnd=0xFF );
INT32 XaColourOld_SetTilePattern(
pcBITMAPINFOHEADER BitmapInfo,
pcBYTE Bitmap,
Index: Trunk/XaraLX/Kernel/GDrawIntf.h
===================================================================
--- Trunk/XaraLX/Kernel/GDrawIntf.h (revision 740)
+++ Trunk/XaraLX/Kernel/GDrawIntf.h (revision 741)
@@ -1,4 +1,4 @@
-// $Id: GDrawIntf.h 662 2006-03-14 21:31:49Z alex $
+// $Id$
/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
================================XARAHEADERSTART===========================
@@ -249,10 +249,10 @@
CONST POINT *PointC,
CONST POINT *PointD
);
- virtual BOOL SetBias(double fBias) ;
- virtual BOOL SetGain(double fGain) ;
- virtual BOOL SetContone( UINT32, COLORREF, COLORREF );
- virtual BOOL SetTransparencyRamp( BYTE, BYTE );
+ virtual BOOL SetBias(double fBias) ;
+ virtual BOOL SetGain(double fGain) ;
+ virtual BOOL SetContone( UINT32, COLORREF, COLORREF );
+ virtual BOOL SetTransparencyRamp( BYTE, BYTE );
virtual BOOL SetBitmapFill( LPBITMAPINFOHEADER, LPBYTE, DWORD, LPPOINT, COLORREF, LPRGBQUAD,
LPBYTE, LPBYTE, LPBYTE, LPBYTE, DWORD );
Index: Trunk/XaraLX/Kernel/xagdraw.h
===================================================================
--- Trunk/XaraLX/Kernel/xagdraw.h (revision 740)
+++ Trunk/XaraLX/Kernel/xagdraw.h (revision 741)
@@ -1,4 +1,4 @@
-// $Id: xagdraw.h 662 2006-03-14 21:31:49Z alex $
+// $Id$
/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
================================XARAHEADERSTART===========================
@@ -197,11 +197,11 @@
(GColour_SetTransparent4WayGraduation)
#define XaColour_SetTransparent4WayGraduation4 \
(GColour_SetTransparent4WayGraduation4)
-#define XaBitmap_SetBias (GBitmap_SetBias)
-#define XaBitmap_SetGain (GBitmap_SetGain)
-#define XaBitmap_SetContone (GBitmap_SetContone)
-#define XaBitmap_SetTransparencyRamp \
- (GBitmap_SetTransparencyRamp)
+#define XaBitmap_SetBias (GBitmap_SetBias)
+#define XaBitmap_SetGain (GBitmap_SetGain)
+#define XaBitmap_SetContone (GBitmap_SetContone)
+#define XaBitmap_SetTransparencyRamp \
+ (GBitmap_SetTransparencyRamp)
#define XaColour_SetTilePattern (GColour_SetTilePattern)
#define XaColour_SetTilePattern4 (GColour_SetTilePattern4)
#define XaColour_SetTransparentTilePattern \
Index: Trunk/XaraLX/Kernel/XaDrwOld.cpp
===================================================================
--- Trunk/XaraLX/Kernel/XaDrwOld.cpp (revision 740)
+++ Trunk/XaraLX/Kernel/XaDrwOld.cpp (revision 741)
@@ -1,4 +1,4 @@
-// $Id: XaDrwOld.cpp 662 2006-03-14 21:31:49Z alex $
+// $Id$
/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
================================XARAHEADERSTART===========================
@@ -815,39 +815,39 @@
XA_DRAW_LEAVE(s_pContext);
return nRetVal;
}
-
-INT32 XaBitmapOld_SetBias( double fBias )
-{
- XA_DRAW_ENTER(TEXT("XaBitmapOld_SetBias"),s_pContext);
- INT32 nRetVal = XaBitmap_SetBias(s_pContext,fBias);
- XA_DRAW_LEAVE(s_pConvert);
- return nRetVal;
-}
-
-INT32 XaBitmapOld_SetGain( double fGain )
-{
- XA_DRAW_ENTER(TEXT("XaBitmapOld_SetGain"),s_pContext);
- INT32 nRetVal = XaBitmap_SetGain(s_pContext,fGain);
- XA_DRAW_LEAVE(s_pConvert);
- return nRetVal;
-}
-
-INT32 XaBitmapOld_SetContone( UINT32 uContoneStyle, COLORREF rgbStart,COLORREF rgbEnd )
-{
- XA_DRAW_ENTER(TEXT("XaBitmapOld_SetContone"),s_pContext);
- INT32 nRetVal = XaBitmap_SetContone(s_pContext,uContoneStyle,rgbStart,rgbEnd);
- XA_DRAW_LEAVE(s_pConvert);
- return nRetVal;
-}
-
-INT32 XaBitmapOld_SetTransparencyRamp( BYTE uStart, BYTE uEnd )
-{
- XA_DRAW_ENTER(TEXT("XaBitmapOld_SetTransaprencyRamp"),s_pContext);
- INT32 nRetVal = XaBitmap_SetTransparencyRamp(s_pContext,uStart,uEnd);
- XA_DRAW_LEAVE(s_pConvert);
- return nRetVal;
-}
+INT32 XaBitmapOld_SetBias( double fBias )
+{
+ XA_DRAW_ENTER(TEXT("XaBitmapOld_SetBias"),s_pContext);
+ INT32 nRetVal = XaBitmap_SetBias(s_pContext,fBias);
+ XA_DRAW_LEAVE(s_pConvert);
+ return nRetVal;
+}
+
+INT32 XaBitmapOld_SetGain( double fGain )
+{
+ XA_DRAW_ENTER(TEXT("XaBitmapOld_SetGain"),s_pContext);
+ INT32 nRetVal = XaBitmap_SetGain(s_pContext,fGain);
+ XA_DRAW_LEAVE(s_pConvert);
+ return nRetVal;
+}
+
+INT32 XaBitmapOld_SetContone( UINT32 uContoneStyle, COLORREF rgbStart,COLORREF rgbEnd )
+{
+ XA_DRAW_ENTER(TEXT("XaBitmapOld_SetContone"),s_pContext);
+ INT32 nRetVal = XaBitmap_SetContone(s_pContext,uContoneStyle,rgbStart,rgbEnd);
+ XA_DRAW_LEAVE(s_pConvert);
+ return nRetVal;
+}
+
+INT32 XaBitmapOld_SetTransparencyRamp( BYTE uStart, BYTE uEnd )
+{
+ XA_DRAW_ENTER(TEXT("XaBitmapOld_SetTransaprencyRamp"),s_pContext);
+ INT32 nRetVal = XaBitmap_SetTransparencyRamp(s_pContext,uStart,uEnd);
+ XA_DRAW_LEAVE(s_pConvert);
+ return nRetVal;
+}
+
INT32 XaColourOld_SetTilePattern(
pcBITMAPINFOHEADER BitmapInfo,
pcBYTE Bitmap,
Index: Trunk/XaraLX/Kernel/XaDraw.h
===================================================================
--- Trunk/XaraLX/Kernel/XaDraw.h (revision 740)
+++ Trunk/XaraLX/Kernel/XaDraw.h (revision 741)
@@ -1,4 +1,4 @@
-// $Id: XaDraw.h 662 2006-03-14 21:31:49Z alex $
+// $Id$
/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
================================XARAHEADERSTART===========================
@@ -294,10 +294,10 @@
BYTE ValueA, BYTE ValueB, BYTE ValueC, BYTE ValueD,
pcPOINT PointA, pcPOINT PointB, pcPOINT PointC, pcPOINT PointD
) ;
- INT32 (*pfnXaBitmap_SetBias)(pGCONTEXT pContext,double fBias) ;
- INT32 (*pfnXaBitmap_SetGain)(pGCONTEXT pContext,double fGain) ;
- INT32 (*pfnXaBitmap_SetContone)( pGCONTEXT pContext,UINT32 uContoneStyle,COLORREF rgbStart,COLORREF rgbEnd ) ;
- INT32 (*pfnXaBitmap_SetTransparencyRamp)( pGCONTEXT pContext,BYTE uStart,BYTE uEnd ) ;
+ INT32 (*pfnXaBitmap_SetBias)(pGCONTEXT pContext,double fBias) ;
+ INT32 (*pfnXaBitmap_SetGain)(pGCONTEXT pContext,double fGain) ;
+ INT32 (*pfnXaBitmap_SetContone)( pGCONTEXT pContext,UINT32 uContoneStyle,COLORREF rgbStart,COLORREF rgbEnd ) ;
+ INT32 (*pfnXaBitmap_SetTransparencyRamp)( pGCONTEXT pContext,BYTE uStart,BYTE uEnd ) ;
INT32 (*pfnXaColour_SetTilePattern)(
pGCONTEXT pContext,
pcBITMAPINFOHEADER BitmapInfo,
@@ -768,11 +768,11 @@
(g_XaFns.pfnXaColour_SetTransparent4WayGraduation)
#define XaColour_SetTransparent4WayGraduation4 \
(g_XaFns.pfnXaColour_SetTransparent4WayGraduation4)
-#define XaBitmap_SetBias (g_XaFns.pfnXaBitmap_SetBias)
-#define XaBitmap_SetGain (g_XaFns.pfnXaBitmap_SetGain)
-#define XaBitmap_SetContone (g_XaFns.pfnXaBitmap_SetContone)
-#define XaBitmap_SetTransparencyRamp \
- (g_XaFns.pfnXaBitmap_SetTransparencyRamp)
+#define XaBitmap_SetBias (g_XaFns.pfnXaBitmap_SetBias)
+#define XaBitmap_SetGain (g_XaFns.pfnXaBitmap_SetGain)
+#define XaBitmap_SetContone (g_XaFns.pfnXaBitmap_SetContone)
+#define XaBitmap_SetTransparencyRamp \
+ (g_XaFns.pfnXaBitmap_SetTransparencyRamp)
#define XaColour_SetTilePattern (g_XaFns.pfnXaColour_SetTilePattern)
#define XaColour_SetTilePattern4 (g_XaFns.pfnXaColour_SetTilePattern4)
#define XaColour_SetTransparentTilePattern \
Index: Trunk/XaraLX/wxOil/gdrawcon.h
===================================================================
--- Trunk/XaraLX/wxOil/gdrawcon.h (revision 740)
+++ Trunk/XaraLX/wxOil/gdrawcon.h (revision 741)
@@ -1,4 +1,4 @@
-// $Id: gdrawcon.h 662 2006-03-14 21:31:49Z alex $
+// $Id$
/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
================================XARAHEADERSTART===========================
@@ -225,12 +225,12 @@
CONST POINT *PointC,
CONST POINT *PointD
) = 0;
-
- virtual BOOL SetBias(double fBias) = 0;
- virtual BOOL SetGain(double fGain) = 0;
- virtual BOOL SetContone( UINT32, COLORREF=0x000000, COLORREF=0xFFFFFF ) = 0;
- virtual BOOL SetTransparencyRamp( BYTE=0x00,BYTE=0xFF ) = 0;
+ virtual BOOL SetBias(double fBias) = 0;
+ virtual BOOL SetGain(double fGain) = 0;
+ virtual BOOL SetContone( UINT32, COLORREF=0x000000, COLORREF=0xFFFFFF ) = 0;
+ virtual BOOL SetTransparencyRamp( BYTE=0x00,BYTE=0xFF ) = 0;
+
virtual BOOL SetBitmapFill( LPBITMAPINFOHEADER, LPBYTE, DWORD, LPPOINT, COLORREF, LPRGBQUAD,
LPBYTE, LPBYTE, LPBYTE, LPBYTE, DWORD = 0) = 0;
Xara