Attachment #273189 for bug #362939

View | Details | Raw Unified | Return to bug 362939
Collapse All | Expand All





	// Read in the system configuration file.
	boost::filesystem::path systemRcPath = rootPath / AQSIS_XSTR(AQSIS_MAIN_CONFIG_NAME);
	std::ifstream rcFile(systemRcPath.c_str(), std::ios::binary);
	if(rcFile)
	{
		Aqsis::log() << info
			<< "Reading system config \"" << systemRcPath << "\"\n";
		QGetRenderContext()->parseRibStream(rcFile, systemRcPath.native());
		rcFile.close();
	}
	else

		boost::filesystem::path homeRcPath = homePath;
		homeRcPath /= ".aqsisrc";

		std::ifstream rcFile(homeRcPath.c_str(), std::ios::binary);
		if(rcFile)
		{
			Aqsis::log() << info << "Reading user config \"" << homeRcPath << "\"\n";
			QGetRenderContext()->parseRibStream(rcFile, homeRcPath.native());
		}
		else
		{
			boost::filesystem::path homeRcPath2 = homePath;
			homeRcPath2 /= "_aqsisrc";
		
			std::ifstream rcFile(homeRcPath2.c_str(), std::ios::binary);
			if(rcFile)
			{
				Aqsis::log() << info << "Reading user config \"" << homeRcPath2 << "\"\n";
				QGetRenderContext()->parseRibStream(rcFile, homeRcPath2.native());
			}
			else
			{

Lines 349-355 Link Here

(-)aqsis-1.6.0/libs/core/ddmanager/ddmanager.cpp (-1 / +1 lines)
349	}	349	}
350		350
351	// Load the dynamic object and locate the relevant symbols.	351	// Load the dynamic object and locate the relevant symbols.
352	CqString strDriverPathAndFile = displayPath.file_string();	352	CqString strDriverPathAndFile = displayPath.native();
353	m_DriverHandle = dspyPlugin.SimpleDLOpen( &strDriverPathAndFile );	353	m_DriverHandle = dspyPlugin.SimpleDLOpen( &strDriverPathAndFile );
354	if ( m_DriverHandle != NULL )	354	if ( m_DriverHandle != NULL )
355	{	355	{

Lines 392-398 Link Here

(-)aqsis-1.6.0/libs/core/geometry/blobby.cpp (-1 / +1 lines)
392	try	392	try
393	{	393	{
394	CqString fullName = QGetRenderContext()->poptCurrent()	394	CqString fullName = QGetRenderContext()->poptCurrent()
395	->findRiFile(dboName, "procedural").file_string();	395	->findRiFile(dboName, "procedural").native();
396	DBO_handle = DBO.SimpleDLOpen(&fullName);	396	DBO_handle = DBO.SimpleDLOpen(&fullName);
397	}	397	}
398	catch(XqInvalidFile& /e/)	398	catch(XqInvalidFile& /e/)

Lines 155-161 Link Here

(-)aqsis-1.6.0/libs/core/geometry/procedural.cpp (-2 / +2 lines)
155	+ CqString ("\" in current searchpath");	155	+ CqString ("\" in current searchpath");
156	return;	156	return;
157	}	157	}
158	CqString strRealName = dsoPath.file_string();	158	CqString strRealName = dsoPath.native();
159	void *handle = DLOpen( &strRealName );	159	void *handle = DLOpen( &strRealName );
160		160
161	if ( ( m_ppvfcts = ( void * ( * ) ( char * ) ) DLSym(handle, &strConver) ) == NULL )	161	if ( ( m_ppvfcts = ( void * ( * ) ( char * ) ) DLSym(handle, &strConver) ) == NULL )
Lines 315-321 Link Here
315	AQSIS_THROW_XQERROR(XqValidation, EqE_BadToken, "program name not present");	315	AQSIS_THROW_XQERROR(XqValidation, EqE_BadToken, "program name not present");
316	// Attempt to find the program in the procedural path	316	// Attempt to find the program in the procedural path
317	std::string progName = QGetRenderContext()->poptCurrent()	317	std::string progName = QGetRenderContext()->poptCurrent()
318	->findRiFileNothrow(argv[0], "procedural").file_string();	318	->findRiFileNothrow(argv[0], "procedural").native();
319	if(progName.empty())	319	if(progName.empty())
320	{	320	{
321	progName = argv[0];	321	progName = argv[0];

Lines 1195-1201 Link Here

(-)aqsis-1.6.0/libs/core/renderer.cpp (-1 / +1 lines)
1195	if(shaderFile)	1195	if(shaderFile)
1196	{	1196	{
1197	Aqsis::log() << info << "Loading shader \"" << strName	1197	Aqsis::log() << info << "Loading shader \"" << strName
1198	<< "\" from file \"" << shaderPath.file_string()	1198	<< "\" from file \"" << shaderPath.native()
1199	<< "\"" << std::endl;	1199	<< "\"" << std::endl;
1200		1200
1201	std::string dsoPath;	1201	std::string dsoPath;

Lines 578-584 Link Here

(-)aqsis-1.6.0/libs/core/texturing_old/texturemap_old.cpp (-2 / +2 lines)
578	}	578	}
579		579
580	// Now open it as a tiff file.	580	// Now open it as a tiff file.
581	m_pImage = TIFFOpen( imagePath.file_string().c_str(), "r" );	581	m_pImage = TIFFOpen( imagePath.c_str(), "r" );
582	}	582	}
583		583
584	if ( m_pImage )	584	if ( m_pImage )
Lines 1090-1096 Link Here
1090	Aqsis::log() << error << "Cannot open texture file \"" << m_strName.c_str() << "\"" << std::endl;	1090	Aqsis::log() << error << "Cannot open texture file \"" << m_strName.c_str() << "\"" << std::endl;
1091	return ;	1091	return ;
1092	}	1092	}
1093	m_pImage = TIFFOpen(imagePath.file_string().c_str(), "r" );	1093	m_pImage = TIFFOpen(imagePath.c_str(), "r" );
1094		1094
1095	if ( m_pImage )	1095	if ( m_pImage )
1096	{	1096	{




				// If the path points to a directory, we add each library in the
				// named directory to the list of DSO candidates.
				std::vector<std::string> files = Glob(
						((*path)/"*" SHARED_LIBRARY_SUFFIX).native() );
				m_DSOPathList.insert(m_DSOPathList.end(), files.begin(), files.end());
			}
			else
			{
				// else add the file itself.
				m_DSOPathList.push_back(path->native());
			}
		}
		catch(boost::filesystem::filesystem_error& /*e*/)

