Skip to content

Fix RawData read and write of SHP_POINTZ, z and m was flipped #227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pmeems merged 2 commits into from
Aug 21, 2023
Merged

Fix RawData read and write of SHP_POINTZ, z and m was flipped #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7f0e15
Fix RawData read and write of SHP_POINTZ, z and m was flipped
sweco-sedahd May 5, 2023
cc176c1
Get the correct recordLength so that (Slow) version put_RawData also …
sweco-sedahd May 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/COM classes/Shape.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2339,7 +2339,7 @@ STDMETHODIMP CShape::ImportFromBinary(const VARIANT bytesArray, VARIANT_BOOL* re

auto data = (char*)p; // TODO: Fix compile warning

const int recordLength = gsl::narrow_cast<int>(bytesArray.parray->cbElements);
const int recordLength = gsl::narrow_cast<int>(bytesArray.parray->rgsabound->cElements);
const bool result = _shp->put_RawData(data, recordLength);
*retVal = result ? VARIANT_TRUE : VARIANT_FALSE;

Expand Down
4 changes: 2 additions & 2 deletions src/Shapefile/ShapeWrapperCOM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -844,8 +844,8 @@ int* CShapeWrapperCOM::get_RawData()
}
else if (_shapeType == SHP_POINTZ)
{
gsl::at(_points, 0)->get_M(&ddata[2]);
gsl::at(_points, 0)->get_Z(&ddata[3]);
gsl::at(_points, 0)->get_Z(&ddata[2]);
gsl::at(_points, 0)->get_M(&ddata[3]);
}
}
return intdata;
Expand Down
8 changes: 4 additions & 4 deletions src/Shapefile/ShapeWrapperPoint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,8 @@ bool CShapeWrapperPoint::put_RawData(char* shapeData, int recordLength)
}
else if (shpType == SHP_POINTZ)
{
_m = ddata[2];
_z = ddata[3];
_z = ddata[2];
_m = ddata[3];
}

_initialized = true;
Expand Down Expand Up @@ -252,8 +252,8 @@ int* CShapeWrapperPoint::get_RawData()
}
else if (_shpType == SHP_POINTZ)
{
ddata[2] = _m;
ddata[3] = _z;
ddata[2] = _z;
ddata[3] = _m;
}

return intdata;
Expand Down