This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository ossim.
commit d3ab32e3128c030d0c5ebbd9ba7c34e65494b43b
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Mon Dec 21 22:37:36 2015 +0100
Imported Upstream version 1.8.20.3+ds
---
ossim/CMakeLists.txt | 6 +-----
.../src/ossim/imaging/ossimMonoGridRemapEngine.cpp | 4 +---
.../projection/ossimNitfProjectionFactory.cpp | 17 +++++++++------
ossim/src/ossim/projection/ossimRpcModel.cpp | 24 ++++++++++++++--------
4 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/ossim/CMakeLists.txt b/ossim/CMakeLists.txt
index 6ffb7e7..d19dfa4 100644
--- a/ossim/CMakeLists.txt
+++ b/ossim/CMakeLists.txt
@@ -5,11 +5,7 @@ IF(NOT OSSIM_BUILD_ADDITIONAL_OSSIM_DIRECTORIES)
SET(OSSIM_BUILD_ADDITIONAL_OSSIM_DIRECTORIES "" CACHE PATH "Specify full
paths separated by ; to additional OSSIM applications you wish to include into
the ossim build framework. These will have variables setup for the ossim
includes" FORCE)
ENDIF(NOT OSSIM_BUILD_ADDITIONAL_OSSIM_DIRECTORIES)
-IF(NOT APPLE)
- cmake_minimum_required(VERSION 2.6)
-ELSE(NOT APPLE)
- cmake_minimum_required(VERSION 2.8)
-ENDIF(NOT APPLE)
+cmake_minimum_required(VERSION 2.8)
SET(CMAKE_MODULE_PATH
"${${PROJECT_NAME}_SOURCE_DIR}/CMakeModules;${CMAKE_MODULE_PATH}")
diff --git a/ossim/src/ossim/imaging/ossimMonoGridRemapEngine.cpp
b/ossim/src/ossim/imaging/ossimMonoGridRemapEngine.cpp
index b10ea02..aa8d782 100644
--- a/ossim/src/ossim/imaging/ossimMonoGridRemapEngine.cpp
+++ b/ossim/src/ossim/imaging/ossimMonoGridRemapEngine.cpp
@@ -7,8 +7,6 @@
//
// See LICENSE.txt file in the top level directory for more details.
//
-// See the GPL in the COPYING.GPL file for more details.
-//
// AUTHOR: Oscar Kramer
//
// DESCRIPTION: Contains implementation of class
@@ -16,7 +14,7 @@
// LIMITATIONS: None.
//
//*****************************************************************************
-// $Id: ossimMonoGridRemapEngine.cpp 23664 2015-12-14 14:17:27Z dburken $
+// $Id: ossimMonoGridRemapEngine.cpp 23673 2015-12-21 09:46:43Z rashadkm $
#include <ossim/imaging/ossimMonoGridRemapEngine.h>
diff --git a/ossim/src/ossim/projection/ossimNitfProjectionFactory.cpp
b/ossim/src/ossim/projection/ossimNitfProjectionFactory.cpp
index 70aea03..1de7e75 100644
--- a/ossim/src/ossim/projection/ossimNitfProjectionFactory.cpp
+++ b/ossim/src/ossim/projection/ossimNitfProjectionFactory.cpp
@@ -2,14 +2,11 @@
//
// License: See top level LICENSE.txt file.
//
-// Author: Matt Revelle
-// David Burken
-//
// Description:
//
// Contains class definition for ossimNitfProjectionFactory.
//
-// $Id: ossimNitfProjectionFactory.cpp 22848 2014-07-31 18:29:02Z dburken $
+// $Id: ossimNitfProjectionFactory.cpp 23672 2015-12-19 01:11:21Z gpotts $
//----------------------------------------------------------------------------
#include <ossim/projection/ossimNitfProjectionFactory.h>
@@ -304,6 +301,7 @@ ossimProjection* ossimNitfProjectionFactory::makeUtm(
const ossimString& coordinateSystem) const
{
ossimProjection* proj = 0;
+ bool isBilinear = false;
if (hdr)
{
ossimString geographicLocation = hdr->getGeographicLocation();
@@ -376,7 +374,8 @@ ossimProjection* ossimNitfProjectionFactory::makeUtm(
// tag.
//---
proj = makeBilinear(hdr, gpts);
-
+ if(proj) scale = proj->getMetersPerPixel();
+ isBilinear = true;
uproj = 0; // Done with utm projeciton
}
@@ -392,7 +391,7 @@ ossimProjection* ossimNitfProjectionFactory::makeUtm(
proj = uproj.release();
}
- if( scale.hasNans() == false )
+ if( (scale.hasNans() == false)&&(!isBilinear) )
{
//---
// Get the tie point.
@@ -449,6 +448,10 @@ ossimProjection* ossimNitfProjectionFactory::makeUtm(
}
}
}
+ else if(isBilinear)
+ {
+ // blank
+ }
else // Scale has nans
{
if ( proj )
@@ -495,6 +498,7 @@ bool ossimNitfProjectionFactory::parseMgrsString(const
ossimString& mgrsLocation
result = true; // Set to true.
+
//---
// Convert each string to Easting Northing. This also sets zone
hemisphere.
// Method takes long for zone.
@@ -514,6 +518,7 @@ bool ossimNitfProjectionFactory::parseMgrsString(const
ossimString& mgrsLocation
}
if (result) zone = static_cast<ossim_uint32>(z); // Set the zone.
}
+
return result;
}
diff --git a/ossim/src/ossim/projection/ossimRpcModel.cpp
b/ossim/src/ossim/projection/ossimRpcModel.cpp
index 6b831f7..b64bd51 100644
--- a/ossim/src/ossim/projection/ossimRpcModel.cpp
+++ b/ossim/src/ossim/projection/ossimRpcModel.cpp
@@ -13,7 +13,7 @@
// LIMITATIONS: Does not support parameter adjustment (YET)
//
//*****************************************************************************
-// $Id: ossimRpcModel.cpp 23548 2015-09-28 21:01:36Z dburken $
+// $Id: ossimRpcModel.cpp 23670 2015-12-18 22:33:12Z dburken $
#include <ossim/projection/ossimRpcModel.h>
#include <ossim/elevation/ossimElevManager.h>
@@ -441,18 +441,24 @@ void ossimRpcModel::lineSampleHeightToWorld(const
ossimDpt& image_point,
const double& ellHeight,
ossimGpt& gpt) const
{
- // if (traceExec()) ossimNotify(ossimNotifyLevel_DEBUG) << "DEBUG
ossimRpcModel::lineSampleHeightToWorld: entering..." << std::endl;
+ // if (traceExec()) ossimNotify(ossimNotifyLevel_DEBUG)
+ // << "DEBUG ossimRpcModel::lineSampleHeightToWorld: entering..." <<
std::endl;
+
+ //---
+ // Removed below "gpt.makeNan()" if outside of image. This was put in
+ // troubleshooting dateline wrap issues. Returned nans are also
+ // causing issues so commenting out. drb - 17 Dec. 2015
+ //---
//***
// Extrapolate if point is outside image:
//***
- if (!insideImage(image_point))
- {
-// gpt = extrapolate(image_point, ellHeight);
-// if (traceExec()) CLOG << "returning..." << endl;
- gpt.makeNan();
- return;
- }
+ // if (!insideImage(image_point))
+ // {
+ // gpt = extrapolate(image_point, ellHeight);
+ // if (traceExec()) CLOG << "returning..." << endl;
+ // return;
+ // }
//***
// Constants for convergence tests:
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/ossim.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
