summaryrefslogtreecommitdiff
path: root/graphics/povray37/files
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/povray37/files')
-rw-r--r--graphics/povray37/files/patch-vfe_vfe.cpp40
-rw-r--r--graphics/povray37/files/patch-vfe_vfe.h24
-rw-r--r--graphics/povray37/files/patch-vfe_vfesession.cpp20
-rw-r--r--graphics/povray37/files/patch-vfe_vfesession.h11
4 files changed, 95 insertions, 0 deletions
diff --git a/graphics/povray37/files/patch-vfe_vfe.cpp b/graphics/povray37/files/patch-vfe_vfe.cpp
new file mode 100644
index 000000000000..e4a536ad7fa2
--- /dev/null
+++ b/graphics/povray37/files/patch-vfe_vfe.cpp
@@ -0,0 +1,40 @@
+--- vfe/vfe.cpp.orig 2012-06-19 11:29:39.000000000 -0500
++++ vfe/vfe.cpp
+@@ -640,7 +640,7 @@ void vfeProcessRenderOptions::WriteError
+ //
+ ////////////////////////////////////////////////////////////////////////////////////////
+
+-VirtualFrontEnd::VirtualFrontEnd(vfeSession& session, POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, POVMS_Object *result, shared_ptr<Console>& console) :
++VirtualFrontEnd::VirtualFrontEnd(vfeSession& session, POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, POVMS_Object *result, boost::shared_ptr<Console>& console) :
+ m_Session(&session), m_PlatformBase(session), renderFrontend (ctx)
+ {
+ backendAddress = addr ;
+@@ -747,7 +747,7 @@ bool VirtualFrontEnd::Start(POVMS_Object
+
+ if (m_Session->OutputToFileSet())
+ {
+- imageProcessing = shared_ptr<ImageProcessing> (new ImageProcessing (opts));
++ imageProcessing = boost::shared_ptr<ImageProcessing> (new ImageProcessing (opts));
+ UCS2String filename = imageProcessing->GetOutputFilename (opts, 0, 0);
+ options.SetUCS2String (kPOVAttrib_OutputFile, filename.c_str());
+
+@@ -774,8 +774,8 @@ bool VirtualFrontEnd::Start(POVMS_Object
+ opts.Set(kPOVAttrib_Declare, declares);
+ imageProcessing.reset();
+ if (m_Session->OutputToFileSet())
+- imageProcessing = shared_ptr<ImageProcessing> (new ImageProcessing (opts)) ;
+- animationProcessing = shared_ptr<AnimationProcessing> (new AnimationProcessing (opts)) ;
++ imageProcessing = boost::shared_ptr<ImageProcessing> (new ImageProcessing (opts)) ;
++ animationProcessing = boost::shared_ptr<AnimationProcessing> (new AnimationProcessing (opts)) ;
+ options = animationProcessing->GetFrameRenderOptions () ;
+ }
+
+@@ -1151,7 +1151,7 @@ State VirtualFrontEnd::Process()
+ }
+
+ // now we display the render window, if enabled
+- shared_ptr<Display> display(GetDisplay());
++ boost::shared_ptr<Display> display(GetDisplay());
+ if (display != NULL)
+ {
+ vfeDisplay *disp = dynamic_cast<vfeDisplay *>(display.get());
diff --git a/graphics/povray37/files/patch-vfe_vfe.h b/graphics/povray37/files/patch-vfe_vfe.h
new file mode 100644
index 000000000000..84a57dd04e50
--- /dev/null
+++ b/graphics/povray37/files/patch-vfe_vfe.h
@@ -0,0 +1,24 @@
+--- vfe/vfe.h.orig 2012-06-19 11:29:39.000000000 -0500
++++ vfe/vfe.h
+@@ -267,7 +267,7 @@ namespace vfe
+ class VirtualFrontEnd
+ {
+ public:
+- VirtualFrontEnd(vfeSession& session, POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, POVMS_Object *result, shared_ptr<Console>& console) ;
++ VirtualFrontEnd(vfeSession& session, POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, POVMS_Object *result, boost::shared_ptr<Console>& console) ;
+ virtual ~VirtualFrontEnd() ;
+
+ virtual bool Start(POVMS_Object& opts) ;
+@@ -298,9 +298,9 @@ namespace vfe
+ POVMS_Object options;
+ RenderFrontendBase::SceneId sceneId;
+ RenderFrontendBase::ViewId viewId;
+- shared_ptr<AnimationProcessing> animationProcessing ;
+- shared_ptr<ImageProcessing> imageProcessing ;
+- shared_ptr<ShelloutProcessing> shelloutProcessing;
++ boost::shared_ptr<AnimationProcessing> animationProcessing ;
++ boost::shared_ptr<ImageProcessing> imageProcessing ;
++ boost::shared_ptr<ShelloutProcessing> shelloutProcessing;
+ Console **consoleResult;
+ Display **displayResult;
+ vfeSession* m_Session;
diff --git a/graphics/povray37/files/patch-vfe_vfesession.cpp b/graphics/povray37/files/patch-vfe_vfesession.cpp
new file mode 100644
index 000000000000..60378ef159c7
--- /dev/null
+++ b/graphics/povray37/files/patch-vfe_vfesession.cpp
@@ -0,0 +1,20 @@
+--- vfe/vfesession.cpp.orig 2014-04-21 07:36:50.000000000 -0500
++++ vfe/vfesession.cpp
+@@ -602,7 +602,7 @@ const char *vfeSession::GetBackendStateN
+ boost::shared_ptr<Display> vfeSession::GetDisplay() const
+ {
+ if (m_Frontend == NULL)
+- return (shared_ptr<Display>());
++ return (boost::shared_ptr<Display>());
+ return m_Frontend->GetDisplay();
+ }
+
+@@ -640,7 +640,7 @@ void vfeSession::WorkerThread()
+ m_BackendThread = povray_init (boost::bind(&vfeSession::BackendThreadNotify, this), const_cast<void **>(&pov::RenderThreadAddr)) ;
+ POVMS_Output_Context = pov::POVMS_GUI_Context ;
+
+- m_Console = shared_ptr<vfeConsole> (new vfeConsole(this, m_ConsoleWidth)) ;
++ m_Console = boost::shared_ptr<vfeConsole> (new vfeConsole(this, m_ConsoleWidth)) ;
+
+ POVMS_Object obj ;
+ m_Frontend = new VirtualFrontEnd (*this, POVMS_Output_Context, (POVMSAddress) pov::RenderThreadAddr, obj, NULL, m_Console) ;
diff --git a/graphics/povray37/files/patch-vfe_vfesession.h b/graphics/povray37/files/patch-vfe_vfesession.h
new file mode 100644
index 000000000000..d21812712b1e
--- /dev/null
+++ b/graphics/povray37/files/patch-vfe_vfesession.h
@@ -0,0 +1,11 @@
+--- vfe/vfesession.h.orig 2012-06-19 11:29:40.000000000 -0500
++++ vfe/vfesession.h
+@@ -1294,7 +1294,7 @@ namespace vfe
+
+ static bool m_Initialized;
+ static vfeSession *m_CurrentSessionTemporaryHack;
+- shared_ptr<Console> m_Console;
++ boost::shared_ptr<Console> m_Console;
+
+ virtual vfeDisplay *DefaultDisplayCreator (unsigned int width, unsigned int height, GammaCurvePtr gamma, vfeSession *session, bool visible);
+ DisplayCreator m_DisplayCreator;