[Igarden-commit] CommonSource/CColor CColor.cp,1.7,1.8

[Jeffrey B. <jlb...@us...>]

Update of /cvsroot/igarden/CommonSource/CColor
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv11429

Modified Files:
	CColor.cp 
Log Message:
Change #error to #warning to ease porting

Index: CColor.cp
===================================================================
RCS file: /cvsroot/igarden/CommonSource/CColor/CColor.cp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CColor.cp	7 Oct 2006 23:49:35 -0000	1.7
--- CColor.cp	18 Oct 2006 01:15:44 -0000	1.8
***************
*** 63,67 ****
  
  
- #if OPT_MACOS
  
  // ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
--- 63,66 ----
***************
*** 72,76 ****
--- 71,79 ----
  void CColor::operator =(const CMYColor &inColor)
  {
+ #if OPT_MACOS
  	::CMY2RGB(&inColor, &mColor);
+ #else
+ #warning ***Won't support CColor
+ #endif
  	
  	CalcHexCode();
***************
*** 85,89 ****
--- 88,96 ----
  void CColor::operator =(const HSLColor &inColor)
  {
+ #if OPT_MACOS
  	::HSL2RGB(&inColor, &mColor);
+ #else
+ #warning ***Won't support CColor
+ #endif
  	
  	CalcHexCode();
***************
*** 98,102 ****
--- 105,113 ----
  void CColor::operator =(const HSVColor &inColor)
  {
+ #if OPT_MACOS
  	::HSV2RGB(&inColor, &mColor);
+ #else
+ #warning ***Won't support CColor
+ #endif
  	
  	CalcHexCode();
***************
*** 205,209 ****
  bool CColor::operator ==(const unsigned char* inText) const
  {
! 	return ::EqualString(inText, mHexCode, false, true);
  }
  
--- 216,223 ----
  bool CColor::operator ==(const unsigned char* inText) const
  {
! 	if(inText[0] == mHexCode[0])
! 		return memcmp(inText, mHexCode, inText[0]) == 0;
! 	else
! 		return false;
  }
  
***************
*** 222,226 ****
--- 236,244 ----
  	CMYColor theColor;
  	
+ #if OPT_MACOS
  	::RGB2CMY(&mColor, &theColor);
+ #else
+ #warning ***Won't support CColor
+ #endif
  	
  	return theColor;
***************
*** 237,241 ****
--- 255,263 ----
  	HSLColor theColor;
  	
+ #if OPT_MACOS
  	::RGB2HSL(&mColor, &theColor);
+ #else
+ #warning ***Won't support CColor
+ #endif
  	
  	return theColor;
***************
*** 252,256 ****
--- 274,282 ----
  	HSVColor theColor;
  	
+ #if OPT_MACOS
  	::RGB2HSV(&mColor, &theColor);
+ #else
+ #warning ***Won't support CColor
+ #endif
  	
  	return theColor;
***************
*** 307,311 ****
  }
  
- 
  // ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
  //  	¥ NumToHex
--- 333,336 ----
***************
*** 319,323 ****
  	if (inHighBitsFlag)
  	{
! 		inValue = ::BitShift(inValue, -4);
  	}
  	
--- 344,348 ----
  	if (inHighBitsFlag)
  	{
! 		inValue = inValue >> 4;
  	}
  	
***************
*** 366,370 ****
  }
  
- #else
- #error TO_BE_PORTED
- #endif
--- 391,392 ----