[vtk6] 02/05: Revert use of system libproj4 for now, Closes: #819741
Gert Wollny
gert-guest at moszumanska.debian.org
Mon Apr 4 12:15:43 UTC 2016
This is an automated email from the git hooks/post-receive script.
gert-guest pushed a commit to branch master
in repository vtk6.
commit 7fd27ac6bf33c05b1ec11a8ee2a17ecb525978b0
Author: Gert Wollny <gw.fossdev at gmail.com>
Date: Sun Apr 3 22:36:22 2016 +0000
Revert use of system libproj4 for now, Closes: #819741
The use of the system libproj4 implies an ABI change and hence
I will do this when I package version 6.3.0.
---
CMake/FindLIBPROJ4.cmake | 9 +++------
Geovis/Core/vtkGeoProjection.cxx | 16 ++++++++--------
Geovis/Core/vtkGeoProjection.h | 9 ++++-----
Geovis/Core/vtkGeoTransform.cxx | 24 ++++++++++++------------
ThirdParty/libproj4/vtk_libproj4.h.in | 3 +--
debian/control | 1 -
debian/patches/series | 2 +-
debian/rules | 2 +-
8 files changed, 30 insertions(+), 36 deletions(-)
diff --git a/CMake/FindLIBPROJ4.cmake b/CMake/FindLIBPROJ4.cmake
index e37bce2..a004458 100644
--- a/CMake/FindLIBPROJ4.cmake
+++ b/CMake/FindLIBPROJ4.cmake
@@ -12,7 +12,7 @@ if ( NOT LIBPROJ4_INCLUDE_DIR OR NOT LIBPROJ4_LIBRARIES OR NOT LIBPROJ4_FOUND )
endif ()
find_library( LIBPROJ4_LIBRARIES
- NAMES proj
+ NAMES proj4 libproj4
PATHS
${_LIBPROJ4_DIR}/lib64
${CMAKE_INSTALL_PREFIX}/lib64
@@ -24,12 +24,11 @@ if ( NOT LIBPROJ4_INCLUDE_DIR OR NOT LIBPROJ4_LIBRARIES OR NOT LIBPROJ4_FOUND )
${CMAKE_INSTALL_PREFIX}/lib
/usr/local/lib
/usr/lib
+ NO_DEFAULT_PATH
)
- MESSAGE(STATUS "LIBPROJ4_LIBRARIES=${LIBPROJ4_LIBRARIES}")
-
find_path( LIBPROJ4_INCLUDE_DIR
- NAMES proj_api.h
+ NAMES lib_proj.h
PATHS
${_LIBPROJ4_DIR}
${_LIBPROJ4_DIR}/include
@@ -41,8 +40,6 @@ if ( NOT LIBPROJ4_INCLUDE_DIR OR NOT LIBPROJ4_LIBRARIES OR NOT LIBPROJ4_FOUND )
NO_DEFAULT_PATH
)
- MESSAGE(STATUS "LIBPROJ4_INCLUDE_DIR=${LIBPROJ4_INCLUDE_DIR}")
-
if ( NOT LIBPROJ4_INCLUDE_DIR OR NOT LIBPROJ4_LIBRARIES )
if ( LIBPROJ4_REQUIRED )
message( FATAL_ERROR "LIBPROJ4 is required. Set LIBPROJ4_DIR" )
diff --git a/Geovis/Core/vtkGeoProjection.cxx b/Geovis/Core/vtkGeoProjection.cxx
index 607350b..a64e799 100644
--- a/Geovis/Core/vtkGeoProjection.cxx
+++ b/Geovis/Core/vtkGeoProjection.cxx
@@ -80,7 +80,7 @@ int vtkGeoProjection::GetNumberOfProjections()
if ( vtkGeoProjectionNumProj < 0 )
{
vtkGeoProjectionNumProj = 0;
- for ( const PJ_LIST* pj = pj_list; pj && pj->id; ++ pj )
+ for ( const PROJ_LIST* pj = proj_list; pj && pj->id; ++ pj )
++ vtkGeoProjectionNumProj;
}
return vtkGeoProjectionNumProj;
@@ -91,7 +91,7 @@ const char* vtkGeoProjection::GetProjectionName( int projection )
if ( projection < 0 || projection >= vtkGeoProjection::GetNumberOfProjections() )
return 0;
- return pj_list[projection].id;
+ return proj_list[projection].id;
}
//-----------------------------------------------------------------------------
const char* vtkGeoProjection::GetProjectionDescription( int projection )
@@ -99,7 +99,7 @@ const char* vtkGeoProjection::GetProjectionDescription( int projection )
if ( projection < 0 || projection >= vtkGeoProjection::GetNumberOfProjections() )
return 0;
- return pj_list[projection].descr[0];
+ return proj_list[projection].descr[0];
}
//-----------------------------------------------------------------------------
vtkGeoProjection::vtkGeoProjection()
@@ -116,7 +116,7 @@ vtkGeoProjection::~vtkGeoProjection()
this->SetName( 0 );
if ( this->Projection )
{
- pj_free( this->Projection );
+ proj_free( this->Projection );
}
delete this->Internals;
this->Internals = NULL;
@@ -142,7 +142,7 @@ int vtkGeoProjection::GetIndex()
if ( ! this->Projection )
return -1;
int i = 0;
- for ( const PJ_LIST* proj = pj_list; proj && proj->id; ++ proj, ++ i )
+ for ( const PROJ_LIST* proj = proj_list; proj && proj->id; ++ proj, ++ i )
{
if ( ! strcmp( proj->id, this->Name ) )
{
@@ -162,7 +162,7 @@ const char* vtkGeoProjection::GetDescription()
return this->Projection->descr;
}
//-----------------------------------------------------------------------------
-projPJ vtkGeoProjection::GetProjection()
+PROJ* vtkGeoProjection::GetProjection()
{
this->UpdateProjection();
return this->Projection;
@@ -178,7 +178,7 @@ int vtkGeoProjection::UpdateProjection()
if ( this->Projection )
{
- pj_free( this->Projection );
+ proj_free( this->Projection );
this->Projection = 0;
}
@@ -217,7 +217,7 @@ int vtkGeoProjection::UpdateProjection()
pjArgs[3+i] = stringHolder[i].c_str();
}
- this->Projection = pj_init( argSize, const_cast<char**>( pjArgs ) );
+ this->Projection = proj_init( argSize, const_cast<char**>( pjArgs ) );
delete[] pjArgs;
if ( this->Projection )
{
diff --git a/Geovis/Core/vtkGeoProjection.h b/Geovis/Core/vtkGeoProjection.h
index 68ceea6..75f50ca 100644
--- a/Geovis/Core/vtkGeoProjection.h
+++ b/Geovis/Core/vtkGeoProjection.h
@@ -29,9 +29,8 @@
#include "vtkGeovisCoreModule.h" // For export macro
#include "vtkObject.h"
-struct PJconsts;
-typedef struct PJconsts PJ;
-typedef PJ* projPJ;
+struct PROJconsts;
+typedef PROJconsts PROJ;
class VTKGEOVISCORE_EXPORT vtkGeoProjection : public vtkObject
{
@@ -86,7 +85,7 @@ public:
// this method returns may be freed, so you should not use the PROJ.4 structure
// after changing any parameters. Also, you should not modify the PROJ.4 structure
// on your own as it will then be out of sync with the vtkGeoProjection class.
- projPJ GetProjection();
+ PROJ* GetProjection();
// Description:
// Add an optional parameter to the projection that will be computed or
@@ -126,7 +125,7 @@ protected:
char* Name;
double CentralMeridian;
- projPJ Projection;
+ PROJ* Projection;
vtkTimeStamp ProjectionMTime;
private:
diff --git a/Geovis/Core/vtkGeoTransform.cxx b/Geovis/Core/vtkGeoTransform.cxx
index 1013cc9..b113795 100644
--- a/Geovis/Core/vtkGeoTransform.cxx
+++ b/Geovis/Core/vtkGeoTransform.cxx
@@ -73,8 +73,8 @@ void vtkGeoTransform::TransformPoints( vtkPoints* srcPts, vtkPoints* dstPts )
}
dstCoords->DeepCopy( srcCoords );
- projPJ src = this->SourceProjection ? this->SourceProjection->GetProjection() : 0;
- projPJ dst = this->DestinationProjection ? this->DestinationProjection->GetProjection() : 0;
+ PROJ* src = this->SourceProjection ? this->SourceProjection->GetProjection() : 0;
+ PROJ* dst = this->DestinationProjection ? this->DestinationProjection->GetProjection() : 0;
if ( ! src && ! dst )
{
// we've already copied srcCoords to dstCoords and src=dst=0 implies no transform...
@@ -156,20 +156,20 @@ vtkAbstractTransform* vtkGeoTransform::MakeTransform()
void vtkGeoTransform::InternalTransformPoints( double* x, vtkIdType numPts, int stride )
{
- projPJ src = this->SourceProjection ? this->SourceProjection->GetProjection() : 0;
- projPJ dst = this->DestinationProjection ? this->DestinationProjection->GetProjection() : 0;
+ PROJ* src = this->SourceProjection ? this->SourceProjection->GetProjection() : 0;
+ PROJ* dst = this->DestinationProjection ? this->DestinationProjection->GetProjection() : 0;
int delta = stride - 2;
- projLP lp;
- projXY xy;
+ PROJ_LP lp;
+ PROJ_XY xy;
if ( src )
{
// Convert from src system to lat/long using inverse of src transform
double* coord = x;
for ( vtkIdType i = 0; i < numPts; ++ i )
{
- xy.u = coord[0]; xy.v = coord[1];
- lp = pj_inv( xy, src );
- coord[0] = lp.u; coord[1] = lp.v;
+ xy.x = coord[0]; xy.y = coord[1];
+ lp = proj_inv( xy, src );
+ coord[0] = lp.lam; coord[1] = lp.phi;
}
}
else // ! src
@@ -190,9 +190,9 @@ void vtkGeoTransform::InternalTransformPoints( double* x, vtkIdType numPts, int
double* coord = x;
for ( vtkIdType i = 0; i < numPts; ++ i )
{
- lp.u = coord[0]; lp.v = coord[1];
- xy = pj_fwd( lp, dst );
- coord[0] = xy.u; coord[1] = xy.v;
+ lp.lam = coord[0]; lp.phi = coord[1];
+ xy = proj_fwd( lp, dst );
+ coord[0] = xy.x; coord[1] = xy.y;
}
}
else // ! dst
diff --git a/ThirdParty/libproj4/vtk_libproj4.h.in b/ThirdParty/libproj4/vtk_libproj4.h.in
index b41c9da..bd67484 100644
--- a/ThirdParty/libproj4/vtk_libproj4.h.in
+++ b/ThirdParty/libproj4/vtk_libproj4.h.in
@@ -18,8 +18,7 @@
/* Use the libproj4 library configured for VTK. */
#cmakedefine VTK_USE_SYSTEM_LIBPROJ4
#ifdef VTK_USE_SYSTEM_LIBPROJ4
-# include <projects.h>
-# include <proj_api.h>
+# include <lib_proj.h>
#else
# include <vtklibproj4/lib_proj.h>
#endif
diff --git a/debian/control b/debian/control
index cdda1e7..bd59c48 100644
--- a/debian/control
+++ b/debian/control
@@ -42,7 +42,6 @@ Build-Depends: chrpath,
libosmesa6-dev,
libpng-dev,
libpq-dev,
- libproj-dev,
libqt5opengl5-dev,
libqt5webkit5-dev,
libsqlite3-dev,
diff --git a/debian/patches/series b/debian/patches/series
index 8176c13..389a453 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,5 +12,5 @@
97_fix_latex_doxygen.patch
100_javac-heap.patch
101_java_install_path.patch
-102_enable_system_proj4_lib.patch
+#102_enable_system_proj4_lib.patch
104_fix_gcc_version_6.patch
diff --git a/debian/rules b/debian/rules
index af45359..8527552 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@ extra_flags += \
-DVTK_USE_SYSTEM_GL2PS=ON \
-DVTK_USE_SYSTEM_HDF5=ON \
-DVTK_USE_SYSTEM_JPEG=ON \
- -DVTK_USE_SYSTEM_LIBPROJ4=ON \
+ -DVTK_USE_SYSTEM_LIBPROJ4=OFF \
-DVTK_USE_SYSTEM_LIBXML2=ON \
-DVTK_USE_SYSTEM_OGGTHEORA=ON \
-DVTK_USE_SYSTEM_PNG=ON \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vtk6.git
More information about the debian-science-commits
mailing list