mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-01-19 04:52:12 +01:00
patch osg to fix mac compile error
This commit is contained in:
parent
ac76fc768f
commit
5acaffe93c
13
make/3rdparty/osgearth/osg-3.4.patch
vendored
13
make/3rdparty/osgearth/osg-3.4.patch
vendored
@ -1,3 +1,16 @@
|
|||||||
|
diff --git a/include/osgViewer/View b/include/osgViewer/View
|
||||||
|
index 472b489..07ef9ce 100644
|
||||||
|
--- a/include/osgViewer/View
|
||||||
|
+++ b/include/osgViewer/View
|
||||||
|
@@ -127,7 +127,7 @@ class OSGVIEWER_EXPORT View : public osg::View, public osgGA::GUIActionAdapter
|
||||||
|
/** Set the View's image pager.*/
|
||||||
|
void setImagePager(osgDB::ImagePager* ip);
|
||||||
|
|
||||||
|
- template<class T> void setImagePager(const osg::ref_ptr<T>* ip) { setImagePager(ip.get()); }
|
||||||
|
+ template<class T> void setImagePager(const osg::ref_ptr<T>& ip) { setImagePager(ip.get()); }
|
||||||
|
|
||||||
|
/** Get the View's image pager.*/
|
||||||
|
osgDB::ImagePager* getImagePager();
|
||||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||||
index 33edf57..d2ea025 100644
|
index 33edf57..d2ea025 100644
|
||||||
--- a/src/CMakeLists.txt
|
--- a/src/CMakeLists.txt
|
||||||
|
Loading…
x
Reference in New Issue
Block a user