Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Comment out some asserts I think are incorrect. Needs verification.

Browse Source
This commit is contained in:
Robin Dunn
2019-08-02 22:00:49 -07:00
parent 2571f5962c
commit fc35d8b49b
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/msw/graphicsd2d.cpp
View File

@@ -1772,9 +1772,12 @@ void wxD2DPathData::AddPath(const wxGraphicsPathData* path)
GeometryStateData curStateSrc; GeometryStateData curStateSrc;
pathSrc->SaveGeometryState(curStateSrc); pathSrc->SaveGeometryState(curStateSrc);
// I think this assert is incorrect. We need to support paths where the end
// is not connected to the beginning. --Robin
// Raise warning if appended path has an open non-empty sub-path. // Raise warning if appended path has an open non-empty sub-path.
wxASSERT_MSG( pathSrc->IsStateSafeForFlush(), // wxASSERT_MSG( pathSrc->IsStateSafeForFlush(),
wxS("Sub-path in appended path should be closed prior to this operation") ); // wxS("Sub-path in appended path should be closed prior to this operation") );
// Close appended geometry. // Close appended geometry.
pathSrc->Flush(); pathSrc->Flush();
@@ -1893,8 +1896,12 @@ void wxD2DPathData::Transform(const wxGraphicsMatrixData* matrix)
// constraints this can be fully done only if open figure was empty. // constraints this can be fully done only if open figure was empty.
// So, Transform() can be safely called if path doesn't contain the open // So, Transform() can be safely called if path doesn't contain the open
// sub-path or if open sub-path is empty. // sub-path or if open sub-path is empty.
wxASSERT_MSG( IsStateSafeForFlush(),
wxS("Consider closing sub-path before calling Transform()") ); // I think this assert is incorrect. We need to support paths where the end
// is not connected to the beginning. --Robin
// wxASSERT_MSG( IsStateSafeForFlush(),
// wxS("Consider closing sub-path before calling Transform()") );
// Close current geometry. // Close current geometry.
Flush(); Flush();