Revision: 103521 https://trac.macports.org/changeset/103521 Author: ryandesign@macports.org Date: 2013-02-28 03:04:27 -0800 (Thu, 28 Feb 2013) Log Message: ----------- povray: update to 3.7.0.RC7; add forgotten libsdl dependency; simplify how --host and --build configure.args are added Modified Paths: -------------- trunk/dports/graphics/povray/Portfile trunk/dports/graphics/povray/files/patch-lseek64.diff trunk/dports/graphics/povray/files/patch-shared_ptr.diff Removed Paths: ------------- trunk/dports/graphics/povray/files/patch-boost-1.50.diff Modified: trunk/dports/graphics/povray/Portfile =================================================================== --- trunk/dports/graphics/povray/Portfile 2013-02-28 09:55:15 UTC (rev 103520) +++ trunk/dports/graphics/povray/Portfile 2013-02-28 11:04:27 UTC (rev 103521) @@ -5,8 +5,7 @@ PortGroup muniversal 1.0 name povray -version 3.7.0.RC6 -revision 2 +version 3.7.0.RC7 set branch [join [lrange [split ${version} .] 0 1] .] categories graphics platforms darwin @@ -20,9 +19,10 @@ homepage http://www.povray.org/ master_sites ${homepage}beta/source/ +use_bzip2 yes -checksums rmd160 1015f19cb48a7dea7dc51b842e3e391aa7eec450 \ - sha256 374957bdb90fb7be5f36f839b3f04ab0a4340f6e8cf369f658d6592a342803e3 +checksums rmd160 e75db88beb10360de917f22e182c7918f017b995 \ + sha256 fd2fdf8673bb20e66d77f550eca7b6052cce971731d11a1f96edd950641c09fd depends_build port:pkgconfig @@ -31,6 +31,7 @@ port:xorg-libsm \ port:xpm \ port:libpng \ + port:libsdl \ port:jpeg \ port:zlib \ port:tiff @@ -39,13 +40,8 @@ # gsed -i 's/\([ (]\)shared_ptr/\1boost::shared_ptr/g' "${@}" # gsed -i 's/^shared_ptr/boost::shared_ptr/g' "${@}" -patchfiles patch-boost-1.50.diff \ - patch-shared_ptr.diff +patchfiles patch-shared_ptr.diff -post-patch { - reinplace "s|3.7.0.RC5|${version}|g" ${worksrcpath}/VERSION ${worksrcpath}/configure -} - configure.env COMPILED_BY="MacPorts" configure.libs -lboost_system-mt configure.args --with-boost=${prefix} \ @@ -80,18 +76,18 @@ if {${os.arch} == "i386" && ${os.major} >= 11} { supported_archs i386 x86_64 set universal_archs_supported {i386 x86_64} -} elseif {${os.arch} == "i386" && ${build_arch} == "x86_64"} { +} elseif {${os.arch} == "i386" && ${configure.build_arch} == "x86_64"} { supported_archs i386 x86_64 ppc set universal_archs_supported {i386 x86_64 ppc} } elseif {${os.arch} == "i386"} { supported_archs i386 ppc set universal_archs_supported {i386 ppc} -} elseif {${build_arch} == "ppc64"} { +} elseif {${configure.build_arch} == "ppc64"} { supported_archs ppc ppc64 set universal_archs_supported {ppc ppc64} } else { - supported_archs ${build_arch} - set universal_archs_supported ${build_arch} + supported_archs ${configure.build_arch} + set universal_archs_supported ${configure.build_arch} } platform darwin { @@ -100,40 +96,24 @@ patch-vfe-uint.diff if {${os.major} <= 10} { + depends_build depends_lib - depends_run pre-fetch { - ui_error "$name does not build on Snow Leopard or earlier." - error "unsupported platform" + ui_error "${name} does not build on OS X 10.6 Snow Leopard or earlier." + return -code error "unsupported OS X version" } } - if {[variant_isset universal]} { - set merger_host(x86_64) x86_64-apple-${os.platform}${os.major} - set merger_host(i386) i686-apple-${os.platform}${os.major} - set merger_host(ppc64) powerpc64-apple-${os.platform}${os.major} - set merger_host(ppc) powerpc-apple-${os.platform}${os.major} - set merger_configure_args(x86_64) "--build=x86_64-apple-${os.platform}${os.major}" - set merger_configure_args(i386) "--build=i686-apple-${os.platform}${os.major}" - set merger_configure_args(ppc) "--build=powerpc-apple-${os.platform}${os.major}" - set merger_configure_args(ppc64) "--build=powerpc64-apple-${os.platform}${os.major}" - } elseif {${build_arch} == "i386"} { - configure.args-append \ - --host=i686-apple-${os.platform}${os.major} \ - --build=i686-apple-${os.platform}${os.major} - } elseif {${build_arch} == "x86_64"} { - configure.args-append \ - --host=x86_64-apple-${os.platform}${os.major} \ - --build=x86_64-apple-${os.platform}${os.major} - } elseif {${build_arch} == "ppc"} { - configure.args-append \ - --host=powerpc-apple-${os.platform}${os.major} \ - --build=powerpc-apple-${os.platform}${os.major} - } elseif {${build_arch} == "ppc64"} { - configure.args-append \ - --host=powerpc64-apple-${os.platform}${os.major} \ - --build=powerpc64-apple-${os.platform}${os.major} + set merger_host(x86_64) x86_64-apple-${os.platform}${os.major} + set merger_host(i386) i686-apple-${os.platform}${os.major} + set merger_host(ppc64) powerpc64-apple-${os.platform}${os.major} + set merger_host(ppc) powerpc-apple-${os.platform}${os.major} + foreach arch ${configure.universal_archs} { + set merger_configure_args(${arch}) --build=$merger_host(${arch}) } + if {![variant_isset universal] && [info exists merger_configure_args(${configure.build_arch})]} { + configure.args-append --host=$merger_host(${configure.build_arch}) $merger_configure_args(${configure.build_arch}) + } } livecheck.type regex Deleted: trunk/dports/graphics/povray/files/patch-boost-1.50.diff =================================================================== --- trunk/dports/graphics/povray/files/patch-boost-1.50.diff 2013-02-28 09:55:15 UTC (rev 103520) +++ trunk/dports/graphics/povray/files/patch-boost-1.50.diff 2013-02-28 11:04:27 UTC (rev 103521) @@ -1,111 +0,0 @@ ---- source/backend/scene/view.cpp.orig 2012-06-10 06:53:44.000000000 -0500 -+++ source/backend/scene/view.cpp 2012-09-05 05:07:51.000000000 -0500 -@@ -1550,7 +1550,7 @@ - } - - boost::xtime t; -- boost::xtime_get (&t, boost::TIME_UTC); -+ boost::xtime_get (&t, boost::TIME_UTC_); - t.sec += 3; - - // this will cause us to wait until the other threads are done. ---- source/base/timer.cpp.orig 2012-02-05 14:54:15.000000000 -0600 -+++ source/base/timer.cpp 2012-09-05 05:07:51.000000000 -0500 -@@ -117,7 +117,7 @@ - POV_LONG TimerDefault::ElapsedRealTime() const - { - boost::xtime t; -- boost::xtime_get(&t, boost::TIME_UTC); -+ boost::xtime_get(&t, boost::TIME_UTC_); - POV_LONG tt = (POV_LONG)(t.sec) * (POV_LONG)(1000000000) + (POV_LONG)(t.nsec); - POV_LONG st = (POV_LONG)(realTimeStart.sec) * (POV_LONG)(1000000000) + (POV_LONG)(realTimeStart.nsec); - return ((tt - st) / (POV_LONG)(1000000)); -@@ -126,7 +126,7 @@ - POV_LONG TimerDefault::ElapsedCPUTime() const - { - boost::xtime t; -- boost::xtime_get(&t, boost::TIME_UTC); -+ boost::xtime_get(&t, boost::TIME_UTC_); - POV_LONG tt = (POV_LONG)(t.sec) * (POV_LONG)(1000000000) + (POV_LONG)(t.nsec); - POV_LONG st = (POV_LONG)(cpuTimeStart.sec) * (POV_LONG)(1000000000) + (POV_LONG)(cpuTimeStart.nsec); - return ((tt - st) / (POV_LONG)(1000000)); -@@ -139,8 +139,8 @@ - - void TimerDefault::Reset() - { -- boost::xtime_get(&realTimeStart, boost::TIME_UTC); -- boost::xtime_get(&cpuTimeStart, boost::TIME_UTC); -+ boost::xtime_get(&realTimeStart, boost::TIME_UTC_); -+ boost::xtime_get(&cpuTimeStart, boost::TIME_UTC_); - } - - } -@@ -155,7 +155,7 @@ - void Delay(unsigned int msec) - { - boost::xtime t; -- boost::xtime_get(&t, boost::TIME_UTC); -+ boost::xtime_get(&t, boost::TIME_UTC_); - POV_ULONG ns = (POV_ULONG)(t.sec) * (POV_ULONG)(1000000000) + (POV_ULONG)(t.nsec) + (POV_ULONG)(msec) * (POV_ULONG)(1000000); - t.sec = (boost::xtime::xtime_sec_t)(ns / (POV_ULONG)(1000000000)); - t.nsec = (boost::xtime::xtime_nsec_t)(ns % (POV_ULONG)(1000000000)); ---- vfe/unix/platformbase.cpp.orig 2012-06-19 11:29:38.000000000 -0500 -+++ vfe/unix/platformbase.cpp 2012-09-05 05:07:51.000000000 -0500 -@@ -126,7 +126,7 @@ - #else - // taken from source/base/timer.cpp - boost::xtime t; -- boost::xtime_get(&t, boost::TIME_UTC); -+ boost::xtime_get(&t, boost::TIME_UTC_); - POV_ULONG ns = (POV_ULONG)(t.sec) * (POV_ULONG)(1000000000) + (POV_ULONG)(t.nsec) + (POV_ULONG)(msec) * (POV_ULONG)(1000000); - t.sec = (boost::xtime::xtime_sec_t)(ns / (POV_ULONG)(1000000000)); - t.nsec = (boost::xtime::xtime_nsec_t)(ns % (POV_ULONG)(1000000000)); ---- vfe/vfepovms.cpp.orig 2012-06-19 11:29:40.000000000 -0500 -+++ vfe/vfepovms.cpp 2012-09-05 05:07:51.000000000 -0500 -@@ -247,7 +247,7 @@ - - // TODO: have a shorter wait but loop, and check for system shutdown - boost::xtime t; -- boost::xtime_get (&t, boost::TIME_UTC); -+ boost::xtime_get (&t, boost::TIME_UTC_); - t.nsec += 50000000 ; - m_Event.timed_wait (lock, t); - ---- vfe/vfesession.cpp.orig 2012-06-19 11:29:40.000000000 -0500 -+++ vfe/vfesession.cpp 2012-09-05 05:07:51.000000000 -0500 -@@ -967,7 +967,7 @@ - if (WaitTime > 0) - { - boost::xtime t; -- boost::xtime_get (&t, boost::TIME_UTC); -+ boost::xtime_get (&t, boost::TIME_UTC_); - t.sec += WaitTime / 1000 ; - t.nsec += (WaitTime % 1000) * 1000000 ; - m_SessionEvent.timed_wait (lock, t); -@@ -1034,7 +1034,7 @@ - // we can't call pause directly since it will result in a thread context - // error. pause must be called from the context of the worker thread. - boost::xtime t; -- boost::xtime_get (&t, boost::TIME_UTC); -+ boost::xtime_get (&t, boost::TIME_UTC_); - t.sec += 3 ; - m_RequestFlag = rqPauseRequest; - if (m_RequestEvent.timed_wait(lock, t) == false) -@@ -1057,7 +1057,7 @@ - // we can't call resume directly since it will result in a thread context - // error. it must be called from the context of the worker thread. - boost::xtime t; -- boost::xtime_get (&t, boost::TIME_UTC); -+ boost::xtime_get (&t, boost::TIME_UTC_); - t.sec += 3 ; - m_RequestFlag = rqResumeRequest; - if (m_RequestEvent.timed_wait(lock, t) == false) -@@ -1123,7 +1123,7 @@ - m_LastError = vfeNoError; - - boost::xtime t; -- boost::xtime_get (&t, boost::TIME_UTC); -+ boost::xtime_get (&t, boost::TIME_UTC_); - t.sec += 3 ; - #ifdef _DEBUG - t.sec += 120; Modified: trunk/dports/graphics/povray/files/patch-lseek64.diff =================================================================== --- trunk/dports/graphics/povray/files/patch-lseek64.diff 2013-02-28 09:55:15 UTC (rev 103520) +++ trunk/dports/graphics/povray/files/patch-lseek64.diff 2013-02-28 11:04:27 UTC (rev 103521) @@ -1,6 +1,6 @@ ---- source/base/image/image.cpp.orig 2012-06-18 19:57:32.000000000 -0500 -+++ source/base/image/image.cpp 2012-09-05 05:23:39.000000000 -0500 -@@ -2884,7 +2884,7 @@ +--- source/base/image/image.cpp.orig 2013-02-05 19:27:13.000000000 -0600 ++++ source/base/image/image.cpp 2013-02-28 04:26:16.000000000 -0600 +@@ -2888,7 +2888,7 @@ meta[0] = sizeof(pixel_type); meta[1] = m_Width; meta[2] = m_Height; @@ -9,7 +9,7 @@ throw POV_EXCEPTION(kFileDataErr, "Intermediate image storage backing file write/seek failed at creation."); if (write(m_File, &meta[0], (int) sizeof(size_type)*3) != (sizeof(size_type)*3)) throw POV_EXCEPTION(kFileDataErr, "Intermediate image storage backing file write failed at creation."); -@@ -3055,7 +3055,7 @@ +@@ -3059,7 +3059,7 @@ #endif pos = block * sizeof(pixel_type) * m_Blocksize; int chunk = sizeof(pixel_type) * m_Blocksize; @@ -18,7 +18,7 @@ throw POV_EXCEPTION(kFileDataErr, "Intermediate image storage backing file read/seek failed."); int bytes = read(m_File, &m_Buffer[0], chunk); if (bytes != (sizeof(pixel_type) * m_Blocksize)) -@@ -3078,7 +3078,7 @@ +@@ -3082,7 +3082,7 @@ if (m_Dirty) { pos = m_CurrentBlock * sizeof(pixel_type) * m_Blocksize; Modified: trunk/dports/graphics/povray/files/patch-shared_ptr.diff =================================================================== --- trunk/dports/graphics/povray/files/patch-shared_ptr.diff 2013-02-28 09:55:15 UTC (rev 103520) +++ trunk/dports/graphics/povray/files/patch-shared_ptr.diff 2013-02-28 11:04:27 UTC (rev 103521) @@ -1,7 +1,6 @@ -diff -Naurp source/backend/bounding/boundingtask.cpp source/backend/bounding/boundingtask.cpp ---- source/backend/bounding/boundingtask.cpp 2012-02-05 12:53:40.000000000 -0800 -+++ source/backend/bounding/boundingtask.cpp 2013-02-05 09:30:29.000000000 -0800 -@@ -187,7 +187,7 @@ class BSPProgress : public BSPTree::Prog +--- source/backend/bounding/boundingtask.cpp 2012-02-05 14:53:40.000000000 -0600 ++++ source/backend/bounding/boundingtask.cpp 2013-02-28 04:20:36.000000000 -0600 +@@ -187,7 +187,7 @@ BSPProgress(); }; @@ -10,10 +9,9 @@ Task(new SceneThreadData(sd), boost::bind(&BoundingTask::SendFatalError, this, _1)), sceneData(sd), boundingThreshold(bt) -diff -Naurp source/backend/bounding/boundingtask.h source/backend/bounding/boundingtask.h ---- source/backend/bounding/boundingtask.h 2012-02-05 12:53:40.000000000 -0800 -+++ source/backend/bounding/boundingtask.h 2013-02-05 09:30:29.000000000 -0800 -@@ -112,7 +112,7 @@ namespace pov +--- source/backend/bounding/boundingtask.h 2012-02-05 14:53:40.000000000 -0600 ++++ source/backend/bounding/boundingtask.h 2013-02-28 04:20:36.000000000 -0600 +@@ -112,7 +112,7 @@ class BoundingTask : public Task { public: @@ -22,28 +20,9 @@ virtual ~BoundingTask(); virtual void Run(); -@@ -123,7 +123,7 @@ class BoundingTask : public Task - - inline SceneThreadData *GetSceneDataPtr() { return (SceneThreadData *)(GetDataPtr()); } - private: -- shared_ptr<SceneData> sceneData; -+ boost::shared_ptr<SceneData> sceneData; - unsigned int boundingThreshold; - - void SendFatalError(pov_base::Exception& e); -diff -Naurp source/backend/control/renderbackend.cpp source/backend/control/renderbackend.cpp ---- source/backend/control/renderbackend.cpp 2012-02-05 12:53:41.000000000 -0800 -+++ source/backend/control/renderbackend.cpp 2013-02-05 09:30:29.000000000 -0800 -@@ -357,7 +357,7 @@ void RenderBackend::CreateScene(POVMS_Me - if(err != kNoErr) - throw POV_EXCEPTION_CODE (err); - -- shared_ptr<Scene> scene(new Scene(backendAddress, msg.GetSourceAddress(), scenecounter + 1)); -+ boost::shared_ptr<Scene> scene(new Scene(backendAddress, msg.GetSourceAddress(), scenecounter + 1)); - - scenecounter++; - -@@ -399,7 +399,7 @@ void RenderBackend::CloseScene(POVMS_Mes +--- source/backend/control/renderbackend.cpp 2012-02-05 14:53:41.000000000 -0600 ++++ source/backend/control/renderbackend.cpp 2013-02-28 04:20:36.000000000 -0600 +@@ -399,7 +399,7 @@ { SceneId sid = msg.GetInt(kPOVAttrib_SceneId); @@ -52,7 +31,7 @@ if(i == scenes.end()) throw POV_EXCEPTION_CODE(kInvalidIdentifierErr); -@@ -435,12 +435,12 @@ void RenderBackend::CreateView(POVMS_Mes +@@ -435,7 +435,7 @@ { SceneId sid = msg.GetInt(kPOVAttrib_SceneId); @@ -61,13 +40,7 @@ if(i == scenes.end()) throw POV_EXCEPTION_CODE(kInvalidIdentifierErr); - -- shared_ptr<View> view(i->second->NewView(msg.TryGetInt(kPOVAttrib_Width, 160), msg.TryGetInt(kPOVAttrib_Height, 120), viewcounter + 1)); -+ boost::shared_ptr<View> view(i->second->NewView(msg.TryGetInt(kPOVAttrib_Width, 160), msg.TryGetInt(kPOVAttrib_Height, 120), viewcounter + 1)); - - viewcounter++; - -@@ -475,7 +475,7 @@ void RenderBackend::CloseView(POVMS_Mess +@@ -475,7 +475,7 @@ { ViewId vid = msg.GetInt(kPOVAttrib_ViewId); @@ -76,7 +49,7 @@ if(i == views.end()) throw POV_EXCEPTION_CODE(kInvalidIdentifierErr); -@@ -511,7 +511,7 @@ void RenderBackend::StartParser(POVMS_Me +@@ -511,7 +511,7 @@ if(validateFrontendAddress(msg.GetSourceAddress()) == false) throw POV_EXCEPTION_CODE(kAuthorisationErr); @@ -85,7 +58,7 @@ if(i == scenes.end()) throw POV_EXCEPTION_CODE(kInvalidIdentifierErr); -@@ -546,7 +546,7 @@ void RenderBackend::StopParser(POVMS_Mes +@@ -546,7 +546,7 @@ { SceneId sid = msg.GetInt(kPOVAttrib_SceneId); @@ -94,7 +67,7 @@ if(i == scenes.end()) throw POV_EXCEPTION_CODE(kInvalidIdentifierErr); -@@ -581,7 +581,7 @@ void RenderBackend::PauseParser(POVMS_Me +@@ -581,7 +581,7 @@ { SceneId sid = msg.GetInt(kPOVAttrib_SceneId); @@ -103,7 +76,7 @@ if(i == scenes.end()) throw POV_EXCEPTION_CODE(kInvalidIdentifierErr); -@@ -616,7 +616,7 @@ void RenderBackend::ResumeParser(POVMS_M +@@ -616,7 +616,7 @@ { SceneId sid = msg.GetInt(kPOVAttrib_SceneId); @@ -112,7 +85,7 @@ if(i == scenes.end()) throw POV_EXCEPTION_CODE(kInvalidIdentifierErr); -@@ -653,7 +653,7 @@ void RenderBackend::StartRender(POVMS_Me +@@ -653,7 +653,7 @@ if(validateFrontendAddress(msg.GetSourceAddress()) == false) throw POV_EXCEPTION_CODE(kAuthorisationErr); @@ -121,7 +94,7 @@ if(i == views.end()) throw POV_EXCEPTION_CODE(kInvalidIdentifierErr); -@@ -691,7 +691,7 @@ void RenderBackend::StopRender(POVMS_Mes +@@ -691,7 +691,7 @@ { ViewId vid = msg.GetInt(kPOVAttrib_ViewId); @@ -130,7 +103,7 @@ if(i == views.end()) throw POV_EXCEPTION_CODE(kInvalidIdentifierErr); -@@ -726,7 +726,7 @@ void RenderBackend::PauseRender(POVMS_Me +@@ -726,7 +726,7 @@ { ViewId vid = msg.GetInt(kPOVAttrib_ViewId); @@ -139,7 +112,7 @@ if(i == views.end()) throw POV_EXCEPTION_CODE(kInvalidIdentifierErr); -@@ -761,7 +761,7 @@ void RenderBackend::ResumeRender(POVMS_M +@@ -761,7 +761,7 @@ { ViewId vid = msg.GetInt(kPOVAttrib_ViewId); @@ -148,10 +121,9 @@ if(i == views.end()) throw POV_EXCEPTION_CODE(kInvalidIdentifierErr); -diff -Naurp source/backend/control/renderbackend.h source/backend/control/renderbackend.h ---- source/backend/control/renderbackend.h 2012-02-05 12:53:41.000000000 -0800 -+++ source/backend/control/renderbackend.h 2013-02-05 09:30:29.000000000 -0800 -@@ -170,8 +170,8 @@ class RenderBackend : public POVMS_Messa +--- source/backend/control/renderbackend.h 2012-02-05 14:53:41.000000000 -0600 ++++ source/backend/control/renderbackend.h 2013-02-28 04:20:36.000000000 -0600 +@@ -170,8 +170,8 @@ SceneId scenecounter; ViewId viewcounter; @@ -162,23 +134,10 @@ map<SceneId, set<ViewId> > scene2views; map<ViewId, SceneId> view2scene; -diff -Naurp source/backend/frame.h source/backend/frame.h ---- source/backend/frame.h 2012-02-05 12:53:41.000000000 -0800 -+++ source/backend/frame.h 2013-02-05 09:30:29.000000000 -0800 -@@ -1037,7 +1037,7 @@ class Interior - SNGL Fade_Distance, Fade_Power; - RGBColour Fade_Colour; - vector<Media> media; -- shared_ptr<SubsurfaceInterior> subsurface; -+ boost::shared_ptr<SubsurfaceInterior> subsurface; +--- source/backend/interior/interior.cpp 2013-01-31 03:14:15.000000000 -0600 ++++ source/backend/interior/interior.cpp 2013-02-28 04:20:36.000000000 -0600 +@@ -122,7 +122,7 @@ - Interior(); - Interior(const Interior&); -diff -Naurp source/backend/interior/interior.cpp source/backend/interior/interior.cpp ---- source/backend/interior/interior.cpp 2012-02-05 12:53:41.000000000 -0800 -+++ source/backend/interior/interior.cpp 2013-02-05 09:30:29.000000000 -0800 -@@ -122,7 +122,7 @@ Interior::Interior() - hollow = false; - subsurface = shared_ptr<SubsurfaceInterior>(); @@ -186,7 +145,7 @@ } Interior::Interior(const Interior& source) -@@ -137,7 +137,7 @@ Interior::Interior(const Interior& sourc +@@ -137,7 +137,7 @@ media = source.media; hollow = source.hollow; IOR = source.IOR; @@ -195,22 +154,9 @@ Caustics = source.Caustics; } -diff -Naurp source/backend/lighting/photonestimationtask.cpp source/backend/lighting/photonestimationtask.cpp ---- source/backend/lighting/photonestimationtask.cpp 2012-02-05 12:53:42.000000000 -0800 -+++ source/backend/lighting/photonestimationtask.cpp 2013-02-05 09:30:29.000000000 -0800 -@@ -191,7 +191,7 @@ void PhotonEstimationTask::Finish() - void PhotonEstimationTask::SearchThroughObjectsEstimatePhotons(vector<ObjectPtr>& Objects, LightSource *Light) - { - ViewThreadData *renderDataPtr = GetViewDataPtr(); -- shared_ptr<SceneData> sceneData = GetSceneData(); -+ boost::shared_ptr<SceneData> sceneData = GetSceneData(); - - /* check this object and all siblings */ - for(vector<ObjectPtr>::iterator Sib = Objects.begin(); Sib != Objects.end(); Sib++) -diff -Naurp source/backend/lighting/photons.cpp source/backend/lighting/photons.cpp ---- source/backend/lighting/photons.cpp 2012-02-05 12:53:42.000000000 -0800 -+++ source/backend/lighting/photons.cpp 2013-02-05 09:30:29.000000000 -0800 -@@ -165,7 +165,7 @@ const int PHOTON_BLOCK_MASK = (PHOTON_BL +--- source/backend/lighting/photons.cpp 2013-02-05 19:27:09.000000000 -0600 ++++ source/backend/lighting/photons.cpp 2013-02-28 04:20:36.000000000 -0600 +@@ -165,7 +165,7 @@ const int INITIAL_BASE_ARRAY_SIZE = 100; @@ -219,7 +165,7 @@ Trace(sd, td, qf, cf, mediaPhotons, noRadiosity), mediaPhotons(sd, td, this, new PhotonGatherer(&sd->mediaPhotonMap, sd->photonSettings)) { -@@ -1019,7 +1019,7 @@ void PhotonTrace::addSurfacePhoton(const +@@ -1020,7 +1020,7 @@ } @@ -228,36 +174,27 @@ MediaFunction(td, t, pg), sceneData(sd) { -@@ -2861,7 +2861,7 @@ int LightTargetCombo::computeMergedFlags +@@ -2808,7 +2808,7 @@ } --void LightTargetCombo::computeAnglesAndDeltas(ViewThreadData* renderDataPtr, shared_ptr<SceneData> sceneData) -+void LightTargetCombo::computeAnglesAndDeltas(ViewThreadData* renderDataPtr, boost::shared_ptr<SceneData> sceneData) +-void LightTargetCombo::computeAnglesAndDeltas(shared_ptr<SceneData> sceneData) ++void LightTargetCombo::computeAnglesAndDeltas(boost::shared_ptr<SceneData> sceneData) { shootingDirection.compute(); -diff -Naurp source/backend/lighting/photons.h source/backend/lighting/photons.h ---- source/backend/lighting/photons.h 2012-02-05 12:53:42.000000000 -0800 -+++ source/backend/lighting/photons.h 2013-02-05 09:30:29.000000000 -0800 -@@ -354,14 +354,14 @@ class PhotonGatherer +--- source/backend/lighting/photons.h 2013-02-05 19:27:09.000000000 -0600 ++++ source/backend/lighting/photons.h 2013-02-28 04:20:36.000000000 -0600 +@@ -354,7 +354,7 @@ class PhotonMediaFunction : public MediaFunction { public: - PhotonMediaFunction(shared_ptr<SceneData> sd, TraceThreadData *td, Trace *t, PhotonGatherer *pg); + PhotonMediaFunction(boost::shared_ptr<SceneData> sd, TraceThreadData *td, Trace *t, PhotonGatherer *pg); - void ComputeMediaAndDepositPhotons(MediaVector& medias, const Ray& ray, Intersection& isect, Colour& colour, Trace::TraceTicket& ticket); + void ComputeMediaAndDepositPhotons(MediaVector& medias, const Ray& ray, const Intersection& isect, Colour& colour, Trace::TraceTicket& ticket); protected: - void DepositMediaPhotons(Colour& colour, MediaVector& medias, LightSourceEntryVector& lights, MediaIntervalVector& mediaintervals, - const Ray& ray, Media *IMedia, int minsamples, bool ignore_photons, bool use_scattering, bool all_constant_and_light_ray, Trace::TraceTicket& ticket); - private: -- shared_ptr<SceneData> sceneData; -+ boost::shared_ptr<SceneData> sceneData; - - void addMediaPhoton(const VECTOR Point, const VECTOR Origin, const RGBColour& LightCol, DBL depthDiff); - }; -@@ -369,7 +369,7 @@ class PhotonMediaFunction : public Media +@@ -369,7 +369,7 @@ class PhotonTrace : public Trace { public: @@ -266,79 +203,62 @@ ~PhotonTrace(); virtual DBL TraceRay(const Ray& ray, Colour& colour, COLC weight, Trace::TraceTicket& ticket, bool continuedRay, DBL maxDepth = 0.0); -@@ -422,7 +422,7 @@ class LightTargetCombo +@@ -422,7 +422,7 @@ ShootingDirection shootingDirection; int computeMergedFlags(); -- void computeAnglesAndDeltas(ViewThreadData* renderDataPtr, shared_ptr<SceneData> sceneData); -+ void computeAnglesAndDeltas(ViewThreadData* renderDataPtr, boost::shared_ptr<SceneData> sceneData); +- void computeAnglesAndDeltas(shared_ptr<SceneData> sceneData); ++ void computeAnglesAndDeltas(boost::shared_ptr<SceneData> sceneData); }; -diff -Naurp source/backend/lighting/photonshootingstrategy.cpp source/backend/lighting/photonshootingstrategy.cpp ---- source/backend/lighting/photonshootingstrategy.cpp 2012-02-05 12:53:42.000000000 -0800 -+++ source/backend/lighting/photonshootingstrategy.cpp 2013-02-05 09:30:29.000000000 -0800 -@@ -137,7 +137,7 @@ PhotonShootingUnit* PhotonShootingStrate +--- source/backend/lighting/photonshootingstrategy.cpp 2013-02-05 19:27:09.000000000 -0600 ++++ source/backend/lighting/photonshootingstrategy.cpp 2013-02-28 04:20:36.000000000 -0600 +@@ -137,7 +137,7 @@ return unit; } --void PhotonShootingStrategy::createUnitsForCombo(ObjectPtr obj, LightSource* light, ViewThreadData* renderDataPtr, shared_ptr<SceneData> sceneData) -+void PhotonShootingStrategy::createUnitsForCombo(ObjectPtr obj, LightSource* light, ViewThreadData* renderDataPtr, boost::shared_ptr<SceneData> sceneData) +-void PhotonShootingStrategy::createUnitsForCombo(ObjectPtr obj, LightSource* light, shared_ptr<SceneData> sceneData) ++void PhotonShootingStrategy::createUnitsForCombo(ObjectPtr obj, LightSource* light, boost::shared_ptr<SceneData> sceneData) { PhotonShootingUnit* unit = new PhotonShootingUnit(light, obj); - unit->lightAndObject.computeAnglesAndDeltas(renderDataPtr, sceneData); -diff -Naurp source/backend/lighting/photonshootingstrategy.h source/backend/lighting/photonshootingstrategy.h ---- source/backend/lighting/photonshootingstrategy.h 2012-02-05 12:53:42.000000000 -0800 -+++ source/backend/lighting/photonshootingstrategy.h 2013-02-05 09:30:29.000000000 -0800 -@@ -113,7 +113,7 @@ class PhotonShootingStrategy + unit->lightAndObject.computeAnglesAndDeltas(sceneData); +--- source/backend/lighting/photonshootingstrategy.h 2013-01-31 03:14:16.000000000 -0600 ++++ source/backend/lighting/photonshootingstrategy.h 2013-02-28 04:20:36.000000000 -0600 +@@ -113,7 +113,7 @@ vector<PhotonShootingUnit*> units; -- void createUnitsForCombo(ObjectPtr obj, LightSource* light, ViewThreadData* renderDataPtr, shared_ptr<SceneData> sceneData); -+ void createUnitsForCombo(ObjectPtr obj, LightSource* light, ViewThreadData* renderDataPtr, boost::shared_ptr<SceneData> sceneData); +- void createUnitsForCombo(ObjectPtr obj, LightSource* light, shared_ptr<SceneData> sceneData); ++ void createUnitsForCombo(ObjectPtr obj, LightSource* light, boost::shared_ptr<SceneData> sceneData); void start(); PhotonShootingUnit* getNextUnit(); -diff -Naurp source/backend/lighting/photonstrategytask.cpp source/backend/lighting/photonstrategytask.cpp ---- source/backend/lighting/photonstrategytask.cpp 2012-02-05 12:53:43.000000000 -0800 -+++ source/backend/lighting/photonstrategytask.cpp 2013-02-05 09:30:29.000000000 -0800 -@@ -229,7 +229,7 @@ void PhotonStrategyTask::Finish() - void PhotonStrategyTask::SearchThroughObjectsCreateUnits(vector<ObjectPtr>& Objects, LightSource *Light) - { - ViewThreadData *renderDataPtr = GetViewDataPtr(); -- shared_ptr<SceneData> sceneData = GetSceneData(); -+ boost::shared_ptr<SceneData> sceneData = GetSceneData(); - - /* check this object and all siblings */ - for(vector<ObjectPtr>::iterator Sib = Objects.begin(); Sib != Objects.end(); Sib++) -diff -Naurp source/backend/lighting/radiosity.cpp source/backend/lighting/radiosity.cpp ---- source/backend/lighting/radiosity.cpp 2012-02-05 12:53:44.000000000 -0800 -+++ source/backend/lighting/radiosity.cpp 2013-02-05 09:30:29.000000000 -0800 -@@ -328,7 +328,7 @@ RadiosityRecursionSettings* SceneRadiosi +--- source/backend/lighting/radiosity.cpp 2013-01-31 03:14:17.000000000 -0600 ++++ source/backend/lighting/radiosity.cpp 2013-02-28 04:20:36.000000000 -0600 +@@ -328,7 +328,7 @@ return recSettings; } -RadiosityFunction::RadiosityFunction(shared_ptr<SceneData> sd, TraceThreadData *td, const SceneRadiositySettings& rs, +RadiosityFunction::RadiosityFunction(boost::shared_ptr<SceneData> sd, TraceThreadData *td, const SceneRadiositySettings& rs, - RadiosityCache& rc, Trace::CooperateFunctor& cf, bool ft, Vector3d camera) : + RadiosityCache& rc, Trace::CooperateFunctor& cf, bool ft, const Vector3d& camera) : threadData(td), trace(sd, td, GetRadiosityQualityFlags(rs, QUALITY_9), cf, media, *this), // TODO FIXME - we can only use hard-coded QUALITY_9 because Radiosity happens to be disabled at lower settings! -diff -Naurp source/backend/lighting/radiosity.h source/backend/lighting/radiosity.h ---- source/backend/lighting/radiosity.h 2012-02-05 12:53:44.000000000 -0800 -+++ source/backend/lighting/radiosity.h 2013-02-05 09:30:29.000000000 -0800 -@@ -314,7 +314,7 @@ class RadiosityFunction : public Trace:: +--- source/backend/lighting/radiosity.h 2013-01-31 03:14:17.000000000 -0600 ++++ source/backend/lighting/radiosity.h 2013-02-28 04:20:36.000000000 -0600 +@@ -314,7 +314,7 @@ // cf - the cooperate functor (whatever that is - some thing that handles inter-thread communication?) // pts - number of the current pretrace step (PRETRACE_FIRST to PRETRACE_MAX, or FINAL_TRACE for main render) // camera - position of the camera - RadiosityFunction(shared_ptr<SceneData> sd, TraceThreadData *td, + RadiosityFunction(boost::shared_ptr<SceneData> sd, TraceThreadData *td, - const SceneRadiositySettings& rs, RadiosityCache& rc, Trace::CooperateFunctor& cf, bool ft, Vector3d camera); + const SceneRadiositySettings& rs, RadiosityCache& rc, Trace::CooperateFunctor& cf, bool ft, const Vector3d& camera); virtual ~RadiosityFunction(); -diff -Naurp source/backend/parser/parse.cpp source/backend/parser/parse.cpp ---- source/backend/parser/parse.cpp 2012-06-13 14:53:47.000000000 -0700 -+++ source/backend/parser/parse.cpp 2013-02-05 09:30:29.000000000 -0800 -@@ -181,7 +181,7 @@ const DBL INFINITE_VOLUME = BOUND_HUGE; +--- source/backend/parser/parse.cpp 2013-01-31 03:14:20.000000000 -0600 ++++ source/backend/parser/parse.cpp 2013-02-28 04:20:36.000000000 -0600 +@@ -181,7 +181,7 @@ * ******************************************************************************/ @@ -347,7 +267,7 @@ Task(new SceneThreadData(sd), boost::bind(&Parser::SendFatalError, this, _1)), sceneData(sd), clockValue(clk), -@@ -9571,7 +9571,7 @@ void Parser::Post_Process (ObjectPtr Obj +@@ -9587,7 +9587,7 @@ /* if(!Object->Texture->Finish->SubsurfaceTranslucency.isZero()) */ if (sceneData->useSubsurface) { @@ -356,10 +276,9 @@ } } -diff -Naurp source/backend/parser/parse.h source/backend/parser/parse.h ---- source/backend/parser/parse.h 2012-03-15 16:19:29.000000000 -0700 -+++ source/backend/parser/parse.h 2013-02-05 09:30:29.000000000 -0800 -@@ -321,7 +321,7 @@ class Parser : public Task +--- source/backend/parser/parse.h 2013-01-31 03:14:20.000000000 -0600 ++++ source/backend/parser/parse.h 2013-02-28 04:20:36.000000000 -0600 +@@ -321,7 +321,7 @@ }; // constructor @@ -368,19 +287,9 @@ void Run(); void Stopped(); -@@ -470,7 +470,7 @@ class Parser : public Task - bool expr_ret(ExprNode *¤t, int stage, int op); - bool expr_err(ExprNode *¤t, int stage, int op); - -- shared_ptr<SceneData> sceneData; // TODO FIXME HACK - make private again once Locate_Filename is fixed [trf] -+ boost::shared_ptr<SceneData> sceneData; // TODO FIXME HACK - make private again once Locate_Filename is fixed [trf] - private: - FPUContext *fnVMContext; - -diff -Naurp source/backend/render/rendertask.cpp source/backend/render/rendertask.cpp ---- source/backend/render/rendertask.cpp 2012-02-05 12:53:52.000000000 -0800 -+++ source/backend/render/rendertask.cpp 2013-02-05 09:30:29.000000000 -0800 -@@ -120,7 +120,7 @@ RenderTask::~RenderTask() +--- source/backend/render/rendertask.cpp 2012-02-05 14:53:52.000000000 -0600 ++++ source/backend/render/rendertask.cpp 2013-02-28 04:20:36.000000000 -0600 +@@ -120,7 +120,7 @@ { } @@ -389,23 +298,10 @@ { return viewData->GetSceneData(); } -diff -Naurp source/backend/render/rendertask.h source/backend/render/rendertask.h ---- source/backend/render/rendertask.h 2012-02-05 12:53:52.000000000 -0800 -+++ source/backend/render/rendertask.h 2013-02-05 09:30:29.000000000 -0800 -@@ -113,7 +113,7 @@ class RenderTask : public Task - virtual void Run() = 0; - virtual void Stopped() = 0; +--- source/backend/render/trace.cpp 2013-02-05 19:27:10.000000000 -0600 ++++ source/backend/render/trace.cpp 2013-02-28 04:20:36.000000000 -0600 +@@ -126,7 +126,7 @@ -- shared_ptr<SceneData>& GetSceneData(); -+ boost::shared_ptr<SceneData>& GetSceneData(); - ViewData *GetViewData(); - - inline ViewThreadData *GetViewDataPtr() { return (ViewThreadData *)(GetDataPtr()); } -diff -Naurp source/backend/render/trace.cpp source/backend/render/trace.cpp ---- source/backend/render/trace.cpp 2012-06-13 14:53:48.000000000 -0700 -+++ source/backend/render/trace.cpp 2013-02-05 09:30:29.000000000 -0800 -@@ -126,7 +126,7 @@ namespace pov - #define MEDIA_AFTER_TEXTURE_INTERPOLATION 1 -Trace::Trace(shared_ptr<SceneData> sd, TraceThreadData *td, unsigned int qf, @@ -413,10 +309,9 @@ CooperateFunctor& cf, MediaFunctor& mf, RadiosityFunctor& rf) : threadData(td), sceneData(sd), -diff -Naurp source/backend/render/trace.h source/backend/render/trace.h ---- source/backend/render/trace.h 2012-06-13 14:53:49.000000000 -0700 -+++ source/backend/render/trace.h 2013-02-05 09:30:29.000000000 -0800 -@@ -261,7 +261,7 @@ class Trace +--- source/backend/render/trace.h 2013-02-05 19:27:11.000000000 -0600 ++++ source/backend/render/trace.h 2013-02-28 04:20:36.000000000 -0600 +@@ -261,7 +261,7 @@ virtual bool CheckRadiosityTraceLevel(const Trace::TraceTicket& ticket) { return false; } }; @@ -425,31 +320,9 @@ CooperateFunctor& cf, MediaFunctor& mf, RadiosityFunctor& af); virtual ~Trace(); -@@ -329,7 +329,7 @@ class Trace - int lightColorCacheIndex; - - /// scene data -- shared_ptr<SceneData> sceneData; -+ boost::shared_ptr<SceneData> sceneData; - - /// maximum trace recursion level found - unsigned int maxFoundTraceLevel; -diff -Naurp source/backend/render/tracepixel.h source/backend/render/tracepixel.h ---- source/backend/render/tracepixel.h 2012-02-05 12:53:53.000000000 -0800 -+++ source/backend/render/tracepixel.h 2013-02-05 09:30:29.000000000 -0800 -@@ -311,7 +311,7 @@ class TracePixel : public Trace - /// camera - Camera camera; - /// scene data -- shared_ptr<SceneData> sceneData; -+ boost::shared_ptr<SceneData> sceneData; - /// thread data - TraceThreadData *threadData; - -diff -Naurp source/backend/scene/scene.cpp source/backend/scene/scene.cpp ---- source/backend/scene/scene.cpp 2012-02-05 12:53:54.000000000 -0800 -+++ source/backend/scene/scene.cpp 2013-02-05 09:30:29.000000000 -0800 -@@ -627,7 +627,7 @@ bool Scene::Failed() +--- source/backend/scene/scene.cpp 2012-02-05 14:53:54.000000000 -0600 ++++ source/backend/scene/scene.cpp 2013-02-28 04:20:36.000000000 -0600 +@@ -627,7 +627,7 @@ return parserTasks.Failed(); } @@ -458,7 +331,7 @@ { if(parserTasks.IsDone() == false) throw POV_EXCEPTION_CODE(kNotNowErr); -@@ -635,7 +635,7 @@ shared_ptr<View> Scene::NewView(unsigned +@@ -635,7 +635,7 @@ if((parserTasks.IsDone() == false) || (parserTasks.Failed() == true)) throw POV_EXCEPTION_CODE(kNotNowErr); @@ -467,30 +340,8 @@ } void Scene::GetStatistics(POVMS_Object& parserStats) -diff -Naurp source/backend/scene/scene.h source/backend/scene/scene.h ---- source/backend/scene/scene.h 2012-02-05 12:53:54.000000000 -0800 -+++ source/backend/scene/scene.h 2013-02-05 09:30:29.000000000 -0800 -@@ -498,7 +498,7 @@ class Scene - * POVMS messages sent to the frontend. - * @return New view bound to the scene's data. - */ -- shared_ptr<View> NewView(unsigned int width, unsigned int height, RenderBackend::ViewId vid); -+ boost::shared_ptr<View> NewView(unsigned int width, unsigned int height, RenderBackend::ViewId vid); - - /** - * Get the POVMS frontend address to send messages to the frontend. -@@ -519,7 +519,7 @@ class Scene - /// scene thread data (i.e. statistics) - vector<SceneThreadData *> sceneThreadData; - /// scene data -- shared_ptr<SceneData> sceneData; -+ boost::shared_ptr<SceneData> sceneData; - /// stop request flag - bool stopRequsted; - /// parser control thread -diff -Naurp source/backend/scene/threaddata.cpp source/backend/scene/threaddata.cpp ---- source/backend/scene/threaddata.cpp 2012-03-15 16:19:39.000000000 -0700 -+++ source/backend/scene/threaddata.cpp 2013-02-05 09:30:29.000000000 -0800 +--- source/backend/scene/threaddata.cpp 2012-03-15 18:19:39.000000000 -0500 ++++ source/backend/scene/threaddata.cpp 2013-02-28 04:20:36.000000000 -0600 @@ -108,7 +108,7 @@ namespace pov { @@ -500,10 +351,9 @@ { for(int i = 0 ; i < 4 ; i++) Fractal_IStack[i] = NULL; -diff -Naurp source/backend/scene/threaddata.h source/backend/scene/threaddata.h ---- source/backend/scene/threaddata.h 2012-02-05 12:53:55.000000000 -0800 -+++ source/backend/scene/threaddata.h 2013-02-05 09:30:29.000000000 -0800 -@@ -130,7 +130,7 @@ class SceneThreadData : public Task::Tas +--- source/backend/scene/threaddata.h 2012-02-05 14:53:55.000000000 -0600 ++++ source/backend/scene/threaddata.h 2013-02-28 04:20:36.000000000 -0600 +@@ -130,7 +130,7 @@ * Create thread local data. * @param sd Scene data defining scene attributes. */ @@ -512,7 +362,7 @@ /** * Get the statistics. -@@ -214,11 +214,11 @@ class SceneThreadData : public Task::Tas +@@ -214,7 +214,7 @@ POV_LONG realTime; unsigned int qualityFlags; // TODO FIXME - remove again @@ -521,15 +371,9 @@ protected: /// scene data -- shared_ptr<SceneData> sceneData; -+ boost::shared_ptr<SceneData> sceneData; - /// render statistics - RenderStatistics renderStats; - -diff -Naurp source/backend/scene/view.cpp source/backend/scene/view.cpp ---- source/backend/scene/view.cpp 2012-06-10 04:53:44.000000000 -0700 -+++ source/backend/scene/view.cpp 2013-02-05 09:30:29.000000000 -0800 -@@ -140,7 +140,7 @@ inline unsigned int MakePowerOfTwo(unsig +--- source/backend/scene/view.cpp 2012-11-21 13:30:02.000000000 -0600 ++++ source/backend/scene/view.cpp 2013-02-28 04:20:36.000000000 -0600 +@@ -140,7 +140,7 @@ return 1 << ii; } @@ -538,7 +382,7 @@ nextBlock(0), completedFirstPass(false), highestTraceLevel(0), -@@ -628,7 +628,7 @@ RadiosityCache& ViewData::GetRadiosityCa +@@ -628,7 +628,7 @@ return radiosityCache; } @@ -547,25 +391,7 @@ viewData(sd), stopRequsted(false), mailbox(0), -@@ -690,7 +690,7 @@ bool View::CheckCameraHollowObject(const - - bool View::CheckCameraHollowObject(const VECTOR point) - { -- shared_ptr<SceneData>& sd = viewData.GetSceneData(); -+ boost::shared_ptr<SceneData>& sd = viewData.GetSceneData(); - - if(sd->boundingMethod == 2) - { -@@ -737,7 +737,7 @@ void View::StartRender(POVMS_Object& ren - unsigned int previewendsize = 0; - unsigned int nextblock = 0; - bool highReproducibility = false; -- shared_ptr<set<unsigned int> > blockskiplist(new set<unsigned int>()); -+ boost::shared_ptr<set<unsigned int> > blockskiplist(new set<unsigned int>()); - - if(renderControlThread == NULL) - #ifndef USE_OFFICIAL_BOOST -@@ -1441,7 +1441,7 @@ void View::SendStatistics(TaskQueue&) +@@ -1441,7 +1441,7 @@ viewThreadData.clear(); } @@ -574,10 +400,9 @@ { viewData.SetNextRectangle(*bsl, fs); } -diff -Naurp source/backend/scene/view.h source/backend/scene/view.h ---- source/backend/scene/view.h 2012-02-05 12:53:55.000000000 -0800 -+++ source/backend/scene/view.h 2013-02-05 09:30:29.000000000 -0800 -@@ -283,7 +283,7 @@ class ViewData +--- source/backend/scene/view.h 2013-01-19 07:50:04.000000000 -0600 ++++ source/backend/scene/view.h 2013-02-28 04:20:36.000000000 -0600 +@@ -284,7 +284,7 @@ * Get the scene data for this view. * @return Scene data. */ @@ -586,16 +411,7 @@ /** * Get the view id for this view. -@@ -382,7 +382,7 @@ class ViewData - /// generated radiosity data - RadiosityCache radiosityCache; - /// scene data -- shared_ptr<SceneData> sceneData; -+ boost::shared_ptr<SceneData> sceneData; - /// view id - RenderBackend::ViewId viewId; - -@@ -406,7 +406,7 @@ class ViewData +@@ -407,7 +407,7 @@ * Create view data. * @param sd Scene data associated with the view data. */ @@ -604,7 +420,7 @@ /** * Destructor. -@@ -521,7 +521,7 @@ class View +@@ -522,7 +522,7 @@ * @param vid Id of this view to include with * POVMS messages sent to the frontend. */ @@ -613,7 +429,7 @@ /// not available View& operator=(const View&); -@@ -545,7 +545,7 @@ class View +@@ -546,7 +546,7 @@ * @param bsl Block serial numbers to skip. * @param fs First block to start with checking with serial number. */ @@ -622,63 +438,60 @@ /** * Thread controlling the render task queue. -diff -Naurp source/backend/shape/truetype.cpp source/backend/shape/truetype.cpp ---- source/backend/shape/truetype.cpp 2012-02-05 12:54:02.000000000 -0800 -+++ source/backend/shape/truetype.cpp 2013-02-05 09:30:29.000000000 -0800 -@@ -395,8 +395,8 @@ ULONG readULONG(IStream *infile, int lin +--- source/backend/shape/truetype.cpp 2013-01-31 03:14:27.000000000 -0600 ++++ source/backend/shape/truetype.cpp 2013-02-28 04:20:36.000000000 -0600 +@@ -395,8 +395,8 @@ int compare_tag4(BYTE *ttf_tag, BYTE *known_tag); /* Internal TTF input routines */ --FontFileInfo *ProcessFontFile(const char *fontfilename, Parser *parser, shared_ptr<SceneData>& sceneData); --FontFileInfo *OpenFontFile(const char *filename, Parser *parser, shared_ptr<SceneData>& sceneData); -+FontFileInfo *ProcessFontFile(const char *fontfilename, Parser *parser, boost::shared_ptr<SceneData>& sceneData); -+FontFileInfo *OpenFontFile(const char *filename, Parser *parser, boost::shared_ptr<SceneData>& sceneData); +-FontFileInfo *ProcessFontFile(const char *fontfilename, const int font_id, Parser *parser, shared_ptr<SceneData>& sceneData); +-FontFileInfo *OpenFontFile(const char *filename, const int font_id, Parser *parser, shared_ptr<SceneData>& sceneData); ++FontFileInfo *ProcessFontFile(const char *fontfilename, const int font_id, Parser *parser, boost::shared_ptr<SceneData>& sceneData); ++FontFileInfo *OpenFontFile(const char *filename, const int font_id, Parser *parser, boost::shared_ptr<SceneData>& sceneData); void ProcessHeadTable(FontFileInfo *ffile, int head_table_offset); void ProcessLocaTable(FontFileInfo *ffile, int loca_table_offset); void ProcessMaxpTable(FontFileInfo *ffile, int maxp_table_offset); -@@ -509,7 +509,7 @@ int compare_tag4(const BYTE *ttf_tag, co - * - +@@ -510,7 +510,7 @@ + * (triggered when filename is null) - Oct 2012 [JG] * ******************************************************************************/ --void TrueType::ProcessNewTTF(CSG *Object, const char *filename, UCS2 *text_string, DBL depth, VECTOR offset, Parser *parser, shared_ptr<SceneData>& sceneData) -+void TrueType::ProcessNewTTF(CSG *Object, const char *filename, UCS2 *text_string, DBL depth, VECTOR offset, Parser *parser, boost::shared_ptr<SceneData>& sceneData) +-void TrueType::ProcessNewTTF(CSG *Object, const char *filename, const int font_id, const UCS2 *text_string, DBL depth, const VECTOR offset, Parser *parser, shared_ptr<SceneData>& sceneData) ++void TrueType::ProcessNewTTF(CSG *Object, const char *filename, const int font_id, const UCS2 *text_string, DBL depth, const VECTOR offset, Parser *parser, boost::shared_ptr<SceneData>& sceneData) { FontFileInfo *ffile; VECTOR local_offset, total_offset; -@@ -760,7 +760,7 @@ void TrueType::ProcessNewTTF(CSG *Object - * Reordered table parsing to avoid lots of file seeking - Jan 1996 [AED] +@@ -770,7 +770,7 @@ + * Added builtin fonts when fontfilename is nullptr - Oct 2012 [JG] * ******************************************************************************/ --FontFileInfo *ProcessFontFile(const char *fontfilename, Parser *parser, shared_ptr<SceneData>& sceneData) -+FontFileInfo *ProcessFontFile(const char *fontfilename, Parser *parser, boost::shared_ptr<SceneData>& sceneData) +-FontFileInfo *ProcessFontFile(const char *fontfilename, const int font_id, Parser *parser, shared_ptr<SceneData>& sceneData) ++FontFileInfo *ProcessFontFile(const char *fontfilename, const int font_id, Parser *parser, boost::shared_ptr<SceneData>& sceneData) { unsigned i; int head_table_offset = 0; -@@ -929,7 +929,7 @@ FontFileInfo *ProcessFontFile(const char - * - +@@ -939,7 +939,7 @@ + * Added support for builtin fonts - Oct 2012 [JG] * ******************************************************************************/ --FontFileInfo *OpenFontFile(const char *asciifn, Parser *parser, shared_ptr<SceneData>& sceneData) -+FontFileInfo *OpenFontFile(const char *asciifn, Parser *parser, boost::shared_ptr<SceneData>& sceneData) +-FontFileInfo *OpenFontFile(const char *asciifn, const int font_id, Parser *parser, shared_ptr<SceneData>& sceneData) ++FontFileInfo *OpenFontFile(const char *asciifn, const int font_id, Parser *parser, boost::shared_ptr<SceneData>& sceneData) { /* int i; */ /* tw, mtg */ - FontFileInfo *fontlist; -diff -Naurp source/backend/shape/truetype.h source/backend/shape/truetype.h ---- source/backend/shape/truetype.h 2012-02-05 12:54:02.000000000 -0800 -+++ source/backend/shape/truetype.h 2013-02-05 09:30:29.000000000 -0800 -@@ -137,7 +137,7 @@ class TrueType : public ObjectBase + FontFileInfo *fontlist = NULL; +--- source/backend/shape/truetype.h 2013-01-31 03:14:27.000000000 -0600 ++++ source/backend/shape/truetype.h 2013-02-28 04:20:36.000000000 -0600 +@@ -137,7 +137,7 @@ virtual void Invert(); virtual void Compute_BBox(); -- static void ProcessNewTTF(CSG *Object, const char *filename, UCS2 *text_string, DBL depth, VECTOR offset, Parser *parser, shared_ptr<SceneData>& sceneData); -+ static void ProcessNewTTF(CSG *Object, const char *filename, UCS2 *text_string, DBL depth, VECTOR offset, Parser *parser, boost::shared_ptr<SceneData>& sceneData); +- static void ProcessNewTTF(CSG *Object, const char *filename, const int font_id, const UCS2 *text_string, DBL depth, const VECTOR offset, Parser *parser, shared_ptr<SceneData>& sceneData); ++ static void ProcessNewTTF(CSG *Object, const char *filename, const int font_id, const UCS2 *text_string, DBL depth, const VECTOR offset, Parser *parser, boost::shared_ptr<SceneData>& sceneData); protected: bool Inside_Glyph(double x, double y, const GlyphStruct* glyph) const; int solve_quad(double *x, double *y, double mindist, DBL maxdist) const; -diff -Naurp source/backend/support/fileutil.cpp source/backend/support/fileutil.cpp ---- source/backend/support/fileutil.cpp 2012-02-05 12:54:03.000000000 -0800 -+++ source/backend/support/fileutil.cpp 2013-02-05 09:30:29.000000000 -0800 -@@ -263,7 +263,7 @@ int InferFileTypeFromExt(const UCS2Strin +--- source/backend/support/fileutil.cpp 2012-12-16 07:32:00.000000000 -0600 ++++ source/backend/support/fileutil.cpp 2013-02-28 04:20:36.000000000 -0600 +@@ -263,7 +263,7 @@ * ******************************************************************************/ @@ -687,7 +500,7 @@ { UCS2String fn(filename); UCS2String foundfile(sd->FindFile(p->GetPOVMSContext(), fn, stype)); -@@ -298,7 +298,7 @@ IStream *Locate_File(Parser *p, shared_p +@@ -298,7 +298,7 @@ return result; } /* TODO FIXME - code above should not be there, this is how it should work but this has bugs [trf] @@ -696,22 +509,20 @@ { UCS2String foundfile(sd->FindFile(p->GetPOVMSContext(), filename, stype)); -diff -Naurp source/backend/support/fileutil.h source/backend/support/fileutil.h ---- source/backend/support/fileutil.h 2012-02-05 12:54:03.000000000 -0800 -+++ source/backend/support/fileutil.h 2013-02-05 09:30:29.000000000 -0800 -@@ -104,7 +104,7 @@ namespace pov +--- source/backend/support/fileutil.h 2012-10-08 08:15:18.000000000 -0500 ++++ source/backend/support/fileutil.h 2013-02-28 04:20:36.000000000 -0600 +@@ -104,7 +104,7 @@ using namespace pov_base; -IStream *Locate_File(Parser *p, shared_ptr<SceneData>& sd, const UCS2String& filename, unsigned int stype, UCS2String& buffer, bool err_flag = false); +IStream *Locate_File(Parser *p, boost::shared_ptr<SceneData>& sd, const UCS2String& filename, unsigned int stype, UCS2String& buffer, bool err_flag = false); + IMemStream *Internal_Font_File(const int font_id, UCS2String& buffer); } - -diff -Naurp source/backend/support/imageutil.cpp source/backend/support/imageutil.cpp ---- source/backend/support/imageutil.cpp 2012-02-05 12:54:03.000000000 -0800 -+++ source/backend/support/imageutil.cpp 2013-02-05 09:30:29.000000000 -0800 -@@ -1457,7 +1457,7 @@ void Destroy_Image(ImageData *image) +--- source/backend/support/imageutil.cpp 2012-06-25 18:36:41.000000000 -0500 ++++ source/backend/support/imageutil.cpp 2013-02-28 04:20:36.000000000 -0600 +@@ -1434,7 +1434,7 @@ } @@ -720,10 +531,9 @@ { unsigned int stype; Image::ImageFileType type; -diff -Naurp source/backend/support/imageutil.h source/backend/support/imageutil.h ---- source/backend/support/imageutil.h 2012-02-05 12:54:03.000000000 -0800 -+++ source/backend/support/imageutil.h 2013-02-05 09:30:29.000000000 -0800 -@@ -176,7 +176,7 @@ bool is_image_opaque(const ImageData *im +--- source/backend/support/imageutil.h 2012-02-05 14:54:03.000000000 -0600 ++++ source/backend/support/imageutil.h 2013-02-28 04:20:36.000000000 -0600 +@@ -176,7 +176,7 @@ ImageData *Copy_Image(ImageData *old); ImageData *Create_Image(void); void Destroy_Image(ImageData *image); @@ -732,10 +542,9 @@ } -diff -Naurp source/backend/support/randomsequences.cpp source/backend/support/randomsequences.cpp ---- source/backend/support/randomsequences.cpp 2012-02-05 12:54:04.000000000 -0800 -+++ source/backend/support/randomsequences.cpp 2013-02-05 09:30:29.000000000 -0800 -@@ -242,7 +242,7 @@ class HybridNumberGenerator : public See +--- source/backend/support/randomsequences.cpp 2013-02-06 16:19:22.000000000 -0600 ++++ source/backend/support/randomsequences.cpp 2013-02-28 04:20:36.000000000 -0600 +@@ -287,7 +287,7 @@ HybridNumberGenerator(size_t size = 0); virtual Type operator()(); @@ -744,18 +553,7 @@ virtual size_t MaxIndex() const; virtual size_t CycleLength() const; virtual void Seed(size_t seed); -@@ -363,8 +363,8 @@ class Halton2dBasedGenerator : public Hy - - protected: - -- shared_ptr<HaltonDoubleGenerator> generatorA; -- shared_ptr<HaltonDoubleGenerator> generatorB; -+ boost::shared_ptr<HaltonDoubleGenerator> generatorA; -+ boost::shared_ptr<HaltonDoubleGenerator> generatorB; - }; - - /** -@@ -439,22 +439,22 @@ class NumberSequenceFactory +@@ -484,11 +484,11 @@ public: /// Sets up the factory to use a given sequence. @@ -769,9 +567,8 @@ + NumberSequenceFactory(boost::shared_ptr<SequentialNumberGenerator<Type> > master, size_t count); /// Gets a reference to a table of pre-computed numbers having at least the given size. /// @note The vector returned may contain more elements than requested. -- shared_ptr<vector<Type> const> operator()(size_t count); -+ boost::shared_ptr<vector<Type> const> operator()(size_t count); - + shared_ptr<vector<Type> const> operator()(size_t count); +@@ -496,10 +496,10 @@ protected: typedef SequentialNumberGenerator<Type> Generator; @@ -785,7 +582,7 @@ GeneratorPtr master; SequenceConstPtr masterSequence; -@@ -474,12 +474,12 @@ class NumberSequenceMetaFactory +@@ -519,12 +519,12 @@ { public: @@ -797,19 +594,19 @@ typedef NumberSequenceFactory<ValueType> Factory; - typedef shared_ptr<Factory> FactoryPtr; + typedef boost::shared_ptr<Factory> FactoryPtr; - typedef boost::weak_ptr<Factory> FactoryWeakPtr; + typedef weak_ptr<Factory> FactoryWeakPtr; typedef std::map<typename GeneratorType::ParameterStruct, FactoryWeakPtr> FactoryTable; -@@ -506,7 +506,7 @@ class PrecomputedNumberGenerator : publi +@@ -551,7 +551,7 @@ public: /// Construct from a sequence factory. - PrecomputedNumberGenerator(shared_ptr<NumberSequenceFactory<Type> > master, size_t size) : + PrecomputedNumberGenerator(boost::shared_ptr<NumberSequenceFactory<Type> > master, size_t size) : HybridNumberGenerator<Type>(size), - values((*master)(size)), - startIndex(startIndex) -@@ -520,11 +520,11 @@ class PrecomputedNumberGenerator : publi + values((*master)(size)) + {} +@@ -564,7 +564,7 @@ return (*values)[i % size]; } /// Returns a particular subset from the sequence. @@ -818,33 +615,16 @@ { // According to C++ standard, template classes cannot refer to parent template classes' members by unqualified name const size_t& size = HybridNumberGenerator<Type>::size; -- shared_ptr<vector<Type> > data(new vector<Type>); -+ boost::shared_ptr<vector<Type> > data(new vector<Type>); - data->reserve(count); - size_t i = index % size; - while (count >= size - i) // handle wrap-around -@@ -539,7 +539,7 @@ class PrecomputedNumberGenerator : publi - - protected: - -- shared_ptr<vector<Type> const> values; -+ boost::shared_ptr<vector<Type> const> values; - size_t startIndex; - - }; -@@ -570,9 +570,9 @@ Type HybridNumberGenerator<Type>::operat +@@ -612,7 +612,7 @@ } template<class Type> -shared_ptr<vector<Type> > HybridNumberGenerator<Type>::GetSequence(size_t count) +boost::shared_ptr<vector<Type> > HybridNumberGenerator<Type>::GetSequence(size_t count) { -- shared_ptr<vector<Type> > data(IndexedNumberGenerator<Type>::GetSequence(index, count)); -+ boost::shared_ptr<vector<Type> > data(IndexedNumberGenerator<Type>::GetSequence(index, count)); + shared_ptr<vector<Type> > data(IndexedNumberGenerator<Type>::GetSequence(index, count)); index += count; - if (size != 0) - index = index % size; -@@ -701,24 +701,24 @@ double HaltonGenerator<Type>::operator[] +@@ -743,24 +743,24 @@ *********************************************************************************/ template<class Type> @@ -873,7 +653,7 @@ { boost::mutex::scoped_lock lock(masterMutex); if (!masterSequence) -@@ -764,16 +764,16 @@ template<class ValueType, class Generato +@@ -806,7 +806,7 @@ boost::mutex NumberSequenceMetaFactory<ValueType, GeneratorType>::lookupMutex; template<class ValueType, class GeneratorType> @@ -882,127 +662,36 @@ { boost::mutex::scoped_lock lock(lookupMutex); if (!lookupTable) - lookupTable = new FactoryTable(); -- shared_ptr<NumberSequenceFactory<ValueType> > factory = (*lookupTable)[param].lock(); -+ boost::shared_ptr<NumberSequenceFactory<ValueType> > factory = (*lookupTable)[param].lock(); +@@ -815,7 +815,7 @@ if (!factory) { -- shared_ptr<GeneratorType> masterGenerator(new GeneratorType(param)); -- factory = shared_ptr<NumberSequenceFactory<ValueType> >(new NumberSequenceFactory<ValueType>(masterGenerator)); -+ boost::shared_ptr<GeneratorType> masterGenerator(new GeneratorType(param)); -+ factory = boost::shared_ptr<NumberSequenceFactory<ValueType> >(new NumberSequenceFactory<ValueType>(masterGenerator)); + shared_ptr<GeneratorType> masterGenerator(new GeneratorType(param)); +- factory = FactoryPtr(new Factory(shared_ptr<SequentialNumberGenerator<ValueType> >(masterGenerator))); ++ factory = FactoryPtr(new Factory(boost::shared_ptr<SequentialNumberGenerator<ValueType> >(masterGenerator))); (*lookupTable)[param] = factory; } return factory; -@@ -929,7 +929,7 @@ SeedableIntGeneratorPtr GetRandomIntGene - { - assert (count > 0); - Mt19937IntGenerator::ParameterStruct param(minval, maxval); -- shared_ptr<NumberSequenceFactory<int> > factory = Mt19937IntMetaFactory::GetFactory(param); -+ boost::shared_ptr<NumberSequenceFactory<int> > factory = Mt19937IntMetaFactory::GetFactory(param); - SeedableIntGeneratorPtr generator(new PrecomputedIntGenerator(factory, count)); - (void)(*generator)(); // legacy fix - return generator; -@@ -939,7 +939,7 @@ SeedableDoubleGeneratorPtr GetRandomDoub - { - assert (count > 0); - Mt19937DoubleGenerator::ParameterStruct param(minval, maxval); -- shared_ptr<NumberSequenceFactory<double> > factory(Mt19937DoubleMetaFactory::GetFactory(param)); -+ boost::shared_ptr<NumberSequenceFactory<double> > factory(Mt19937DoubleMetaFactory::GetFactory(param)); - SeedableDoubleGeneratorPtr generator(new PrecomputedDoubleGenerator(factory, count)); - (void)(*generator)(); // legacy fix - return generator; -@@ -957,7 +957,7 @@ IndexedDoubleGeneratorPtr GetIndexedRand - { - assert (count > 0); - Mt19937DoubleGenerator::ParameterStruct param(minval, maxval); -- shared_ptr<NumberSequenceFactory<double> > factory(Mt19937DoubleMetaFactory::GetFactory(param)); -+ boost::shared_ptr<NumberSequenceFactory<double> > factory(Mt19937DoubleMetaFactory::GetFactory(param)); - return IndexedDoubleGeneratorPtr(new PrecomputedDoubleGenerator(factory, count)); - } - -@@ -966,7 +966,7 @@ SequentialVectorGeneratorPtr GetSubRando - if ((id == 0) && count && (count < LegacyCosWeightedDirectionGenerator::NumEntries)) - { - LegacyCosWeightedDirectionGenerator::ParameterStruct param; -- shared_ptr<NumberSequenceFactory<Vector3d> > factory(LegacyCosWeightedDirectionMetaFactory::GetFactory(param)); -+ boost::shared_ptr<NumberSequenceFactory<Vector3d> > factory(LegacyCosWeightedDirectionMetaFactory::GetFactory(param)); - return SequentialVectorGeneratorPtr(new PrecomputedVectorGenerator(factory, count)); - } - else -@@ -974,7 +974,7 @@ SequentialVectorGeneratorPtr GetSubRando - HaltonCosWeightedDirectionGenerator::ParameterStruct param(primeTable[id % PRIME_TABLE_COUNT], primeTable[(id+1) % PRIME_TABLE_COUNT]); - if (count) - { -- shared_ptr<NumberSequenceFactory<Vector3d> > factory(HaltonCosWeightedDirectionMetaFactory::GetFactory(param)); -+ boost::shared_ptr<NumberSequenceFactory<Vector3d> > factory(HaltonCosWeightedDirectionMetaFactory::GetFactory(param)); - return SequentialVectorGeneratorPtr(new PrecomputedVectorGenerator(factory, count)); - } - else -@@ -987,7 +987,7 @@ SequentialDoubleGeneratorPtr GetSubRando - HaltonDoubleGenerator::ParameterStruct param(primeTable[id % PRIME_TABLE_COUNT], minval, maxval); - if (count) - { -- shared_ptr<NumberSequenceFactory<double> > factory(HaltonUniformDoubleMetaFactory::GetFactory(param)); -+ boost::shared_ptr<NumberSequenceFactory<double> > factory(HaltonUniformDoubleMetaFactory::GetFactory(param)); - return SequentialDoubleGeneratorPtr(new PrecomputedDoubleGenerator(factory, count)); - } - else -@@ -999,7 +999,7 @@ SequentialVectorGeneratorPtr GetSubRando - HaltonUniformDirectionGenerator::ParameterStruct param(primeTable[id % PRIME_TABLE_COUNT], primeTable[(id+1) % PRIME_TABLE_COUNT]); - if (count) - { -- shared_ptr<NumberSequenceFactory<Vector3d> > factory(HaltonUniformDirectionMetaFactory::GetFactory(param)); -+ boost::shared_ptr<NumberSequenceFactory<Vector3d> > factory(HaltonUniformDirectionMetaFactory::GetFactory(param)); - return SequentialVectorGeneratorPtr(new PrecomputedVectorGenerator(factory, count)); - } - else -@@ -1011,7 +1011,7 @@ SequentialVector2dGeneratorPtr GetSubRan - HaltonOnDiscGenerator::ParameterStruct param(primeTable[id % PRIME_TABLE_COUNT], primeTable[(id+1) % PRIME_TABLE_COUNT], radius); - if (count) - { -- shared_ptr<NumberSequenceFactory<Vector2d> > factory(HaltonOnDiscMetaFactory::GetFactory(param)); -+ boost::shared_ptr<NumberSequenceFactory<Vector2d> > factory(HaltonOnDiscMetaFactory::GetFactory(param)); - return SequentialVector2dGeneratorPtr(new PrecomputedVector2dGenerator(factory, count)); - } - else -@@ -1023,7 +1023,7 @@ SequentialVector2dGeneratorPtr GetSubRan - Halton2dGenerator::ParameterStruct param(primeTable[id % PRIME_TABLE_COUNT], primeTable[(id+1) % PRIME_TABLE_COUNT], minX, maxX, minY, maxY); - if (count) - { -- shared_ptr<NumberSequenceFactory<Vector2d> > factory(Halton2dMetaFactory::GetFactory(param)); -+ boost::shared_ptr<NumberSequenceFactory<Vector2d> > factory(Halton2dMetaFactory::GetFactory(param)); - return SequentialVector2dGeneratorPtr(new PrecomputedVector2dGenerator(factory, count)); - } - else -diff -Naurp source/backend/support/randomsequences.h source/backend/support/randomsequences.h ---- source/backend/support/randomsequences.h 2012-02-05 12:54:04.000000000 -0800 -+++ source/backend/support/randomsequences.h 2013-02-05 09:30:29.000000000 -0800 -@@ -177,9 +177,9 @@ class SequentialNumberGenerator +--- source/backend/support/randomsequences.h 2013-01-31 03:14:28.000000000 -0600 ++++ source/backend/support/randomsequences.h 2013-02-28 04:20:36.000000000 -0600 +@@ -179,7 +179,7 @@ /// Returns the next number from the sequence. virtual Type operator()() = 0; /// Returns the next N numbers from the sequence. - virtual shared_ptr<vector<Type> > GetSequence(size_t count) + virtual boost::shared_ptr<vector<Type> > GetSequence(size_t count) { -- shared_ptr<vector<Type> > data(new vector<Type>); -+ boost::shared_ptr<vector<Type> > data(new vector<Type>); + shared_ptr<vector<Type> > data(new vector<Type>); data->reserve(count); - for (size_t i = 0; i < count; i ++) - data->push_back((*this)()); -@@ -206,9 +206,9 @@ class IndexedNumberGenerator +@@ -208,7 +208,7 @@ /// Returns a particular number from the sequence. virtual Type operator[](size_t index) const = 0; /// Returns a particular subsequence from the sequence. - virtual shared_ptr<vector<Type> > GetSequence(size_t index, size_t count) const + virtual boost::shared_ptr<vector<Type> > GetSequence(size_t index, size_t count) const { -- shared_ptr<vector<Type> > data(new vector<Type>); -+ boost::shared_ptr<vector<Type> > data(new vector<Type>); + shared_ptr<vector<Type> > data(new vector<Type>); data->reserve(count); - for (size_t i = 0; i < count; i ++) - data->push_back((*this)[index + i]); -@@ -235,20 +235,20 @@ class IndexedNumberGenerator +@@ -233,20 +233,20 @@ * @{ */ @@ -1037,10 +726,9 @@ /** * @} -diff -Naurp source/backend/support/taskqueue.cpp source/backend/support/taskqueue.cpp ---- source/backend/support/taskqueue.cpp 2012-02-05 12:54:04.000000000 -0800 -+++ source/backend/support/taskqueue.cpp 2013-02-05 09:30:29.000000000 -0800 -@@ -208,7 +208,7 @@ Task::TaskData *TaskQueue::AppendTask(Ta +--- source/backend/support/taskqueue.cpp 2012-02-05 14:54:04.000000000 -0600 ++++ source/backend/support/taskqueue.cpp 2013-02-28 04:20:36.000000000 -0600 +@@ -208,7 +208,7 @@ failed = false; @@ -1049,10 +737,9 @@ Notify(); -diff -Naurp source/backend/support/taskqueue.h source/backend/support/taskqueue.h ---- source/backend/support/taskqueue.h 2012-02-05 12:54:04.000000000 -0800 -+++ source/backend/support/taskqueue.h 2013-02-05 09:30:29.000000000 -0800 -@@ -118,19 +118,19 @@ class TaskQueue +--- source/backend/support/taskqueue.h 2012-02-05 14:54:04.000000000 -0600 ++++ source/backend/support/taskqueue.h 2013-02-28 04:20:36.000000000 -0600 +@@ -118,7 +118,7 @@ }; TaskEntry(EntryType et) : entryType(et) { } @@ -1061,24 +748,9 @@ TaskEntry(POVMS_Message& m) : entryType(kMessage), msg(m) { } TaskEntry(const boost::function1<void, TaskQueue&>& f) : entryType(kFunction), fn(f) { } ~TaskEntry() { } - -- shared_ptr<Task> GetTask() { return task; } -+ boost::shared_ptr<Task> GetTask() { return task; } - POVMS_Message& GetMessage() { return msg; } - boost::function1<void, TaskQueue&>& GetFunction() { return fn; } - - EntryType GetEntryType() { return entryType; } - private: - EntryType entryType; -- shared_ptr<Task> task; -+ boost::shared_ptr<Task> task; - POVMS_Message msg; - boost::function1<void, TaskQueue&> fn; - }; -diff -Naurp source/base/image/colourspace.cpp source/base/image/colourspace.cpp ---- source/base/image/colourspace.cpp 2012-02-05 12:54:10.000000000 -0800 -+++ source/base/image/colourspace.cpp 2013-02-05 09:30:29.000000000 -0800 -@@ -169,7 +169,7 @@ GammaCurvePtr GammaCurve::GetMatching(co +--- source/base/image/colourspace.cpp 2013-02-05 19:27:12.000000000 -0600 ++++ source/base/image/colourspace.cpp 2013-02-28 04:20:36.000000000 -0600 +@@ -169,7 +169,7 @@ else if (oldInstance->Matches(newInstance)) { // Found a matching curve in the cache, so use that instead, and (as far as we're concerned) @@ -1087,32 +759,10 @@ return oldInstance; } } -diff -Naurp source/base/image/colourspace.h source/base/image/colourspace.h ---- source/base/image/colourspace.h 2012-02-05 12:54:10.000000000 -0800 -+++ source/base/image/colourspace.h 2013-02-05 09:30:29.000000000 -0800 -@@ -109,7 +109,7 @@ class SimpleGammaCurve; +--- source/frontend/imageprocessing.cpp 2012-02-05 14:54:16.000000000 -0600 ++++ source/frontend/imageprocessing.cpp 2013-02-28 04:20:36.000000000 -0600 +@@ -121,7 +121,7 @@ - /** - * Class holding a shared reference to a gamma curve. -- * @note This is a boost shared_ptr; the assignment operator (=) may not work as expected, -+ * @note This is a boost boost::shared_ptr; the assignment operator (=) may not work as expected, - * as it is in fact implemented as a swap operation. - * To clone a reference, use "GammaCurvePtr myNewPtr(myOldPtr);". - */ -@@ -117,7 +117,7 @@ typedef boost::shared_ptr<GammaCurve> Ga - - /** - * Class holding a shared reference to a simple gamma curve. -- * @note This is a boost shared_ptr; the assignment operator (=) may not work as expected, -+ * @note This is a boost boost::shared_ptr; the assignment operator (=) may not work as expected, - * as it is in fact implemented as a swap operation. - * To clone a reference, use "SimpleGammaCurvePtr myNewPtr(myOldPtr);". - */ -diff -Naurp source/frontend/imageprocessing.cpp source/frontend/imageprocessing.cpp ---- source/frontend/imageprocessing.cpp 2012-02-05 12:54:16.000000000 -0800 -+++ source/frontend/imageprocessing.cpp 2013-02-05 09:30:29.000000000 -0800 -@@ -121,7 +121,7 @@ enum - ImageProcessing::ImageProcessing(unsigned int width, unsigned int height) { - image = shared_ptr<Image>(Image::Create(width, height, Image::RGBFT_Float)); @@ -1120,7 +770,7 @@ toStderr = toStdout = false; // TODO FIXME - find a better place for this -@@ -135,7 +135,7 @@ ImageProcessing::ImageProcessing(POVMS_O +@@ -135,7 +135,7 @@ unsigned int blockSize(ropts.TryGetInt(kPOVAttrib_RenderBlockSize, 32)); unsigned int maxBufferMem(ropts.TryGetInt(kPOVAttrib_MaxImageBufferMem, 128)); // number is megabytes @@ -1129,7 +779,7 @@ toStdout = OutputIsStdout(ropts); toStderr = OutputIsStderr(ropts); -@@ -143,7 +143,7 @@ ImageProcessing::ImageProcessing(POVMS_O +@@ -143,7 +143,7 @@ image->SetPremultiplied(true); // POV-Ray uses premultiplied opacity for its math, so that's what will end up in the image container } @@ -1138,7 +788,7 @@ { image = img; toStderr = toStdout = false; -@@ -246,7 +246,7 @@ UCS2String ImageProcessing::WriteImage(P +@@ -246,7 +246,7 @@ return UCS2String(); } @@ -1147,10 +797,9 @@ { return image; } -diff -Naurp source/frontend/imageprocessing.h source/frontend/imageprocessing.h ---- source/frontend/imageprocessing.h 2012-02-05 12:54:16.000000000 -0800 -+++ source/frontend/imageprocessing.h 2013-02-05 09:30:29.000000000 -0800 -@@ -114,12 +114,12 @@ class ImageProcessing +--- source/frontend/imageprocessing.h 2012-02-05 14:54:16.000000000 -0600 ++++ source/frontend/imageprocessing.h 2013-02-28 04:20:36.000000000 -0600 +@@ -114,7 +114,7 @@ public: ImageProcessing(unsigned int width, unsigned int height); ImageProcessing(POVMS_Object& ropts); @@ -1159,25 +808,9 @@ virtual ~ImageProcessing(); UCS2String WriteImage(POVMS_Object& ropts, POVMSInt frame = 0, int digits = 0); - -- shared_ptr<Image>& GetImage(); -+ boost::shared_ptr<Image>& GetImage(); - - UCS2String GetOutputFilename(POVMS_Object& ropts, POVMSInt frame, int digits); - bool OutputIsStdout(void) { return toStdout; } -@@ -127,7 +127,7 @@ class ImageProcessing - virtual bool OutputIsStdout(POVMS_Object& ropts); - virtual bool OutputIsStderr(POVMS_Object& ropts); - protected: -- shared_ptr<Image> image; -+ boost::shared_ptr<Image> image; - bool toStdout; - bool toStderr; - -diff -Naurp source/frontend/renderfrontend.cpp source/frontend/renderfrontend.cpp ---- source/frontend/renderfrontend.cpp 2012-02-05 12:54:17.000000000 -0800 -+++ source/frontend/renderfrontend.cpp 2013-02-05 09:30:29.000000000 -0800 -@@ -202,7 +202,7 @@ RenderFrontendBase::~RenderFrontendBase( +--- source/frontend/renderfrontend.cpp 2013-02-09 06:24:07.000000000 -0600 ++++ source/frontend/renderfrontend.cpp 2013-02-28 04:20:36.000000000 -0600 +@@ -202,7 +202,7 @@ // nothing to do } @@ -1186,7 +819,7 @@ { POVMS_Message msg(obj, kPOVMsgClass_BackendControl, kPOVMsgIdent_InitInfo); POVMS_Message result(kPOVObjectClass_ResultData); -@@ -654,7 +654,7 @@ void RenderFrontendBase::NewBackup(POVMS +@@ -664,7 +664,7 @@ MakeBackupPath(ropts, vd, outputpath); if(POV_ALLOW_FILE_WRITE(vd.imageBackupFile().c_str(), POV_File_Data_Backup) == false) throw POV_EXCEPTION(kCannotOpenFileErr, "Permission denied to create render state output file."); @@ -1195,7 +828,7 @@ if(vd.imageBackup != NULL) { Backup_File_Header hdr; -@@ -769,7 +769,7 @@ void RenderFrontendBase::ContinueBackup( +@@ -779,7 +779,7 @@ // if there isn't going to be an output file, we don't write to the state file if(outputToFile == true) { @@ -1204,10 +837,9 @@ if(vd.imageBackup != NULL) { if(vd.imageBackup->open(vd.imageBackupFile().c_str(), IOBase::append) == false) -diff -Naurp source/frontend/renderfrontend.h source/frontend/renderfrontend.h ---- source/frontend/renderfrontend.h 2012-02-05 12:54:18.000000000 -0800 -+++ source/frontend/renderfrontend.h 2013-02-05 09:30:29.000000000 -0800 -@@ -154,7 +154,7 @@ struct SceneData +--- source/frontend/renderfrontend.h 2012-12-16 07:32:02.000000000 -0600 ++++ source/frontend/renderfrontend.h 2013-02-28 04:20:36.000000000 -0600 +@@ -154,7 +154,7 @@ SceneState state; @@ -1216,17 +848,8 @@ mutable list<POVMS_Object> readfiles; mutable list<POVMS_Object> createdfiles; -@@ -164,7 +164,7 @@ struct SceneData +@@ -197,9 +197,9 @@ - list<Path> searchpaths; - -- shared_ptr<TextStreamBuffer> streams[MAX_STREAMS]; -+ boost::shared_ptr<TextStreamBuffer> streams[MAX_STREAMS]; - - UCS2String streamnames[MAX_STREAMS]; - bool consoleoutput[MAX_STREAMS]; -@@ -197,9 +197,9 @@ struct ViewData - ViewState state; - mutable shared_ptr<Image> image; @@ -1238,7 +861,7 @@ Path imageBackupFile; }; -@@ -273,12 +273,12 @@ class RenderFrontendBase : public POVMS_ +@@ -280,12 +280,12 @@ RenderFrontendBase(POVMSContext); virtual ~RenderFrontendBase(); @@ -1255,7 +878,7 @@ protected: set<POVMSAddress> backendaddresses; POVMSContext context; -@@ -345,7 +345,7 @@ class RenderFrontend : public RenderFron +@@ -352,7 +352,7 @@ void ResumeParser(SceneId sid); void StopParser(SceneId sid); @@ -1264,7 +887,7 @@ void CloseView(ViewId vid); ViewData::ViewState GetViewState(ViewId vid); -@@ -355,9 +355,9 @@ class RenderFrontend : public RenderFron +@@ -362,9 +362,9 @@ void ResumeRender(ViewId vid); void StopRender(ViewId vid); @@ -1277,7 +900,7 @@ protected: virtual void HandleParserMessage(SceneId sid, POVMSType ident, POVMS_Object& msg); virtual void HandleFileMessage(SceneId sid, POVMSType ident, POVMS_Object& msg, POVMS_Object& result); -@@ -398,7 +398,7 @@ RenderFrontendBase::SceneId RenderFronte +@@ -405,7 +405,7 @@ sid = RenderFrontendBase::CreateScene(sh.data, backendaddress, obj); @@ -1286,7 +909,7 @@ scenehandler[sid] = sh; scene2views[sid] = set<ViewId>(); -@@ -488,7 +488,7 @@ void RenderFrontend<PARSER_MH, FILE_MH, +@@ -495,7 +495,7 @@ } template<class PARSER_MH, class FILE_MH, class RENDER_MH, class IMAGE_MH> @@ -1295,16 +918,7 @@ { typename map<SceneId, SceneHandler>::iterator shi(scenehandler.find(sid)); -@@ -584,7 +584,7 @@ RenderFrontendBase::ViewId RenderFronten - { - if (imageProcessing == NULL) - throw POV_EXCEPTION(kNullPointerErr, "Internal error: output to file is set, but no ImageProcessing object supplied"); -- shared_ptr<Image> img(imageProcessing->GetImage()); -+ boost::shared_ptr<Image> img(imageProcessing->GetImage()); - if(img != NULL) - { - if((img->GetWidth() != width) || (img->GetHeight() != height)) -@@ -593,11 +593,11 @@ RenderFrontendBase::ViewId RenderFronten +@@ -600,11 +600,11 @@ vh.data.image = img; } else @@ -1318,7 +932,7 @@ viewhandler[vid] = vh; view2scene[vid] = sid; -@@ -771,33 +771,33 @@ void RenderFrontend<PARSER_MH, FILE_MH, +@@ -778,33 +778,33 @@ } template<class PARSER_MH, class FILE_MH, class RENDER_MH, class IMAGE_MH> @@ -1358,10 +972,9 @@ } template<class PARSER_MH, class FILE_MH, class RENDER_MH, class IMAGE_MH> -diff -Naurp source/frontend/simplefrontend.h source/frontend/simplefrontend.h ---- source/frontend/simplefrontend.h 2012-02-05 12:54:18.000000000 -0800 -+++ source/frontend/simplefrontend.h 2013-02-05 09:30:29.000000000 -0800 -@@ -134,10 +134,10 @@ class SimpleFrontend +--- source/frontend/simplefrontend.h 2012-02-05 14:54:18.000000000 -0600 ++++ source/frontend/simplefrontend.h 2013-02-28 04:20:36.000000000 -0600 +@@ -134,10 +134,10 @@ SimpleFrontend(POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, boost::function<Console *()> cfn, boost::function<Display *(unsigned int, unsigned int, GammaCurvePtr)> dfn, @@ -1374,33 +987,7 @@ bool Stop(); bool Pause(); bool Resume(); -@@ -146,9 +146,9 @@ class SimpleFrontend - - State GetState() const; - -- shared_ptr<Console> GetConsole(); -- shared_ptr<Image> GetImage(); -- shared_ptr<Display> GetDisplay(); -+ boost::shared_ptr<Console> GetConsole(); -+ boost::shared_ptr<Image> GetImage(); -+ boost::shared_ptr<Display> GetDisplay(); - private: - RenderFrontend<PARSER_MH, FILE_MH, RENDER_MH, IMAGE_MH> renderFrontend; - POVMSAddress backendAddress; -@@ -156,9 +156,9 @@ class SimpleFrontend - POVMS_Object options; - RenderFrontendBase::SceneId sceneId; - RenderFrontendBase::ViewId viewId; -- shared_ptr<ImageProcessing> imageProcessing; -- shared_ptr<AnimationProcessing> animationProcessing; -- shared_ptr<ShelloutProcessing> shelloutProcessing; -+ boost::shared_ptr<ImageProcessing> imageProcessing; -+ boost::shared_ptr<AnimationProcessing> animationProcessing; -+ boost::shared_ptr<ShelloutProcessing> shelloutProcessing; - boost::function<Console *()> createConsole; - boost::function<Display *(unsigned int, unsigned int, GammaCurvePtr)> createDisplay; - }; -@@ -167,7 +167,7 @@ template<class PARSER_MH, class FILE_MH, +@@ -167,7 +167,7 @@ SimpleFrontend<PARSER_MH, FILE_MH, RENDER_MH, IMAGE_MH>::SimpleFrontend(POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, boost::function<Console *()> cfn, boost::function<Display *(unsigned int, unsigned int, GammaCurvePtr)> dfn, @@ -1409,7 +996,7 @@ renderFrontend(ctx), backendAddress(addr), state(kReady), -@@ -185,7 +185,7 @@ SimpleFrontend<PARSER_MH, FILE_MH, RENDE +@@ -185,7 +185,7 @@ } template<class PARSER_MH, class FILE_MH, class RENDER_MH, class IMAGE_MH> @@ -1418,7 +1005,7 @@ { int width; int height; -@@ -212,16 +212,16 @@ bool SimpleFrontend<PARSER_MH, FILE_MH, +@@ -212,16 +212,16 @@ opts.Set(kPOVAttrib_Declare, declares); if(opts.TryGetInt(kPOVAttrib_FinalFrame, 0) > 0) @@ -1438,7 +1025,7 @@ } Path ip (opts.TryGetString(kPOVAttrib_InputFile, "")); -@@ -493,19 +493,19 @@ State SimpleFrontend<PARSER_MH, FILE_MH, +@@ -493,19 +493,19 @@ } template<class PARSER_MH, class FILE_MH, class RENDER_MH, class IMAGE_MH> @@ -1461,10 +1048,9 @@ { return renderFrontend.GetDisplay(viewId); } -diff -Naurp vfe/unix/syspovconfig.h vfe/unix/syspovconfig.h ---- vfe/unix/syspovconfig.h 2012-06-19 09:29:38.000000000 -0700 -+++ vfe/unix/syspovconfig.h 2013-02-05 09:30:29.000000000 -0800 -@@ -139,7 +139,7 @@ using std::list; +--- vfe/unix/syspovconfig.h 2012-06-19 11:29:38.000000000 -0500 ++++ vfe/unix/syspovconfig.h 2013-02-28 04:20:36.000000000 -0600 +@@ -139,7 +139,7 @@ // to in a few other places. using std::runtime_error; @@ -1473,10 +1059,9 @@ using boost::shared_ptr; #endif // STD_POV_TYPES_DECLARED -diff -Naurp vfe/vfe.cpp vfe/vfe.cpp ---- vfe/vfe.cpp 2012-06-19 09:29:39.000000000 -0700 -+++ vfe/vfe.cpp 2013-02-05 09:30:29.000000000 -0800 -@@ -640,7 +640,7 @@ void vfeProcessRenderOptions::WriteError +--- vfe/vfe.cpp 2013-01-29 08:16:06.000000000 -0600 ++++ vfe/vfe.cpp 2013-02-28 04:20:36.000000000 -0600 +@@ -640,7 +640,7 @@ // //////////////////////////////////////////////////////////////////////////////////////// @@ -1485,7 +1070,7 @@ m_Session(&session), m_PlatformBase(session), renderFrontend (ctx) { backendAddress = addr ; -@@ -656,7 +656,7 @@ VirtualFrontEnd::~VirtualFrontEnd() +@@ -656,7 +656,7 @@ { // file-backed images may require a reference to PlatformBase to delete temporary files // we need to explicitly delete it here since otherwise PlatformBase will have been destroyed @@ -1494,7 +1079,7 @@ imageProcessing.reset(); if (backendAddress != POVMSInvalidAddress) renderFrontend.DisconnectFromBackend(backendAddress); -@@ -747,7 +747,7 @@ bool VirtualFrontEnd::Start(POVMS_Object +@@ -747,7 +747,7 @@ if (m_Session->OutputToFileSet()) { @@ -1503,7 +1088,7 @@ UCS2String filename = imageProcessing->GetOutputFilename (opts, 0, 0); options.SetUCS2String (kPOVAttrib_OutputFile, filename.c_str()); -@@ -774,8 +774,8 @@ bool VirtualFrontEnd::Start(POVMS_Object +@@ -774,8 +774,8 @@ opts.Set(kPOVAttrib_Declare, declares); imageProcessing.reset(); if (m_Session->OutputToFileSet()) @@ -1514,7 +1099,7 @@ options = animationProcessing->GetFrameRenderOptions () ; } -@@ -1151,7 +1151,7 @@ State VirtualFrontEnd::Process() +@@ -1183,7 +1183,7 @@ } // now we display the render window, if enabled @@ -1523,10 +1108,9 @@ if (display != NULL) { vfeDisplay *disp = dynamic_cast<vfeDisplay *>(display.get()); -diff -Naurp vfe/vfe.h vfe/vfe.h ---- vfe/vfe.h 2012-06-19 09:29:39.000000000 -0700 -+++ vfe/vfe.h 2013-02-05 09:30:29.000000000 -0800 -@@ -267,7 +267,7 @@ namespace vfe +--- vfe/vfe.h 2012-06-19 11:29:39.000000000 -0500 ++++ vfe/vfe.h 2013-02-28 04:20:36.000000000 -0600 +@@ -267,7 +267,7 @@ class VirtualFrontEnd { public: @@ -1535,7 +1119,7 @@ virtual ~VirtualFrontEnd() ; virtual bool Start(POVMS_Object& opts) ; -@@ -298,9 +298,9 @@ namespace vfe +@@ -298,9 +298,9 @@ POVMS_Object options; RenderFrontendBase::SceneId sceneId; RenderFrontendBase::ViewId viewId; @@ -1548,10 +1132,9 @@ Console **consoleResult; Display **displayResult; vfeSession* m_Session; -diff -Naurp vfe/vfesession.cpp vfe/vfesession.cpp ---- vfe/vfesession.cpp 2012-06-19 09:29:40.000000000 -0700 -+++ vfe/vfesession.cpp 2013-02-05 09:30:29.000000000 -0800 -@@ -602,7 +602,7 @@ const char *vfeSession::GetBackendStateN +--- vfe/vfesession.cpp 2012-11-21 13:30:03.000000000 -0600 ++++ vfe/vfesession.cpp 2013-02-28 04:20:36.000000000 -0600 +@@ -601,7 +601,7 @@ boost::shared_ptr<Display> vfeSession::GetDisplay() const { if (m_Frontend == NULL) @@ -1560,7 +1143,7 @@ return m_Frontend->GetDisplay(); } -@@ -640,7 +640,7 @@ void vfeSession::WorkerThread() +@@ -639,7 +639,7 @@ m_BackendThread = povray_init (boost::bind(&vfeSession::BackendThreadNotify, this), const_cast<void **>(&pov::RenderThreadAddr)) ; POVMS_Output_Context = pov::POVMS_GUI_Context ; @@ -1569,10 +1152,9 @@ POVMS_Object obj ; m_Frontend = new VirtualFrontEnd (*this, POVMS_Output_Context, (POVMSAddress) pov::RenderThreadAddr, obj, NULL, m_Console) ; -diff -Naurp vfe/vfesession.h vfe/vfesession.h ---- vfe/vfesession.h 2012-06-19 09:29:40.000000000 -0700 -+++ vfe/vfesession.h 2013-02-05 09:30:29.000000000 -0800 -@@ -1294,7 +1294,7 @@ namespace vfe +--- vfe/vfesession.h 2012-06-19 11:29:40.000000000 -0500 ++++ vfe/vfesession.h 2013-02-28 04:20:36.000000000 -0600 +@@ -1294,7 +1294,7 @@ static bool m_Initialized; static vfeSession *m_CurrentSessionTemporaryHack;