[visp] 02/08: Remove obsolete patches, bump ABI to 2.9.
Thomas Moulard
thomas_moulard-guest at moszumanska.debian.org
Tue Jun 24 05:19:06 UTC 2014
This is an automated email from the git hooks/post-receive script.
thomas_moulard-guest pushed a commit to branch master
in repository visp.
commit 7084f69ea3b7f9950d59767f778cdcdc8e16f1ef
Author: Fabien Spindler <Fabien.Spindler at inria.fr>
Date: Sun Jun 1 19:15:53 2014 +0200
Remove obsolete patches, bump ABI to 2.9.
---
debian/control | 8 +-
debian/copyright | 4 +-
debian/{libvisp2.8.install => libvisp2.9.install} | 0
...pConfig.h-in-include-architecture-triplet.patch | 25 -
.../0002-Fix-vpLex.c-portability-issue.patch | 27 -
.../0003-Fix-compilation-issue-with-Ogre-1.9.patch | 563 ---------------------
...fig-should-rely-on-pkg-config-information.patch | 43 --
.../0005-Fix-warnings-in-FindMyGTK2.cmake.patch | 140 -----
.../0006-Fix-libusb-CMake-macro-detection.patch | 73 ---
debian/patches/series | 6 -
debian/rules | 2 +-
11 files changed, 7 insertions(+), 884 deletions(-)
diff --git a/debian/control b/debian/control
index da04748..4302aa3 100644
--- a/debian/control
+++ b/debian/control
@@ -56,7 +56,7 @@ Depends: libopencv-dev [!any-sparc64 !x32],
libusb-dev,
libfreenect-dev [!hurd-any],
libois-dev [linux-any],
- libvisp2.8 (= ${binary:Version}),
+ libvisp2.9 (= ${binary:Version}),
${misc:Depends}
Suggests: libvisp-doc
Multi-Arch: same
@@ -71,7 +71,7 @@ Description: visual servoing library - development files
This package contains development files (headers and shared library
symbolic link).
-Package: libvisp2.8
+Package: libvisp2.9
Architecture: any
Multi-Arch: same
Depends: ${shlibs:Depends},
@@ -87,10 +87,10 @@ Description: visual servoing library
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp2.8-dbg
+Package: libvisp2.9-dbg
Architecture: any
Section: debug
-Depends: libvisp2.8 (= ${binary:Version}),
+Depends: libvisp2.9 (= ${binary:Version}),
${misc:Depends}
Multi-Arch: same
Description: visual servoing library - debugging symbols
diff --git a/debian/copyright b/debian/copyright
index bf9cb5d..2b2f8b9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Contact: visp at inria.fr
Source: http://www.irisa.fr/lagadic/visp/download.html
Files: *
-Copyright: 2005-2012, INRIA
+Copyright: 2005-2014, INRIA
License: GPL-2
See `/usr/share/common-licenses/GPL-2'.
@@ -64,6 +64,6 @@ License: Tcl/Tk license
Files: debian/*
-Copyright: 2012, Thomas Moulard <thomas.moulard at gmail.com>
+Copyright: 2014, Thomas Moulard <thomas.moulard at gmail.com>
License: GPL-2
See `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/libvisp2.8.install b/debian/libvisp2.9.install
similarity index 100%
rename from debian/libvisp2.8.install
rename to debian/libvisp2.9.install
diff --git a/debian/patches/0001-Install-vpConfig.h-in-include-architecture-triplet.patch b/debian/patches/0001-Install-vpConfig.h-in-include-architecture-triplet.patch
deleted file mode 100644
index 8b817eb..0000000
--- a/debian/patches/0001-Install-vpConfig.h-in-include-architecture-triplet.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Thomas Moulard <thomas.moulard at gmail.com>
-Date: Wed, 15 May 2013 14:18:03 +0900
-Subject: Install vpConfig.h in include/<architecture triplet>.
-
-Install vpConfig.h in include/<architecture triplet>.
-
-Author: Thomas Moulard <thomas.moulard at gmail.com>
-Forwarded: no (not relevant)
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f83aaf5..18764c4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2041,7 +2041,7 @@ CMAKE_EXPORT_BUILD_SETTINGS(
-
- # Install vpConfig.h that may differ from the one in include/visp
- INSTALL(FILES ${VISP_BINARY_DIR}/install/vpConfig.h
-- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/visp
-+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_LIBRARY_ARCHITECTURE}/visp
- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
- COMPONENT headers
- )
diff --git a/debian/patches/0002-Fix-vpLex.c-portability-issue.patch b/debian/patches/0002-Fix-vpLex.c-portability-issue.patch
deleted file mode 100644
index 41666f3..0000000
--- a/debian/patches/0002-Fix-vpLex.c-portability-issue.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Thomas Moulard <thomas.moulard at gmail.com>
-Date: Thu, 26 Sep 2013 12:26:42 +0900
-Subject: Fix vpLex.c portability issue.
-
-Author: Rebecca N. Palmer <r.palmer at bham.ac.uk>
-Forwarded: yes
----
- src/simulator/wireframe-simulator/core/vpLex.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/simulator/wireframe-simulator/core/vpLex.c b/src/simulator/wireframe-simulator/core/vpLex.c
-index 366dfc3..e56a097 100755
---- a/src/simulator/wireframe-simulator/core/vpLex.c
-+++ b/src/simulator/wireframe-simulator/core/vpLex.c
-@@ -239,9 +239,9 @@ void close_lex (void)
-
-
- #define ECHO printf ("%c", *(mysptr))
--#define CURC (*mysptr) /* caractere courant */
--#define NEXTC (*(mysptr+1)) /* caractere suivant */
--#define PREVC (*(mysptr-1)) /* caractere precedent */
-+#define CURC (*((signed char *)mysptr)) /* caractere courant */
-+#define NEXTC (*((signed char *)mysptr+1)) /* caractere suivant */
-+#define PREVC (*((signed char *)mysptr-1)) /* caractere precedent */
-
-
- /*
diff --git a/debian/patches/0003-Fix-compilation-issue-with-Ogre-1.9.patch b/debian/patches/0003-Fix-compilation-issue-with-Ogre-1.9.patch
deleted file mode 100644
index 8c529a7..0000000
--- a/debian/patches/0003-Fix-compilation-issue-with-Ogre-1.9.patch
+++ /dev/null
@@ -1,563 +0,0 @@
-From: Thomas Moulard <thomas.moulard at gmail.com>
-Date: Thu, 26 Sep 2013 15:58:17 +0900
-Subject: Fix compilation issue with Ogre 1.9.
-
-Author: Thomas Moulard <thomas.moulard at gmail.com>
-Forwarded: yes
----
- src/simulator/ogre-simulator/vpAROgre.cpp | 177 +++++++++++++++---------------
- 1 file changed, 91 insertions(+), 86 deletions(-)
-
-diff --git a/src/simulator/ogre-simulator/vpAROgre.cpp b/src/simulator/ogre-simulator/vpAROgre.cpp
-index bcedcc3..9f3dfe1 100644
---- a/src/simulator/ogre-simulator/vpAROgre.cpp
-+++ b/src/simulator/ogre-simulator/vpAROgre.cpp
-@@ -4,7 +4,7 @@
- *
- * This file is part of the ViSP software.
- * Copyright (C) 2005 - 2013 by INRIA. All rights reserved.
-- *
-+ *
- * This software is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * ("GPL") version 2 as published by the Free Software Foundation.
-@@ -12,11 +12,11 @@
- * distribution for additional information about the GNU GPL.
- *
- * For using ViSP with software that can not be combined with the GNU
-- * GPL, please contact INRIA about acquiring a ViSP Professional
-+ * GPL, please contact INRIA about acquiring a ViSP Professional
- * Edition License.
- *
- * See http://www.irisa.fr/lagadic/visp/visp.html for more information.
-- *
-+ *
- * This software was developed at:
- * INRIA Rennes - Bretagne Atlantique
- * Campus Universitaire de Beaulieu
-@@ -26,7 +26,7 @@
- *
- * If you have questions regarding the use of this file, please contact
- * INRIA at visp at inria.fr
-- *
-+ *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
-@@ -72,8 +72,8 @@
- telling Ogre where to look for renderer plugins.
-
- */
--vpAROgre::vpAROgre(const vpCameraParameters &cam,
-- unsigned int width, unsigned int height,
-+vpAROgre::vpAROgre(const vpCameraParameters &cam,
-+ unsigned int width, unsigned int height,
- const char *resourcePath, const char *pluginsPath)
- : mRoot(0), mCamera(0), mSceneMgr(0), mWindow(0)
- #ifdef VISP_HAVE_OIS
-@@ -96,12 +96,12 @@ vpAROgre::vpAROgre(const vpCameraParameters &cam,
- windowHidden = false;
- mshowConfigDialog = true;
- mOptionnalResourceLocation.clear();
--
-+
- name = "ViSP - Augmented Reality";
- }
-
- /*!
-- Initialisation of Ogre with a grey level background.
-+ Initialisation of Ogre with a grey level background.
-
- Load the plugins that are specified in the plugins.cfg or
- plugins_d.cfg files. These files are located in
-@@ -109,27 +109,27 @@ vpAROgre::vpAROgre(const vpCameraParameters &cam,
- Note that plugins.cfg file is always considered under Unix
- platforms. The file plugins_d.cfg is only considered under Windows
- when the build type is Debug.
--
-+
- Load also the resources that are defined in the resources.cfg
- file. This file is located in VISP_HAVE_OGRE_RESOURCES_PATH folder
- that is defined in vpConfig.h.
--
-- Create also the grey level background used to display the image.
-+
-+ Create also the grey level background used to display the image.
-
- \param I : Image that is displayed in the background.
-
- \param bufferedKeys : If true, use of buffered input for the keyboard (see
- Ogre documentation). Note that this parameter is only useful if OIS is used.
--
-- \param hidden : If true, the created window will be hidden.
-+
-+ \param hidden : If true, the created window will be hidden.
- Note that this functionnality requires Ogre3D 1.8.1 at least.
--
-+
- \exception vpException::ioError : If the required plugins.cfg /
- plugins_d.cfg or resources.cfg files are not accessible.
-
- */
- void vpAROgre::init(vpImage<unsigned char> &I,
-- bool
-+ bool
- #ifdef VISP_HAVE_OIS
- bufferedKeys
- #endif
-@@ -138,21 +138,21 @@ void vpAROgre::init(vpImage<unsigned char> &I,
- {
- mBackgroundWidth = I.getWidth();
- mBackgroundHeight = I.getHeight();
--
-+
- init(
- #ifdef VISP_HAVE_OIS
- bufferedKeys,
- #else
- false,
- #endif
-- hidden
-+ hidden
- );
- // Create the background image which will come from the grabber
- createBackground(I);
- }
-
- /*!
-- Initialisation of Ogre with a color background.
-+ Initialisation of Ogre with a color background.
-
- Load the plugins that are specified in the plugins.cfg or
- plugins_d.cfg files. These files are located in
-@@ -160,27 +160,27 @@ void vpAROgre::init(vpImage<unsigned char> &I,
- Note that plugins.cfg file is always considered under Unix
- platforms. The file plugins_d.cfg is only considered under Windows
- when the build type is Debug.
--
-+
- Load also the resources that are defined in the resources.cfg
- file. This file is located in VISP_HAVE_OGRE_RESOURCES_PATH folder
- that is defined in vpConfig.h.
--
-- Create also a color background used to display the image.
-+
-+ Create also a color background used to display the image.
-
- \param I : Image that is displayed in the background.
-
- \param bufferedKeys : If true, use of buffered input for the keyboard (see
- Ogre documentation). Note that this parameter is only useful if OIS is used.
--
-- \param hidden : If true, the created window will be hidden.
-+
-+ \param hidden : If true, the created window will be hidden.
- Note that this functionnality requires Ogre3D 1.8.1 at least.
--
-+
- \exception vpException::ioError : If the required plugins.cfg /
- plugins_d.cfg or resources.cfg files are not accessible.
-
- */
- void vpAROgre::init(vpImage<vpRGBa> &I,
-- bool
-+ bool
- #ifdef VISP_HAVE_OIS
- bufferedKeys
- #endif
-@@ -189,7 +189,7 @@ void vpAROgre::init(vpImage<vpRGBa> &I,
- {
- mBackgroundWidth = I.getWidth();
- mBackgroundHeight = I.getHeight();
--
-+
- init(
- #ifdef VISP_HAVE_OIS
- bufferedKeys,
-@@ -203,7 +203,7 @@ void vpAROgre::init(vpImage<vpRGBa> &I,
- }
-
- /*!
-- Initialisation of Ogre.
-+ Initialisation of Ogre.
-
- Load the plugins that are specified in the plugins.cfg or
- plugins_d.cfg files. These files are located in
-@@ -211,22 +211,22 @@ void vpAROgre::init(vpImage<vpRGBa> &I,
- Note that plugins.cfg file is always considered under Unix
- platforms. The file plugins_d.cfg is only considered under Windows
- when the build type is Debug.
--
-+
- Load also the resources that are defined in the resources.cfg
- file. This file is located in VISP_HAVE_OGRE_RESOURCES_PATH folder
- that is defined in vpConfig.h.
--
-+
- \param bufferedKeys : If true, use of buffered input for the keyboard (see
- Ogre documentation). Note that this parameter is only useful if OIS is used.
--
-- \param hidden : If true, the created window will be hidden.
-+
-+ \param hidden : If true, the created window will be hidden.
- Note that this functionnality requires Ogre3D 1.8.1 at least.
--
-+
- \exception vpException::ioError : If the required plugins.cfg /
- plugins_d.cfg or resources.cfg files are not accessible.
-
- */
--void vpAROgre::init(bool
-+void vpAROgre::init(bool
- #ifdef VISP_HAVE_OIS
- bufferedKeys
- #endif
-@@ -240,14 +240,14 @@ void vpAROgre::init(bool
- std::string pluginFile = mPluginsPath+"/plugins_d.cfg";
- #endif
- if(!vpIoTools::checkFilename(pluginFile)){
-- std::string errorMsg = "Error: the requested plugins file \""
-+ std::string errorMsg = "Error: the requested plugins file \""
- + pluginFile + "\" doesn't exist.";
- std::cout << errorMsg << std::endl;
-
- throw (vpException(vpException::ioError, errorMsg));
- }
- std::cout << "######################### Load plugin file: " << pluginFile << std::endl;
--
-+
- if(Ogre::Root::getSingletonPtr() == NULL)
- mRoot = new Ogre::Root(pluginFile, "ogre.cfg", "Ogre.log");
- else
-@@ -266,7 +266,7 @@ void vpAROgre::init(bool
- Ogre::ConfigFile cf;
- std::string resourceFile = mResourcePath+"/resources.cfg";
- if(!vpIoTools::checkFilename(resourceFile)){
-- std::string errorMsg = "Error: the requested resource file \""
-+ std::string errorMsg = "Error: the requested resource file \""
- + resourceFile + "\" doesn't exist.";
- std::cout << errorMsg << std::endl;
-
-@@ -297,7 +297,7 @@ void vpAROgre::init(bool
- for(std::list<std::string>::const_iterator iter = mOptionnalResourceLocation.begin(); iter != mOptionnalResourceLocation.end(); ++iter){
- Ogre::ResourceGroupManager::getSingleton().addResourceLocation(*iter, "FileSystem", Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
- }
--
-+
- // Create the window
- bool canInit = true;
- if(mshowConfigDialog){
-@@ -309,30 +309,30 @@ void vpAROgre::init(bool
- if(!mRoot->restoreConfig())
- canInit = false;
- }
--
-+
- if(!mRoot->isInitialised()){
- if(!canInit){ //We set the default renderer system
- const Ogre::RenderSystemList& lRenderSystemList = mRoot->getAvailableRenderers();
- if( lRenderSystemList.size() == 0 )
-- throw "ConfigDialog aborted"; // Exit the application on cancel
--
-+ throw "ConfigDialog aborted"; // Exit the application on cancel
-+
- Ogre::RenderSystem *lRenderSystem = lRenderSystemList.at(0);
- std::cout << "Using " << lRenderSystem->getName() << " as renderer." << std::endl;
- mRoot->setRenderSystem(lRenderSystem);
- }
--
-- mRoot->initialise(false);
-+
-+ mRoot->initialise(false);
- }
--
-- bool fullscreen = false;
-+
-+ bool fullscreen = false;
- Ogre::NameValuePairList misc;
- Ogre::ConfigOptionMap config = mRoot->getRenderSystem()->getConfigOptions();
- Ogre::ConfigOptionMap::const_iterator it = config.begin();
--
-+
- while( it != config.end() ){
- Ogre::String leftconf = (*it).first;
- Ogre::String rightconf = (*it).second.currentValue;
--
-+
- if(leftconf == "Video Mode"){
- if(canInit)
- sscanf(rightconf.c_str(), "%d %*s %d", &mWindowWidth, &mWindowHeight);
-@@ -350,19 +350,19 @@ void vpAROgre::init(bool
- }
- else
- misc[leftconf] = rightconf;
--
-+
- it++;
- }
--
-+
- // With Ogre version >= 1.8.1 we hide the window
- if( hidden && ((OGRE_VERSION_MAJOR << 16 | OGRE_VERSION_MINOR << 8 | OGRE_VERSION_PATCH) >= (1 << 16 | 8 << 8 | 1)) ){
- misc["hidden"] = "true";
- windowHidden = true;
-- mWindow = mRoot->createRenderWindow(name, mWindowWidth, mWindowHeight, fullscreen, &misc);
-+ mWindow = mRoot->createRenderWindow(name, mWindowWidth, mWindowHeight, fullscreen, &misc);
- }
- else
- mWindow = mRoot->createRenderWindow(name, mWindowWidth, mWindowHeight, fullscreen, &misc);
--
-+
- // Initialise resources
- Ogre::ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
- //-----------------------------------------------------
-@@ -374,12 +374,12 @@ void vpAROgre::init(bool
- // ST_EXTERIOR_REAL_FAR = paging landscape
- // ST_INTERIOR = Quake3 BSP
- //-----------------------------------------------------
--
-+
- mSceneMgr = mRoot->createSceneManager(Ogre::ST_GENERIC);
--
-+
- // Create the camera
- createCamera();
--
-+
- // Create a viewport
- Ogre::Viewport* viewPort = mWindow->addViewport(mCamera);
- // Ogre::Viewport* viewPort = mCamera->getViewport();
-@@ -420,12 +420,12 @@ void vpAROgre::init(bool
- if ( !bufferedKeys ) mKeyboard->setEventCallback ( this);
- #endif
-
-- // Initialise a render to texture to be able to retrieve a screenshot
-+ // Initialise a render to texture to be able to retrieve a screenshot
- Ogre::TexturePtr Texture = Ogre::TextureManager::getSingleton().createManual("rtf", Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,Ogre::TEX_TYPE_2D,
- mWindow->getWidth(),mWindow->getHeight(), 0, Ogre::PF_R8G8B8A8, Ogre::TU_RENDERTARGET);
--
--
--
-+
-+
-+
- // Ogre::TexturePtr Texture = Ogre::TextureManager::getSingleton().createManual("rtf", Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,Ogre::TEX_TYPE_2D,
- // 640,480, 0, Ogre::PF_R8G8B8A8, Ogre::TU_RENDERTARGET);
- Ogre::RenderTexture* RTarget = Texture->getBuffer()->getRenderTarget();
-@@ -507,7 +507,7 @@ bool vpAROgre::frameEnded(const Ogre::FrameEvent& evt)
- else return result;
- }
-
--/*!
-+/*!
-
- Function telling what to do before each frame. This method is called
- before every frame rendered by Ogre.
-@@ -558,7 +558,7 @@ void vpAROgre::windowClosed(Ogre::RenderWindow* rw)
- \param I : Grey level image to show in background.
- \param cMw : Camera pose as an homogeneous matrix.
- */
--bool vpAROgre::renderOneFrame(const vpImage<unsigned char> &I,
-+bool vpAROgre::renderOneFrame(const vpImage<unsigned char> &I,
- const vpHomogeneousMatrix &cMw)
- {
- // Update the background to match the situation
-@@ -576,7 +576,7 @@ bool vpAROgre::renderOneFrame(const vpImage<unsigned char> &I,
- \param I : RGBa image to show in background.
- \param cMw : Camera pose as an homogeneous matrix.
- */
--bool vpAROgre::renderOneFrame(const vpImage<vpRGBa> &I,
-+bool vpAROgre::renderOneFrame(const vpImage<vpRGBa> &I,
- const vpHomogeneousMatrix &cMw)
- {
- // Update the background to match the situation
-@@ -594,7 +594,7 @@ bool vpAROgre::renderOneFrame(const vpImage<vpRGBa> &I,
- \param I : Grey level image to show in background.
- \param cMw : Camera pose as an homogeneous matrix.
- */
--void vpAROgre::display(const vpImage<unsigned char> &I,
-+void vpAROgre::display(const vpImage<unsigned char> &I,
- const vpHomogeneousMatrix &cMw)
- {
- // Display on Ogre Window
-@@ -635,7 +635,7 @@ bool vpAROgre::continueRendering(void)
- Set the camera intrinsic parameters
- */
- void vpAROgre::setCameraParameters(const vpCameraParameters &cameraP )
--{
-+{
- mcam = cameraP;
- }
-
-@@ -657,7 +657,7 @@ void vpAROgre::load(const std::string &name, const std::string &model)
- \param wTo : New position of the node (translation between object frame and
- world frame).
- */
--void vpAROgre::setPosition(const std::string &name,
-+void vpAROgre::setPosition(const std::string &name,
- const vpTranslationVector &wTo)
- {
- // Reset the position
-@@ -686,7 +686,7 @@ void vpAROgre::setRotation(const std::string &name, const vpRotationMatrix &wRo)
- // Get the node in its original position
- mSceneMgr->getSceneNode(name)->resetOrientation();
- // Apply the new rotation
-- Ogre::Matrix3 rotationOgre
-+ Ogre::Matrix3 rotationOgre
- = Ogre::Matrix3( (Ogre::Real)wRo[0][0], (Ogre::Real)wRo[0][1], (Ogre::Real)wRo[0][2],
- (Ogre::Real)wRo[1][0], (Ogre::Real)wRo[1][1], (Ogre::Real)wRo[1][2],
- (Ogre::Real)wRo[2][0], (Ogre::Real)wRo[2][1], (Ogre::Real)wRo[2][2]);
-@@ -699,18 +699,18 @@ void vpAROgre::setRotation(const std::string &name, const vpRotationMatrix &wRo)
- \param name : Name of the SceneNode to rotate.
- \param wRo : The rotation matrix representing the rotation to apply.
- */
--void vpAROgre::addRotation(const std::string &name,
-+void vpAROgre::addRotation(const std::string &name,
- const vpRotationMatrix &wRo)
- {
-- // Apply the new rotation
-- Ogre::Matrix3 rotationOgre
-+ // Apply the new rotation
-+ Ogre::Matrix3 rotationOgre
- = Ogre::Matrix3( (Ogre::Real)wRo[0][0], (Ogre::Real)wRo[0][1], (Ogre::Real)wRo[0][2],
- (Ogre::Real)wRo[1][0], (Ogre::Real)wRo[1][1], (Ogre::Real)wRo[1][2],
- (Ogre::Real)wRo[2][0], (Ogre::Real)wRo[2][1], (Ogre::Real)wRo[2][2]);
- Ogre::Quaternion q(rotationOgre);
- mSceneMgr->getSceneNode(name)->rotate(q);
--
--
-+
-+
- }
-
- /*!
-@@ -721,7 +721,7 @@ void vpAROgre::addRotation(const std::string &name,
- translation to apply.
-
- */
--void vpAROgre::setPosition(const std::string &name,
-+void vpAROgre::setPosition(const std::string &name,
- const vpHomogeneousMatrix &wMo)
- {
- // Extract the position and orientation data
-@@ -807,15 +807,17 @@ void vpAROgre::createBackground(vpImage<unsigned char> & /* I */)
- }
-
- // Pointer to the dynamic texture
-- Ogre::TexturePtr dynTexPtr = Ogre::TextureManager::getSingleton().getByName("BackgroundTexture");
-+ Ogre::TexturePtr dynTexPtr = Ogre::TextureManager::getSingleton().getByName("BackgroundTexture").
-+ dynamicCast<Ogre::Texture>();
-
- // Get the pixel buffer
- mPixelBuffer = dynTexPtr->getBuffer();
-
- // Material to apply the texture to the background
-- Ogre::MaterialPtr Backgroundmaterial
-+ Ogre::MaterialPtr Backgroundmaterial
- = Ogre::MaterialManager::getSingleton().create("BackgroundMaterial",
-- Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
-+ Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME).
-+ dynamicCast<Ogre::Material>();
- Ogre::Technique *Backgroundtechnique = Backgroundmaterial->createTechnique();
- Backgroundtechnique->createPass();
- Backgroundmaterial->getTechnique(0)->getPass(0)->setLightingEnabled(false);
-@@ -873,15 +875,17 @@ void vpAROgre::createBackground(vpImage<vpRGBa> & /* I */)
-
-
- // Pointer to the dynamic texture
-- Ogre::TexturePtr dynTexPtr = Ogre::TextureManager::getSingleton().getByName("BackgroundTexture");
-+ Ogre::TexturePtr dynTexPtr =
-+ Ogre::TextureManager::getSingleton().getByName("BackgroundTexture").dynamicCast<Ogre::Texture>();
-
- // Get the pixel buffer
- mPixelBuffer = dynTexPtr->getBuffer();
-
- // Material to apply the texture to the background
-- Ogre::MaterialPtr Backgroundmaterial
-+ Ogre::MaterialPtr Backgroundmaterial
- = Ogre::MaterialManager::getSingleton().create("BackgroundMaterial",
-- Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
-+ Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME).
-+ dynamicCast<Ogre::Material>();
- Ogre::Technique *Backgroundtechnique = Backgroundmaterial->createTechnique();
- Backgroundtechnique->createPass();
- Backgroundmaterial->getTechnique(0)->getPass(0)->setLightingEnabled(false);
-@@ -930,8 +934,8 @@ void vpAROgre::updateCameraProjection(void)
- py = (Ogre::Real)mcam.get_py();
- u0 = (Ogre::Real)mcam.get_u0();
- v0 = (Ogre::Real)mcam.get_v0();
-- Ogre::Matrix4 Projection
-- = Ogre::Matrix4( (Ogre::Real)(2.0*px/mBackgroundWidth), 0, (Ogre::Real)(2.0*(u0/mBackgroundWidth)-1.0), 0,
-+ Ogre::Matrix4 Projection
-+ = Ogre::Matrix4( (Ogre::Real)(2.0*px/mBackgroundWidth), 0, (Ogre::Real)(2.0*(u0/mBackgroundWidth)-1.0), 0,
- 0, (Ogre::Real)(2.0*py/mBackgroundHeight), (Ogre::Real)(2.0*(v0/mBackgroundHeight)-1.0),0,
- 0, 0, (Ogre::Real)(-1.0*f_p_n/f_m_n), (Ogre::Real)(-2.0*f*n/f_m_n),
- 0, 0, -1.0, 0);
-@@ -944,7 +948,7 @@ void vpAROgre::updateCameraProjection(void)
- void vpAROgre::updateBackgroundTexture(const vpImage<unsigned char> &I)
- {
- // Inspired from Ogre wiki : http://www.ogre3d.org/tikiwiki/Creating+dynamic+textures
-- // Lock the pixel buffer and get a pixel box. HBL_DISCARD is to use for best
-+ // Lock the pixel buffer and get a pixel box. HBL_DISCARD is to use for best
- // performance than HBL_NORMAL
- mPixelBuffer->lock(Ogre::HardwareBuffer::HBL_DISCARD); // Lock the buffer
- const Ogre::PixelBox& pixelBox = mPixelBuffer->getCurrentLock();
-@@ -963,7 +967,7 @@ void vpAROgre::updateBackgroundTexture(const vpImage<unsigned char> &I)
- void vpAROgre::updateBackgroundTexture(const vpImage<vpRGBa> &I)
- {
- // Inspired from Ogre wiki : http://www.ogre3d.org/tikiwiki/Creating+dynamic+textures
-- // Lock the pixel buffer and get a pixel box. HBL_DISCARD is to use for best
-+ // Lock the pixel buffer and get a pixel box. HBL_DISCARD is to use for best
- // performance than HBL_NORMAL
- mPixelBuffer->lock(Ogre::HardwareBuffer::HBL_DISCARD); // Lock the buffer
- const Ogre::PixelBox& pixelBox = mPixelBuffer->getCurrentLock();
-@@ -977,18 +981,18 @@ void vpAROgre::updateBackgroundTexture(const vpImage<vpRGBa> &I)
- // *pDest++=I[i][mBackgroundWidth-j].B; // Blue component
- // *pDest++=I[i][mBackgroundWidth-j].G; // Green component
- // *pDest++=I[i][mBackgroundWidth-j].R; // Red component
--
-+
- *pDest++=I[i][j].B; // Blue component
- *pDest++=I[i][j].G; // Green component
- *pDest++=I[i][j].R; // Red component
--
-+
- *pDest++ = 255; // Alpha component
- }
- }
- #else // if texture in RGBa format which is the format of the input image
- memcpy(pDest, I.bitmap, mBackgroundHeight*mBackgroundWidth*sizeof(vpRGBa));
- #endif
--
-+
- // Unlock the pixel buffer
- mPixelBuffer->unlock();
- }
-@@ -999,7 +1003,7 @@ void vpAROgre::updateBackgroundTexture(const vpImage<vpRGBa> &I)
- void vpAROgre::updateCameraParameters (const vpHomogeneousMatrix &cMw)
- {
- // The matrix is given to Ogre with some changes to fit with the world projection
-- Ogre::Matrix4 ModelView
-+ Ogre::Matrix4 ModelView
- // = Ogre::Matrix4( (Ogre::Real)-cMo[0][0], (Ogre::Real)-cMo[0][1], (Ogre::Real)-cMo[0][2], (Ogre::Real)-cMo[0][3],
- = Ogre::Matrix4( (Ogre::Real)cMw[0][0], (Ogre::Real)cMw[0][1], (Ogre::Real)cMw[0][2], (Ogre::Real)cMw[0][3],
- (Ogre::Real)-cMw[1][0], (Ogre::Real)-cMw[1][1], (Ogre::Real)-cMw[1][2], (Ogre::Real)-cMw[1][3],
-@@ -1017,7 +1021,8 @@ void vpAROgre::updateCameraParameters (const vpHomogeneousMatrix &cMw)
- void vpAROgre::getRenderingOutput(vpImage<vpRGBa> &I, const vpHomogeneousMatrix &cMo)
- {
- updateCameraParameters(cMo);
-- Ogre::TexturePtr dynTexPtr = Ogre::TextureManager::getSingleton().getByName("rtf");
-+ Ogre::TexturePtr dynTexPtr = Ogre::TextureManager::getSingleton().getByName("rtf").
-+ dynamicCast<Ogre::Texture>();
- Ogre::RenderTexture* RTarget = dynTexPtr->getBuffer()->getRenderTarget();
- mWindow->update();
- RTarget->update();
-@@ -1032,7 +1037,7 @@ void vpAROgre::getRenderingOutput(vpImage<vpRGBa> &I, const vpHomogeneousMatrix
- #if 1 // if texture in BGRa format
- for(unsigned int i=0; i<I.getHeight(); i++){
- for(unsigned int j=0; j<I.getWidth(); j++){
-- // Color Image
-+ // Color Image
- I[i][j].B = *pDest++; // Blue component
- I[i][j].G = *pDest++; // Green component
- I[i][j].R = *pDest++; // Red component
diff --git a/debian/patches/0004-visp-config-should-rely-on-pkg-config-information.patch b/debian/patches/0004-visp-config-should-rely-on-pkg-config-information.patch
deleted file mode 100644
index 8c83f61..0000000
--- a/debian/patches/0004-visp-config-should-rely-on-pkg-config-information.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Thomas Moulard <thomas.moulard at gmail.com>
-Date: Sat, 30 Nov 2013 16:16:13 +0900
-Subject: visp-config should rely on pkg-config information
-
-Make visp-config arch-independent by relying on pkg-config information.
-
-Author: Thomas Moulard <thomas.moulard at gmail.com>
-Forwarded: yes
----
- CMakeModules/visp-config.install.in | 18 ++++++------------
- 1 file changed, 6 insertions(+), 12 deletions(-)
-
-diff --git a/CMakeModules/visp-config.install.in b/CMakeModules/visp-config.install.in
-index e797f26..88504df 100755
---- a/CMakeModules/visp-config.install.in
-+++ b/CMakeModules/visp-config.install.in
-@@ -48,20 +48,14 @@ relpath=`(cd $relpath/..; pwd)`
-
- PREFIX=$relpath
-
--CFLAGS="${VISP_CONFIG_CFLAGS_SCRIPT}"
-+CFLAGS_CMD=`pkg-config --cflags visp`
-+CFLAGS=$CFLAGS_CMD
-
--LIBS="${VISP_CONFIG_LIBS_SCRIPT}"
-+LIBS_CMD=`pkg-config --libs visp`
-+LIBS=$LIBS_CMD
-
--VERSION="${VISP_VERSION}"
--
--#CFLAGS_CMD=`pkg-config --cflags visp`
--#CFLAGS=$CFLAGS_CMD
--
--#LIBS_CMD=`pkg-config --libs visp`
--#LIBS=$LIBS_CMD
--
--#VERSION_CMD=`pkg-config --modversion visp`
--#VERSION=$VERSION_CMD
-+VERSION_CMD=`pkg-config --modversion visp`
-+VERSION=$VERSION_CMD
-
- NO_NEWLINE_CHARACTER="${VISP_ECHO_NO_NEWLINE_CHARACTER}"
- NO_NEWLINE_OPTION="${VISP_ECHO_NO_NEWLINE_OPTION}"
diff --git a/debian/patches/0005-Fix-warnings-in-FindMyGTK2.cmake.patch b/debian/patches/0005-Fix-warnings-in-FindMyGTK2.cmake.patch
deleted file mode 100644
index c625ac2..0000000
--- a/debian/patches/0005-Fix-warnings-in-FindMyGTK2.cmake.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From: Thomas Moulard <thomas.moulard at gmail.com>
-Date: Thu, 20 Feb 2014 11:02:53 +0900
-Subject: Fix warnings in FindMyGTK2.cmake
-
-Author: Fabien Spindler <fabien.spindler at inria.fr>
-Forwarded: yes
----
- CMakeModules/FindMyGTK2.cmake | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/CMakeModules/FindMyGTK2.cmake b/CMakeModules/FindMyGTK2.cmake
-index a6c95b0..90bb7d7 100644
---- a/CMakeModules/FindMyGTK2.cmake
-+++ b/CMakeModules/FindMyGTK2.cmake
-@@ -52,7 +52,7 @@ IF(UNIX OR WIN32)
- /usr/include/gtk-2.0
- /usr/local/include/gtk-2.0
- /opt/gnome/include/gtk-2.0
-- "C:/GTK/include/gtk-2.0"
-+ C:/GTK/include/gtk-2.0
- /sw/include/gtk-2.0
- )
-
-@@ -69,7 +69,7 @@ IF(UNIX OR WIN32)
- /usr/lib/i386-linux-gnu/glib-2.0/include
- /usr/lib/x86_64-linux-gnu/glib-2.0/include
- /opt/gnome/lib/glib-2.0/include
-- "C:/GTK/lib/glib-2.0/include"glib
-+ C:/GTK/lib/glib-2.0/include
- /sw/lib/glib-2.0/include
- )
-
-@@ -78,7 +78,7 @@ IF(UNIX OR WIN32)
- $ENV{GTK2_HOME}/include/glib-2.0
- /usr/include/glib-2.0
- /opt/gnome/include/glib-2.0
-- "C:/GTK/include/glib-2.0"
-+ C:/GTK/include/glib-2.0
- /sw/include/glib-2.0
- )
-
-@@ -87,7 +87,7 @@ IF(UNIX OR WIN32)
- $ENV{GTK2_HOME}/include/pango-1.0
- /usr/include/pango-1.0
- /opt/gnome/include/pango-1.0
-- "C:/GTK/include/pango-1.0"
-+ C:/GTK/include/pango-1.0
- /sw/include/pango-1.0
- )
-
-@@ -96,7 +96,7 @@ IF(UNIX OR WIN32)
- $ENV{GTK2_HOME}/include/cairo
- /usr/include/cairo
- /opt/gnome/include/cairo
-- "C:/GTK/include/cairo"
-+ C:/GTK/include/cairo
- /sw/include/cairo
- )
-
-@@ -106,7 +106,7 @@ IF(UNIX OR WIN32)
- /usr/lib/gtk-2.0/include
- /usr/lib64/gtk-2.0/include
- /opt/gnome/lib/gtk-2.0/include
-- "C:/GTK/lib/gtk-2.0/include"
-+ C:/GTK/lib/gtk-2.0/include
- /sw/lib/gtk-2.0/include
- /usr/lib/i386-linux-gnu/gtk-2.0/include
- /usr/lib/x86_64-linux-gnu/gtk-2.0/include
-@@ -117,7 +117,7 @@ IF(UNIX OR WIN32)
- $ENV{GTK2_HOME}/gdk-pixbuf-2.0
- /usr/include/gdk-pixbuf-2.0
- /usr/include/gtk-2.0
-- "C:/GTK/include/gtk-2.0"
-+ C:/GTK/include/gtk-2.0
- /sw/include/gtk-2.0
- )
-
-@@ -128,7 +128,7 @@ IF(UNIX OR WIN32)
- $ENV{GTK2_HOME}/include/atk-1.0
- /usr/include/atk-1.0
- /opt/gnome/include/atk-1.0
-- "C:/GTK/include/atk-1.0"
-+ C:/GTK/include/atk-1.0
- /sw/include/atk-1.0
- )
-
-@@ -141,7 +141,7 @@ IF(UNIX OR WIN32)
- /usr/openwin/lib
- /usr/X11R6/lib
- /opt/gnome/lib
-- "C:/GTK/lib"
-+ C:/GTK/lib
- /sw/lib
- )
-
-@@ -154,7 +154,7 @@ IF(UNIX OR WIN32)
- /usr/openwin/lib
- /usr/X11R6/lib
- /opt/gnome/lib
-- "C:/GTK/lib"
-+ C:/GTK/lib
- /sw/lib
- )
-
-@@ -167,7 +167,7 @@ IF(UNIX OR WIN32)
- /usr/openwin/lib
- /usr/X11R6/lib
- /opt/gnome/lib
-- "C:/GTK/lib"
-+ C:/GTK/lib
- /sw/lib
- )
-
-@@ -180,7 +180,7 @@ IF(UNIX OR WIN32)
- /usr/openwin/lib
- /usr/X11R6/lib
- /opt/gnome/lib
-- "C:/GTK/lib"
-+ C:/GTK/lib
- /sw/lib
- )
-
-@@ -193,7 +193,7 @@ IF(UNIX OR WIN32)
- /usr/openwin/lib
- /usr/X11R6/lib
- /opt/gnome/lib
-- "C:/GTK/lib"
-+ C:/GTK/lib
- /sw/lib
- )
-
-@@ -203,7 +203,7 @@ IF(UNIX OR WIN32)
- PATHS $ENV{GTK2_HOME}/lib
- /usr/lib
- /opt/gnome/lib
-- "C:/GTK/lib"
-+ C:/GTK/lib
- /sw/lib
- )
-
diff --git a/debian/patches/0006-Fix-libusb-CMake-macro-detection.patch b/debian/patches/0006-Fix-libusb-CMake-macro-detection.patch
deleted file mode 100644
index 664e0c1..0000000
--- a/debian/patches/0006-Fix-libusb-CMake-macro-detection.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From: Thomas Moulard <thomas.moulard at gmail.com>
-Date: Thu, 20 Feb 2014 11:03:01 +0900
-Subject: Fix libusb CMake macro detection
-
-Author: Fabien Spindler <fabien.spindler at inria.fr>
-Forwarded: yes
----
- CMakeLists.txt | 3 ++-
- CMakeModules/FindLIBUSB-1.cmake | 12 +++++++++++-
- 2 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 18764c4..ab7409c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1073,6 +1073,7 @@ IF(USE_LIBUSB_1)
-
- MESSAGE(STATUS "libusb-1.0 found")
-
-+ LIST(APPEND VISP_EXTERN_INCLUDE_DIRS ${LIBUSB_1_INCLUDE_DIRS})
- LIST(APPEND VISP_EXTERN_LIBRARIES ${LIBUSB_1_LIBRARIES})
- ELSE()
- MESSAGE(STATUS "libusb-1.0 not found")
-@@ -1089,7 +1090,7 @@ IF(USE_LIBFREENECT AND USE_LIBUSB_1 AND USE_PTHREAD)
- # The material is found. Check if libfreenect is an old version
- include(CheckCXXSourceCompiles)
- SET(CMAKE_REQUIRED_LIBRARIES ${LIBFREENECT_LIBRARIES} ${PTHREAD_LIBRARIES} ${LIBUSB_1_LIBRARIES})
-- SET(CMAKE_REQUIRED_INCLUDES ${LIBFREENECT_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS})
-+ SET(CMAKE_REQUIRED_INCLUDES ${LIBFREENECT_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} ${LIBUSB_1_INCLUDE_DIRS})
- CHECK_CXX_SOURCE_COMPILES("
- #include <libfreenect.hpp>
-
-diff --git a/CMakeModules/FindLIBUSB-1.cmake b/CMakeModules/FindLIBUSB-1.cmake
-index 79d57a4..9e1108e 100644
---- a/CMakeModules/FindLIBUSB-1.cmake
-+++ b/CMakeModules/FindLIBUSB-1.cmake
-@@ -35,6 +35,7 @@
- #
- # LIBUSB_1_FOUND
- # LIBUSB_1_LIBRARIES
-+# LIBUSB_1_INCLUDE_DIRS
- #
- # Authors:
- # Celine Teuliere
-@@ -55,11 +56,18 @@ ELSE(WIN32)
- /usr/lib
- /usr/local/lib
- )
-+ FIND_PATH(LIBUSB_1_INCLUDE_DIR libusb.h
-+ $ENV{LIBUSB_1_HOME}/include/libusb-1.0
-+ $ENV{LIBUSB_1_HOME}/build/include/libusb-1.0
-+ /usr/include/libusb-1.0
-+ /usr/local/include/libusb-1.0
-+ )
- ENDIF(WIN32)
-
- ## --------------------------------
-
--IF(LIBUSB_1_LIBRARY)
-+IF(LIBUSB_1_LIBRARY AND LIBUSB_1_INCLUDE_DIR)
-+ SET(LIBUSB_1_INCLUDE_DIRS ${LIBUSB_1_INCLUDE_DIR})
- SET(LIBUSB_1_LIBRARIES ${LIBUSB_1_LIBRARY})
- SET(LIBUSB_1_FOUND TRUE)
- ELSE()
-@@ -67,6 +75,8 @@ ELSE()
- ENDIF()
-
- MARK_AS_ADVANCED(
-+ LIBUSB_1_INCLUDE_DIRS
-+ LIBUSB_1_INCLUDE_DIR
- LIBUSB_1_LIBRARIES
- LIBUSB_1_LIBRARY
- )
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7f336de..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,6 +0,0 @@
-0001-Install-vpConfig.h-in-include-architecture-triplet.patch
-0002-Fix-vpLex.c-portability-issue.patch
-0003-Fix-compilation-issue-with-Ogre-1.9.patch
-0004-visp-config-should-rely-on-pkg-config-information.patch
-0005-Fix-warnings-in-FindMyGTK2.cmake.patch
-0006-Fix-libusb-CMake-macro-detection.patch
diff --git a/debian/rules b/debian/rules
index a6556b1..6391887 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,7 +78,7 @@ override_dh_auto_build-indep:
dh_auto_build -- html-doc # Generate Doxygen HTML documentation.
override_dh_strip:
- dh_strip -a --dbg-package=libvisp2.8-dbg
+ dh_strip -a --dbg-package=libvisp2.9-dbg
# Parallelism is disabled in tests as some cannot run at the same
# time
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/visp.git
More information about the debian-science-commits
mailing list