Attachment #735959 for bug #810227




++ povray-3.7.0.0/vfe/unix/vfeplatform.h

	class UnixShelloutProcessing: public ShelloutProcessing
	{
		public:
			UnixShelloutProcessing(POVMS_Object& opts, const string& scene, unsigned int width, unsigned int height);
			~UnixShelloutProcessing();

			virtual int ProcessID(void);

			virtual void NotifyCriticalError(const char *message, const char *file, int line);
			virtual int RequestNewOutputPath(int CallCount, const string& Reason, const UCS2String& OldPath, UCS2String& NewPath);
			virtual bool TestAccessAllowed(const Path& file, bool isWrite) const;
			virtual ShelloutProcessing *CreateShelloutProcessing(POVMS_Object& opts, const string& scene, unsigned int width, unsigned int height)
				{ return new UnixShelloutProcessing(opts, scene, width, height); }

			boost::shared_ptr<UnixOptionsProcessor> GetUnixOptions(void) { return m_OptionsProc; }
++ povray-3.7.0.0/vfe/unix/vfeplatform.cpp

	// on the requirements for these methods.
	/////////////////////////////////////////////////////////////////////////////

	UnixShelloutProcessing::UnixShelloutProcessing(POVMS_Object& opts, const string& scene, unsigned int width, unsigned int height): ShelloutProcessing(opts, scene, width, height)
	{
		m_ProcessRunning = false;
		m_ProcessId = m_LastError = m_ExitCode = 0;
++ povray-3.7.0.0/vfe/vfesession.h


      // Create an instance of the frontend ShelloutProcessing class. this handles creating and
      // managing render shellout commands, and typically will need platform-specific implementation.
      virtual ShelloutProcessing *CreateShelloutProcessing(POVMS_Object& opts, const string& scene, unsigned int width, unsigned int height) { return new ShelloutProcessing(opts, scene, width, height); }

      struct vfeSessionWorker
      {

Return to bug 810227

Line Link Here

(-)file_not_specified_in_diff (-7 / +7 lines)
0	-- povray-3.7.0.0/vfe/unix/vfeplatform.h.orig	0	++ povray-3.7.0.0/vfe/unix/vfeplatform.h
Lines 47-53 Link Here
47	class UnixShelloutProcessing: public ShelloutProcessing	47	class UnixShelloutProcessing: public ShelloutProcessing
48	{	48	{
49	public:	49	public:
50	UnixShelloutProcessing(POVMS_Object& opts, const string& scene, uint width, uint height);	50	UnixShelloutProcessing(POVMS_Object& opts, const string& scene, unsigned int width, unsigned int height);
51	~UnixShelloutProcessing();	51	~UnixShelloutProcessing();
52		52
53	virtual int ProcessID(void);	53	virtual int ProcessID(void);
Lines 88-94 Link Here
88	virtual void NotifyCriticalError(const char message, const char file, int line);	88	virtual void NotifyCriticalError(const char message, const char file, int line);
89	virtual int RequestNewOutputPath(int CallCount, const string& Reason, const UCS2String& OldPath, UCS2String& NewPath);	89	virtual int RequestNewOutputPath(int CallCount, const string& Reason, const UCS2String& OldPath, UCS2String& NewPath);
90	virtual bool TestAccessAllowed(const Path& file, bool isWrite) const;	90	virtual bool TestAccessAllowed(const Path& file, bool isWrite) const;
91	virtual ShelloutProcessing *CreateShelloutProcessing(POVMS_Object& opts, const string& scene, uint width, uint height)	91	virtual ShelloutProcessing *CreateShelloutProcessing(POVMS_Object& opts, const string& scene, unsigned int width, unsigned int height)
92	{ return new UnixShelloutProcessing(opts, scene, width, height); }	92	{ return new UnixShelloutProcessing(opts, scene, width, height); }
93		93
94	boost::shared_ptr<UnixOptionsProcessor> GetUnixOptions(void) { return m_OptionsProc; }	94	boost::shared_ptr<UnixOptionsProcessor> GetUnixOptions(void) { return m_OptionsProc; }
95	-- povray-3.7.0.0/vfe/unix/vfeplatform.cpp.orig	95	++ povray-3.7.0.0/vfe/unix/vfeplatform.cpp
Lines 324-330 Link Here
324	// on the requirements for these methods.	324	// on the requirements for these methods.
325	/////////////////////////////////////////////////////////////////////////////	325	/////////////////////////////////////////////////////////////////////////////
326		326
327	UnixShelloutProcessing::UnixShelloutProcessing(POVMS_Object& opts, const string& scene, uint width, uint height): ShelloutProcessing(opts, scene, width, height)	327	UnixShelloutProcessing::UnixShelloutProcessing(POVMS_Object& opts, const string& scene, unsigned int width, unsigned int height): ShelloutProcessing(opts, scene, width, height)
328	{	328	{
329	m_ProcessRunning = false;	329	m_ProcessRunning = false;
330	m_ProcessId = m_LastError = m_ExitCode = 0;	330	m_ProcessId = m_LastError = m_ExitCode = 0;
331	-- povray-3.7.0.0/vfe/vfesession.h.orig	331	++ povray-3.7.0.0/vfe/vfesession.h
Lines 1192-1198 Link Here
1192		1192
1193	// Create an instance of the frontend ShelloutProcessing class. this handles creating and	1193	// Create an instance of the frontend ShelloutProcessing class. this handles creating and
1194	// managing render shellout commands, and typically will need platform-specific implementation.	1194	// managing render shellout commands, and typically will need platform-specific implementation.
1195	virtual ShelloutProcessing *CreateShelloutProcessing(POVMS_Object& opts, const string& scene, uint width, uint height) { return new ShelloutProcessing(opts, scene, width, height); }	1195	virtual ShelloutProcessing *CreateShelloutProcessing(POVMS_Object& opts, const string& scene, unsigned int width, unsigned int height) { return new ShelloutProcessing(opts, scene, width, height); }
1196		1196
1197	struct vfeSessionWorker	1197	struct vfeSessionWorker
1198	{	1198	{