From 6b1f793ea7ec7ef92a41e7996b1d1d0b27a031b1 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 6 Jul 2006 14:10:37 +0000 Subject: [PATCH] Updated wrappers --- src/osgWrappers/osg/Image.cpp | 2 +- src/osgWrappers/osg/Referenced.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osgWrappers/osg/Image.cpp b/src/osgWrappers/osg/Image.cpp index 145bfe534..247482948 100644 --- a/src/osgWrappers/osg/Image.cpp +++ b/src/osgWrappers/osg/Image.cpp @@ -47,7 +47,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Image) I_MethodWithDefaults6(void, allocateImage, IN, int, s, , IN, int, t, , IN, int, r, , IN, GLenum, pixelFormat, , IN, GLenum, type, , IN, int, packing, 1); I_MethodWithDefaults9(void, setImage, IN, int, s, , IN, int, t, , IN, int, r, , IN, GLint, internalTextureformat, , IN, GLenum, pixelFormat, , IN, GLenum, type, , IN, unsigned char *, data, , IN, osg::Image::AllocationMode, mode, , IN, int, packing, 1); I_Method6(void, readPixels, IN, int, x, IN, int, y, IN, int, width, IN, int, height, IN, GLenum, pixelFormat, IN, GLenum, type); - I_Method2(void, readImageFromCurrentTexture, IN, unsigned int, contextID, IN, bool, copyMipMapsIfAvailable); + I_MethodWithDefaults3(void, readImageFromCurrentTexture, IN, unsigned int, contextID, , IN, bool, copyMipMapsIfAvailable, , IN, GLenum, type, GL_UNSIGNED_BYTE); I_Method3(void, scaleImage, IN, int, s, IN, int, t, IN, int, r); I_Method4(void, scaleImage, IN, int, s, IN, int, t, IN, int, r, IN, GLenum, newDataType); I_Method4(void, copySubImage, IN, int, s_offset, IN, int, t_offset, IN, int, r_offset, IN, osg::Image *, source); diff --git a/src/osgWrappers/osg/Referenced.cpp b/src/osgWrappers/osg/Referenced.cpp index 007aa8427..74f46551d 100644 --- a/src/osgWrappers/osg/Referenced.cpp +++ b/src/osgWrappers/osg/Referenced.cpp @@ -37,8 +37,8 @@ BEGIN_OBJECT_REFLECTOR(osg::Referenced) I_Method0(void, unref); I_Method0(void, unref_nodelete); I_Method0(int, referenceCount); - I_Method1(void, addObserver, IN, osg::Observer *, observer_ptr); - I_Method1(void, removeObserver, IN, osg::Observer *, observer_ptr); + I_Method1(void, addObserver, IN, osg::Observer *, observer); + I_Method1(void, removeObserver, IN, osg::Observer *, observer); I_Property(bool, ThreadSafeRefUnref); END_REFLECTOR