[Git][debian-gis-team/ossim][master] 4 commits: New upstream version 2.6.1

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / ossim


Commits:
4c87573a by Bas Couwenberg at 2018-12-12T07:29:34Z
New upstream version 2.6.1
- - - - -
60fc1df0 by Bas Couwenberg at 2018-12-12T07:29:39Z
Merge tag 'upstream/2.6.1'

Upstream version 2.6.1

- - - - -
c158be30 by Bas Couwenberg at 2018-12-12T07:30:36Z
New upstream release.

- - - - -
cc8587d9 by Bas Couwenberg at 2018-12-12T07:31:13Z
Set distribution to experimental.

- - - - -


8 changed files:

- cmake/CMakeModules/Findossim.cmake
- debian/changelog
- include/ossim/projection/ossimUtmProjection.h
- include/ossim/util/ossimChipperUtil.h
- scripts/ocpld.sh
- src/projection/ossimUtmProjection.cpp
- src/support_data/ossimGeoTiff.cpp
- src/util/ossimChipperUtil.cpp


Changes:

=====================================
cmake/CMakeModules/Findossim.cmake
=====================================
@@ -4,7 +4,7 @@
 # Find OSSIM(Open Source Software Image Map) includes and libraries.
 #
 # This module defines:
-# 
+#
 #  OSSIM_INCLUDE_DIR, Where to find ossimVersion.h, etc.
 #  OSSIM_LIBRARIES, Libraries to link against to use OSSIM.
 #  OSSIM_FOUND,  True if found, false if one of the above are not found.
@@ -16,17 +16,23 @@
 # Find include path:
 #---
 set(CMAKE_FIND_FRAMEWORK "LAST")
-find_path(OSSIM_INCLUDE_DIR ossim/ossimVersion.h ossimVersion.h)
+find_path(OSSIM_INCLUDE_DIR ossim/ossimVersion.h ossimVersion.h
+          PATHS
+          $ENV{OSSIM_DEV_HOME}/ossim/include
+          $ENV{OSSIM_INSTALL_PREFIX}/include )
 
 set(OSSIM_NAMES ${OSSIM_NAMES} ossim libossim)
-find_library(OSSIM_LIBRARY NAMES ${OSSIM_NAMES})
+find_library(OSSIM_LIBRARY NAMES ${OSSIM_NAMES}
+             PATHS
+             $ENV{OSSIM_BUILD_DIR}/lib
+             $ENV{OSSIM_INSTALL_PREFIX}/lib)
 
 #---
 # This function sets OSSIM_FOUND if variables are valid.
-#--- 
+#---
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args( OSSIM DEFAULT_MSG 
-                                   OSSIM_LIBRARY 
+find_package_handle_standard_args( OSSIM DEFAULT_MSG
+                                   OSSIM_LIBRARY
                                    OSSIM_INCLUDE_DIR )
 
 if(OSSIM_FOUND)


=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+ossim (2.6.1-1~exp1) experimental; urgency=medium
+
+  * Team upload.
+  * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 12 Dec 2018 08:30:58 +0100
+
 ossim (2.6.0-2) unstable; urgency=medium
 
   * Team upload.


=====================================
include/ossim/projection/ossimUtmProjection.h
=====================================
@@ -83,6 +83,7 @@ public:
     * @return The false northing.
     */
    virtual double getFalseNorthing() const;
+   virtual double getScaleFactor() const;
 
    //! Returns TRUE if principal parameters are within epsilon tolerance.
    virtual bool operator==(const ossimProjection& projection) const;


=====================================
include/ossim/util/ossimChipperUtil.h
=====================================
@@ -329,7 +329,7 @@ private:
     * @brief Sets the projection tie point to the scene bounding rect corner.
     * @note Throws ossimException on error.
     */
-   void intiailizeProjectionTiePoint();
+   void initializeProjectionTiePoint ();
 
    /**
     * @brief Initializes the projection gsd.


=====================================
scripts/ocpld.sh
=====================================
@@ -30,8 +30,10 @@ if [[ $# < 2 ]]; then
 fi
 
 if [ ! -d $1 ]; then
-   echo; echo "<$1> is not a valid input directory. Aborting..."; echo
-   exit 1
+   if [ ! -f $1 ] ; then
+     echo; echo "<$1> is not a valid input directory or file. Aborting..."; echo
+     exit 1
+   fi
 fi
 
 if [ ! -d $2 ]; then
@@ -39,6 +41,9 @@ if [ ! -d $2 ]; then
    mkdir -p $2
 fi
 
-find $1 -type f -name "*.so" -exec bash -c "do_cpld {} $2" \;
-
+if [ -f $1 ] ; then
+   do_cpld $1 $2
+else
+  find $1 -type f -name "*.so*" -exec bash -c "do_cpld {} $2" \;
+fi
 echo; echo "All dependencies were copied to $2. Done!"; echo
\ No newline at end of file


=====================================
src/projection/ossimUtmProjection.cpp
=====================================
@@ -893,6 +893,11 @@ double ossimUtmProjection::getFalseNorthing() const
    return theTranMerc_False_Northing;
 }
 
+double ossimUtmProjection::getScaleFactor() const
+{
+   return theTranMerc_Scale_Factor;
+}
+
 //*************************************************************************************************
 //! Returns TRUE if principal parameters are within epsilon tolerance.
 //*************************************************************************************************


=====================================
src/support_data/ossimGeoTiff.cpp
=====================================
@@ -832,6 +832,7 @@ bool ossimGeoTiff::writeTags(TIFF *tifPtr,
          falseNorthing = ossim::mtrs2usft(falseNorthing);
          break;
       case ANGULAR_DEGREE:
+         tiePoints[3] = projectionInfo->ulGroundPt().lond();
          tiePoints[4] = projectionInfo->ulGroundPt().latd();
          pixScale[0] = projectionInfo->getDecimalDegreesPerPixel().x;
          pixScale[1] = projectionInfo->getDecimalDegreesPerPixel().y;


=====================================
src/util/ossimChipperUtil.cpp
=====================================
@@ -2261,7 +2261,7 @@ void ossimChipperUtil::createOutputProjection()
    }
 
    // Set the tie.
-   intiailizeProjectionTiePoint();
+   initializeProjectionTiePoint();
 
    if (snapTieToOrigin())
    {
@@ -2569,7 +2569,7 @@ void ossimChipperUtil::initializeIvtScale()
 
 } // End: ossimChipperUtil::initializeIvtScale()
 
-void ossimChipperUtil::intiailizeProjectionTiePoint()
+void ossimChipperUtil::initializeProjectionTiePoint ()
 {
    static const char MODULE[] = "ossimChipperUtil::initializeProjectionTiePoint()";
    if (traceDebug())



View it on GitLab: https://salsa.debian.org/debian-gis-team/ossim/compare/190766080ee97fe9bb114931c4c6bc0abbb840a5...cc8587d9704a65213a79e4cc4b608c1c326ba947

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/ossim/compare/190766080ee97fe9bb114931c4c6bc0abbb840a5...cc8587d9704a65213a79e4cc4b608c1c326ba947
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20181212/5b516b39/attachment-0001.html>