Merge pull request ossimlabs#256 from ossimlabs/oscar

Oscar
abrahamgitonga · May 26, 2020 · 5bd9b7a · 5bd9b7a
2 parents a8cfd0b + 459eac1
commit 5bd9b7a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/projection/ossimEquDistCylProjection.cpp b/src/projection/ossimEquDistCylProjection.cpp
@@ -514,8 +514,8 @@ void ossimEquDistCylProjection::updateFromTransform()
    // and offset preserved in theMetersPerPixel, theImageToModelAzimuth, and theUlEastingNorthing,
    // respectively, the transform can be regenerated with a call to update().
    const NEWMAT::Matrix& m = theModelTransform.getData();
-   theMetersPerPixel.x = sqrt(m[0][0]*m[0][0] + m[1][0]*m[1][0]);
-   theMetersPerPixel.y = sqrt(m[0][1]*m[0][1] + m[1][1]*m[1][1]);
+   theMetersPerPixel.x = sqrt(m[0][0]*m[0][0] + m[0][1]*m[0][1]);
+   theMetersPerPixel.y = sqrt(m[1][0]*m[1][0] + m[1][1]*m[1][1]);
    theUlEastingNorthing.x = m[0][3];
    theUlEastingNorthing.y = m[1][3];
    theImageToModelAzimuth = ossim::acosd(m[0][0]/theMetersPerPixel.x);

diff --git a/src/projection/ossimMapProjection.cpp b/src/projection/ossimMapProjection.cpp
@@ -320,8 +320,8 @@ void ossimMapProjection::updateFromTransform()
    // and offset preserved in theMetersPerPixel, theImageToModelAzimuth, and theUlEastingNorthing,
    // respectively, the transform can be regenerated with a call to update().
    const NEWMAT::Matrix& m = theModelTransform.getData();
-   theMetersPerPixel.x = sqrt(m[0][0]*m[0][0] + m[1][0]*m[1][0]);
-   theMetersPerPixel.y = sqrt(m[0][1]*m[0][1] + m[1][1]*m[1][1]);
+   theMetersPerPixel.x = sqrt(m[0][0]*m[0][0] + m[0][1]*m[0][1]);
+   theMetersPerPixel.y = sqrt(m[1][0]*m[1][0] + m[1][1]*m[1][1]);
    theUlEastingNorthing.x = m[0][3];
    theUlEastingNorthing.y = m[1][3];
    theImageToModelAzimuth = ossim::acosd(m[0][0]/theMetersPerPixel.x);
@@ -1193,8 +1193,8 @@ void ossimMapProjection::computeMetersPerPixel()
 #elif USE_MODEL_TRANSFORM_XXX  // Not working so hide
    // Transform according to 4x4 transform embedded in the projection:
    const NEWMAT::Matrix& m = theModelTransform.getData();
-   theMetersPerPixel.x = sqrt(m[0][0]*m[0][0] + m[1][0]*m[1][0]);
-   theMetersPerPixel.y = sqrt(m[0][1]*m[0][1] + m[1][1]*m[1][1]);
+   theMetersPerPixel.x = sqrt(m[0][0]*m[0][0] + m[0][1]*m[0][1]);
+   theMetersPerPixel.y = sqrt(m[1][0]*m[1][0] + m[1][1]*m[1][1]);
 #else
    ossimGpt right=theOrigin;
    ossimGpt down=theOrigin;