Endian fixes for the shape attribute getter functions.

common/getshape.cpp

@@ -48,6 +48,7 @@
 
 #include "wwstd.h"
 #include "shape.h"
+#include "endianness.h"
 
 /***************************************************************************
  * Get_Shape_Size -- Fetch the size of the shape in memory.                *
@@ -81,7 +82,7 @@ int Get_Shape_Size(void const* shape)
     /*
     -------------------------- Returns shape's size --------------------------
     */
-    return (shp->ShapeSize);
+    return le16toh(shp->ShapeSize);
 
 } /* end of Get_Shape_Size */
 
@@ -106,7 +107,7 @@ int Get_Shape_Uncomp_Size(void const* shape)
 {
     Shape_Type* shp = (Shape_Type*)shape;
 
-    return (shp->DataLength);
+    return le16toh(shp->DataLength);
 
 } /* end of Get_Shape_Uncomp_Size */
 
@@ -170,7 +171,7 @@ int Extract_Shape_Count(void const* buffer)
     char const* bbuffer = (char const*)buffer;
     uint16_t numshapes;
     memcpy(&numshapes, bbuffer + offsetof(ShapeBlock_Type, NumShapes), sizeof(numshapes));
-    return (int)numshapes;
+    return (int)le16toh(numshapes);
 } /* end of Extract_Shape_Count */
 
 /***************************************************************************
@@ -214,6 +215,7 @@ void* Extract_Shape(void const* buffer, int shape)
     /*  Same as offset = block->Offsets[shape]; on arch that unaligned access
         behaves well.  */
     memcpy(&offset, bytebuf + offsetof(ShapeBlock_Type, Offsets) + shape * sizeof(uint32_t), sizeof(uint32_t));
+    offset = le32toh(offset);
 
     return (bytebuf + 2 + offset);
 
@@ -240,7 +242,7 @@ int Get_Shape_Width(void const* shape)
 {
     Shape_Type* shp = (Shape_Type*)shape;
 
-    return (shp->Width);
+    return le16toh(shp->Width);
 
 } /* end of Get_Shape_Width */