"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "saga-gis/src/tools/projection/pj_proj4/crs_transform_grid.cpp" between
saga-7.6.2_src.zip and saga-7.6.3_src.zip

About: SAGA (System for Automated Geoscientific Analyses) is a Geographic Information System (GIS) software for geodata processing and analysis. All source codes.

crs_transform_grid.cpp  (saga-7.6.2_src):crs_transform_grid.cpp  (saga-7.6.3_src)
skipping to change at line 51 skipping to change at line 51
// contact: Olaf Conrad // // contact: Olaf Conrad //
// Institute of Geography // // Institute of Geography //
// University of Hamburg // // University of Hamburg //
// Germany // // Germany //
// // // //
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
//--------------------------------------------------------- //---------------------------------------------------------
#include "crs_transform_grid.h" #include "crs_transform_grid.h"
#ifdef _OPENMP
#include <omp.h>
#endif
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
// // // //
// // // //
// // // //
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
//--------------------------------------------------------- //---------------------------------------------------------
CCRS_Transform_Grid::CCRS_Transform_Grid(bool bList) CCRS_Transform_Grid::CCRS_Transform_Grid(bool bList)
{ {
m_bList = bList; m_bList = bList;
skipping to change at line 368 skipping to change at line 364
for(int x=0; x<pTarget->Get_NX(); x++) for(int x=0; x<pTarget->Get_NX(); x++)
{ {
if( !is_In_Target_Area(x, y) ) if( !is_In_Target_Area(x, y) )
{ {
continue; continue;
} }
double z, ySource, xSource = pTarget->Get_XMin() + x * pTarget->Get_Cellsize(); double z, ySource, xSource = pTarget->Get_XMin() + x * pTarget->Get_Cellsize();
//------------------------------------------------------- -- //------------------------------------------------------- --
if( !m_Projector[omp_get_thread_num()].Get_Projection(xSo #ifdef PROJ6
urce, ySource = yTarget) ) if( !m_Projector[SG_OMP_Get_Thread_Num()].Get_Projection(
xSource, ySource = yTarget) )
#else
if( !m_Projector.Get_Projection(xSource, ySource = yTarge
t) )
#endif
{ {
continue; continue;
} }
if( bGeogCS_Adjust ) if( bGeogCS_Adjust )
{ {
if( xSource < 0. ) if( xSource < 0. )
{ {
xSource += 360.; xSource += 360.;
} }
skipping to change at line 518 skipping to change at line 518
#endif #endif
for(int x=0; x<Target_System.Get_NX(); x++) for(int x=0; x<Target_System.Get_NX(); x++)
{ {
if( !is_In_Target_Area(x, y) ) if( !is_In_Target_Area(x, y) )
{ {
continue; continue;
} }
double z, ySource, xSource = Target_System.Get_XMin( ) + x * Target_System.Get_Cellsize(); double z, ySource, xSource = Target_System.Get_XMin( ) + x * Target_System.Get_Cellsize();
#ifdef _OPENMP #ifdef PROJ6
if( !m_Projector[omp_get_thread_num()].Get_Projection(xSo if( !m_Projector[SG_OMP_Get_Thread_Num()].Get_Projection(
urce, ySource = yTarget) ) xSource, ySource = yTarget) )
#else #else
if( !m_Projector.Get_Projection(xSource, ySource = yTarge t) ) if( !m_Projector.Get_Projection(xSource, ySource = yTarge t) )
#endif #endif
{ {
continue; continue;
} }
if( bGeogCS_Adjust ) if( bGeogCS_Adjust )
{ {
if( xSource < 0. ) if( xSource < 0. )
 End of changes. 3 change blocks. 
9 lines changed or deleted 10 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)