Lines 163-169 Link Here

(-)aqsis-1.6.0/libs/tex/io/exrinputfile.cpp (-1 / +1 lines)
163	{	163	{
164	try	164	try
165	{	165	{
166	m_exrFile.reset(new Imf::InputFile(fileName.file_string().c_str()));	166	m_exrFile.reset(new Imf::InputFile(fileName.c_str()));
167	}	167	}
168	catch(Iex::BaseExc &e)	168	catch(Iex::BaseExc &e)
169	{	169	{

Lines 59-65 Link Here

(-)aqsis-1.6.0/libs/tex/io/magicnumber.cpp (-1 / +1 lines)
59		59
60	EqImageFileType guessFileType(const boostfs::path& fileName)	60	EqImageFileType guessFileType(const boostfs::path& fileName)
61	{	61	{
62	std::ifstream inFile(fileName.file_string().c_str());	62	std::ifstream inFile(fileName.c_str());
63	if(!inFile)	63	if(!inFile)
64	{	64	{
65	AQSIS_THROW_XQERROR(XqInvalidFile, EqE_NoFile, "Cannot open file \""	65	AQSIS_THROW_XQERROR(XqInvalidFile, EqE_NoFile, "Cannot open file \""

Lines 727-733 Link Here

(-)aqsis-1.6.0/libs/tex/io/tiffdirhandle.cpp (-1 / +1 lines)
727		727
728	CqTiffFileHandle::CqTiffFileHandle(const boostfs::path& fileName, const char* openMode)	728	CqTiffFileHandle::CqTiffFileHandle(const boostfs::path& fileName, const char* openMode)
729	: m_fileName(fileName),	729	: m_fileName(fileName),
730	m_tiffPtr(TIFFOpen(fileName.file_string().c_str(), openMode), safeTiffClose),	730	m_tiffPtr(TIFFOpen(fileName.c_str(), openMode), safeTiffClose),
731	m_isInputFile(openMode[0] == 'r'),	731	m_isInputFile(openMode[0] == 'r'),
732	m_currDir(0)	732	m_currDir(0)
733	{	733	{

Lines 41-47 Link Here

(-)aqsis-1.6.0/libs/tex/io/zinputfile.cpp (-1 / +1 lines)
41	CqZInputFile::CqZInputFile(const boostfs::path& fileName)	41	CqZInputFile::CqZInputFile(const boostfs::path& fileName)
42	: m_header(),	42	: m_header(),
43	m_fileName(fileName),	43	m_fileName(fileName),
44	m_fileStream(fileName.file_string().c_str(), std::ios::in \| std::ios::binary),	44	m_fileStream(fileName.c_str(), std::ios::in \| std::ios::binary),
45	m_dataBegin(0)	45	m_dataBegin(0)
46	{	46	{
47	if(!m_fileStream.is_open())	47	if(!m_fileStream.is_open())

Lines 335-342 Link Here

(-)aqsis-1.6.0/libs/tex/maketexture/maketexture.cpp (-2 / +2 lines)
335	{	335	{
336	inFileRealName = inFileName.string() + ".tif";	336	inFileRealName = inFileName.string() + ".tif";
337	TqInt bakeRes = static_cast<TqInt>(paramList.find<TqFloat>("bake", 256));	337	TqInt bakeRes = static_cast<TqInt>(paramList.find<TqFloat>("bake", 256));
338	bakeToTiff(inFileName.file_string().c_str(),	338	bakeToTiff(inFileName.c_str(),
339	inFileRealName.file_string().c_str(), bakeRes);	339	inFileRealName.c_str(), bakeRes);
340	}	340	}
341		341
342	// Open the input file	342	// Open the input file

Lines 98-105 Link Here

(-)aqsis-1.6.0/tools/piqsl/displayserverimage.cpp (-2 / +2 lines)
98	++index;	98	++index;
99	}	99	}
100		100
101	setFilename(uniquePath.file_string());	101	setFilename(uniquePath.native());
102	saveToFile(uniquePath.file_string());	102	saveToFile(uniquePath.native());
103	}	103	}
104		104
105		105

Return to bug 362939

Lines 488-499 Link Here

(-)aqsis-1.6.0/libs/core/api/ri.cpp (-6 / +6 lines)
488		488
489	// Read in the system configuration file.	489	// Read in the system configuration file.
490	boost::filesystem::path systemRcPath = rootPath / AQSIS_XSTR(AQSIS_MAIN_CONFIG_NAME);	490	boost::filesystem::path systemRcPath = rootPath / AQSIS_XSTR(AQSIS_MAIN_CONFIG_NAME);
491	std::ifstream rcFile(systemRcPath.file_string().c_str(), std::ios::binary);	491	std::ifstream rcFile(systemRcPath.c_str(), std::ios::binary);
492	if(rcFile)	492	if(rcFile)
493	{	493	{
494	Aqsis::log() << info	494	Aqsis::log() << info
495	<< "Reading system config \"" << systemRcPath << "\"\n";	495	<< "Reading system config \"" << systemRcPath << "\"\n";
496	QGetRenderContext()->parseRibStream(rcFile, systemRcPath.file_string());	496	QGetRenderContext()->parseRibStream(rcFile, systemRcPath.native());
497	rcFile.close();	497	rcFile.close();
498	}	498	}
499	else	499	else
Lines 508-529 Link Here
508	boost::filesystem::path homeRcPath = homePath;	508	boost::filesystem::path homeRcPath = homePath;
509	homeRcPath /= ".aqsisrc";	509	homeRcPath /= ".aqsisrc";
510		510
511	std::ifstream rcFile(homeRcPath.file_string().c_str(), std::ios::binary);	511	std::ifstream rcFile(homeRcPath.c_str(), std::ios::binary);
512	if(rcFile)	512	if(rcFile)
513	{	513	{
514	Aqsis::log() << info << "Reading user config \"" << homeRcPath << "\"\n";	514	Aqsis::log() << info << "Reading user config \"" << homeRcPath << "\"\n";
515	QGetRenderContext()->parseRibStream(rcFile, homeRcPath.file_string());	515	QGetRenderContext()->parseRibStream(rcFile, homeRcPath.native());
516	}	516	}
517	else	517	else
518	{	518	{
519	boost::filesystem::path homeRcPath2 = homePath;	519	boost::filesystem::path homeRcPath2 = homePath;
520	homeRcPath2 /= "_aqsisrc";	520	homeRcPath2 /= "_aqsisrc";
521		521
522	std::ifstream rcFile(homeRcPath2.file_string().c_str(), std::ios::binary);	522	std::ifstream rcFile(homeRcPath2.c_str(), std::ios::binary);
523	if(rcFile)	523	if(rcFile)
524	{	524	{
525	Aqsis::log() << info << "Reading user config \"" << homeRcPath2 << "\"\n";	525	Aqsis::log() << info << "Reading user config \"" << homeRcPath2 << "\"\n";
526	QGetRenderContext()->parseRibStream(rcFile, homeRcPath2.file_string());	526	QGetRenderContext()->parseRibStream(rcFile, homeRcPath2.native());
527	}	527	}
528	else	528	else
529	{	529	{

Lines 101-113 Link Here

(-)aqsis-1.6.0/libs/shadervm/dsoshadeops.cpp (-2 / +2 lines)
101	// If the path points to a directory, we add each library in the	101	// If the path points to a directory, we add each library in the
102	// named directory to the list of DSO candidates.	102	// named directory to the list of DSO candidates.
103	std::vector<std::string> files = Glob(	103	std::vector<std::string> files = Glob(
104	((path)/"" SHARED_LIBRARY_SUFFIX).file_string() );	104	((path)/"" SHARED_LIBRARY_SUFFIX).native() );
105	m_DSOPathList.insert(m_DSOPathList.end(), files.begin(), files.end());	105	m_DSOPathList.insert(m_DSOPathList.end(), files.begin(), files.end());
106	}	106	}
107	else	107	else
108	{	108	{
109	// else add the file itself.	109	// else add the file itself.
110	m_DSOPathList.push_back(path->file_string());	110	m_DSOPathList.push_back(path->native());
111	}	111	}
112	}	112	}
113	catch(boost::filesystem::filesystem_error& /e/)	113	catch(boost::filesystem::filesystem_error& /e/)