[Igarden-commit] Garden/source/Document MaterialPictSelectDialog.cpp, 1.19.2.1, 1.19.2.2

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

Update of /cvsroot/igarden/Garden/source/Document
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv31017

Modified Files:
      Tag: Release_branch_v1
	MaterialPictSelectDialog.cpp 
Log Message:
Improve issue with pasted pictures not saving

Index: MaterialPictSelectDialog.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/Document/MaterialPictSelectDialog.cpp,v
retrieving revision 1.19.2.1
retrieving revision 1.19.2.2
diff -C2 -d -r1.19.2.1 -r1.19.2.2
*** MaterialPictSelectDialog.cpp	29 Dec 2006 21:18:20 -0000	1.19.2.1
--- MaterialPictSelectDialog.cpp	10 Jan 2007 12:07:30 -0000	1.19.2.2
***************
*** 255,259 ****
  	XGUUID					uidName;
  	char					filename[256];
! 	unsigned char			uidStr[64];
  	XGFileSpecifier			spec;
  	bool					foundPicture = false;
--- 255,259 ----
  	XGUUID					uidName;
  	char					filename[256];
! 	char					uidStr[64];
  	XGFileSpecifier			spec;
  	bool					foundPicture = false;
***************
*** 262,271 ****
  	PictureSelectDialog::HandlePaste();
  	uidName.Generate();
! 	uidName.ConvertToBytes(uidStr);
  	
! 	inHdl.SetMemory(0, 16, uidStr);
! 	inHdl.SetSize(256);
! 	yaaf::YAAFEncodeBase64(outHdl, inHdl);
! 	outHdl.GetMemory(0, 22, uidStr);
  	uidStr[22] = '\0';
  
--- 262,271 ----
  	PictureSelectDialog::HandlePaste();
  	uidName.Generate();
! 	uidName.ConvertToString(uidStr);
  	
! //	inHdl.SetMemory(0, 16, uidStr);
! //	inHdl.SetSize(256);
! //	yaaf::YAAFEncodeBase64(outHdl, inHdl);
! //	outHdl.GetMemory(0, 22, uidStr);
  	uidStr[22] = '\0';
  
***************
*** 327,335 ****
  		
  		_defaultPicture = RGCompression::DecompressFile(spec, 0, 0, &height, &width);
! 		newEntry.SetLocalPath(fileNameObj);
! 		_defaultPictEntry = newEntry;
! 		_valuePasted = true;
! 		ChangeDefaultPicture(_defaultPicture);
! 		RebuildBottomPane();
  	}
  }
--- 327,338 ----
  		
  		_defaultPicture = RGCompression::DecompressFile(spec, 0, 0, &height, &width);
! 		if(_defaultPicture != NULL)
! 		{
! 			newEntry.SetLocalPath(fileNameObj);
! 			_defaultPictEntry = newEntry;
! 			_valuePasted = true;
! 			ChangeDefaultPicture(_defaultPicture);
! 			RebuildBottomPane();
! 		}
  	}
  }