[vtk6] 05/12: Apply new patches 101 ans 102 in source code
Gert Wollny
gert-guest at moszumanska.debian.org
Mon Mar 28 12:39:48 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 7720d44ce0a1dddaac081b800fca9b70ef4dd727
Author: Gert Wollny <gw.fossdev at gmail.com>
Date: Sun Mar 27 09:55:03 2016 +0000
Apply new patches 101 ans 102 in source code
---
CMake/FindLIBPROJ4.cmake | 4 ++--
CMake/vtkJavaWrapping.cmake | 2 +-
Geovis/Core/vtkGeoProjection.cxx | 16 ++++++++--------
Geovis/Core/vtkGeoProjection.h | 9 +++++----
Geovis/Core/vtkGeoTransform.cxx | 24 ++++++++++++------------
ThirdParty/libproj4/vtk_libproj4.h.in | 3 ++-
6 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/CMake/FindLIBPROJ4.cmake b/CMake/FindLIBPROJ4.cmake
index a004458..9d3904d 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 proj4 libproj4
+ NAMES proj
PATHS
${_LIBPROJ4_DIR}/lib64
${CMAKE_INSTALL_PREFIX}/lib64
@@ -28,7 +28,7 @@ if ( NOT LIBPROJ4_INCLUDE_DIR OR NOT LIBPROJ4_LIBRARIES OR NOT LIBPROJ4_FOUND )
)
find_path( LIBPROJ4_INCLUDE_DIR
- NAMES lib_proj.h
+ NAMES proj_api.h
PATHS
${_LIBPROJ4_DIR}
${_LIBPROJ4_DIR}/include
diff --git a/CMake/vtkJavaWrapping.cmake b/CMake/vtkJavaWrapping.cmake
index 4cbd0a2..45ae0b1 100644
--- a/CMake/vtkJavaWrapping.cmake
+++ b/CMake/vtkJavaWrapping.cmake
@@ -79,7 +79,7 @@ function(vtk_add_java_wrapping module_name module_srcs module_hdrs)
install(TARGETS ${module_name}Java
EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_RUNTIME_DIR} COMPONENT RuntimeLibraries
- LIBRARY DESTINATION ${VTK_INSTALL_LIBRARY_DIR} COMPONENT RuntimeLibraries
+ LIBRARY DESTINATION ${VTK_INSTALL_LIBRARY_DIR}/jni COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_ARCHIVE_DIR} COMPONENT Development)
endif()
endfunction()
diff --git a/Geovis/Core/vtkGeoProjection.cxx b/Geovis/Core/vtkGeoProjection.cxx
index a64e799..607350b 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 PROJ_LIST* pj = proj_list; pj && pj->id; ++ pj )
+ for ( const PJ_LIST* pj = pj_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 proj_list[projection].id;
+ return pj_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 proj_list[projection].descr[0];
+ return pj_list[projection].descr[0];
}
//-----------------------------------------------------------------------------
vtkGeoProjection::vtkGeoProjection()
@@ -116,7 +116,7 @@ vtkGeoProjection::~vtkGeoProjection()
this->SetName( 0 );
if ( this->Projection )
{
- proj_free( this->Projection );
+ pj_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 PROJ_LIST* proj = proj_list; proj && proj->id; ++ proj, ++ i )
+ for ( const PJ_LIST* proj = pj_list; proj && proj->id; ++ proj, ++ i )
{
if ( ! strcmp( proj->id, this->Name ) )
{
@@ -162,7 +162,7 @@ const char* vtkGeoProjection::GetDescription()
return this->Projection->descr;
}
//-----------------------------------------------------------------------------
-PROJ* vtkGeoProjection::GetProjection()
+projPJ vtkGeoProjection::GetProjection()
{
this->UpdateProjection();
return this->Projection;
@@ -178,7 +178,7 @@ int vtkGeoProjection::UpdateProjection()
if ( this->Projection )
{
- proj_free( this->Projection );
+ pj_free( this->Projection );
this->Projection = 0;
}
@@ -217,7 +217,7 @@ int vtkGeoProjection::UpdateProjection()
pjArgs[3+i] = stringHolder[i].c_str();
}
- this->Projection = proj_init( argSize, const_cast<char**>( pjArgs ) );
+ this->Projection = pj_init( argSize, const_cast<char**>( pjArgs ) );
delete[] pjArgs;
if ( this->Projection )
{
diff --git a/Geovis/Core/vtkGeoProjection.h b/Geovis/Core/vtkGeoProjection.h
index 75f50ca..68ceea6 100644
--- a/Geovis/Core/vtkGeoProjection.h
+++ b/Geovis/Core/vtkGeoProjection.h
@@ -29,8 +29,9 @@
#include "vtkGeovisCoreModule.h" // For export macro
#include "vtkObject.h"
-struct PROJconsts;
-typedef PROJconsts PROJ;
+struct PJconsts;
+typedef struct PJconsts PJ;
+typedef PJ* projPJ;
class VTKGEOVISCORE_EXPORT vtkGeoProjection : public vtkObject
{
@@ -85,7 +86,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.
- PROJ* GetProjection();
+ projPJ GetProjection();
// Description:
// Add an optional parameter to the projection that will be computed or
@@ -125,7 +126,7 @@ protected:
char* Name;
double CentralMeridian;
- PROJ* Projection;
+ projPJ Projection;
vtkTimeStamp ProjectionMTime;
private:
diff --git a/Geovis/Core/vtkGeoTransform.cxx b/Geovis/Core/vtkGeoTransform.cxx
index b113795..1013cc9 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 );
- PROJ* src = this->SourceProjection ? this->SourceProjection->GetProjection() : 0;
- PROJ* dst = this->DestinationProjection ? this->DestinationProjection->GetProjection() : 0;
+ projPJ src = this->SourceProjection ? this->SourceProjection->GetProjection() : 0;
+ projPJ 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 )
{
- PROJ* src = this->SourceProjection ? this->SourceProjection->GetProjection() : 0;
- PROJ* dst = this->DestinationProjection ? this->DestinationProjection->GetProjection() : 0;
+ projPJ src = this->SourceProjection ? this->SourceProjection->GetProjection() : 0;
+ projPJ dst = this->DestinationProjection ? this->DestinationProjection->GetProjection() : 0;
int delta = stride - 2;
- PROJ_LP lp;
- PROJ_XY xy;
+ projLP lp;
+ projXY 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.x = coord[0]; xy.y = coord[1];
- lp = proj_inv( xy, src );
- coord[0] = lp.lam; coord[1] = lp.phi;
+ xy.u = coord[0]; xy.v = coord[1];
+ lp = pj_inv( xy, src );
+ coord[0] = lp.u; coord[1] = lp.v;
}
}
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.lam = coord[0]; lp.phi = coord[1];
- xy = proj_fwd( lp, dst );
- coord[0] = xy.x; coord[1] = xy.y;
+ lp.u = coord[0]; lp.v = coord[1];
+ xy = pj_fwd( lp, dst );
+ coord[0] = xy.u; coord[1] = xy.v;
}
}
else // ! dst
diff --git a/ThirdParty/libproj4/vtk_libproj4.h.in b/ThirdParty/libproj4/vtk_libproj4.h.in
index bd67484..b41c9da 100644
--- a/ThirdParty/libproj4/vtk_libproj4.h.in
+++ b/ThirdParty/libproj4/vtk_libproj4.h.in
@@ -18,7 +18,8 @@
/* Use the libproj4 library configured for VTK. */
#cmakedefine VTK_USE_SYSTEM_LIBPROJ4
#ifdef VTK_USE_SYSTEM_LIBPROJ4
-# include <lib_proj.h>
+# include <projects.h>
+# include <proj_api.h>
#else
# include <vtklibproj4/lib_proj.h>
#endif
--
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