Skip to content

Guider's CurrentImage is never null #1396

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
agalasso merged 1 commit into from
Dec 31, 2025
Merged

Guider's CurrentImage is never null #1396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions src/guider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,10 +852,6 @@ bool Guider::MoveLockPosition(const PHD_Point& mountDeltaArg)
}

const usImage *image = CurrentImage();
if (!image)
{
throw ERROR_INFO("cannot move lock pos without an image");
}

// This loop is to handle dithers when the star is near the edge of the frame. The strategy
// is to try reflecting the requested dither in 4 directions along the RA/Dec axes; if any
Expand Down
8 changes: 2 additions & 6 deletions src/guider_multistar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ bool GuiderMultiStar::AutoSelect(const wxRect& roi)

try
{
if (!image || !image->ImageData)
if (!image->ImageData)
{
throw ERROR_INFO("No Current Image");
}
Expand Down Expand Up @@ -519,7 +519,7 @@ bool GuiderMultiStar::AutoSelect(const wxRect& roi)
error = true;
}

if (image && image->ImageData)
if (image->ImageData)
{
if (error)
Debug.Write("GuiderMultiStar::AutoSelect failed.\n");
Expand Down Expand Up @@ -1078,8 +1078,6 @@ bool GuiderMultiStar::SetLockPosition(const PHD_Point& position)
bool GuiderMultiStar::IsValidLockPosition(const PHD_Point& pt)
{
const usImage *pImage = CurrentImage();
if (!pImage)
return false;
// this is a bit ugly as it is tightly coupled to Star::Find
return pt.X >= 1 + m_searchRegion && pt.X + 1 + m_searchRegion < pImage->Size.GetX() && pt.Y >= 1 + m_searchRegion &&
pt.Y + 1 + m_searchRegion < pImage->Size.GetY();
Expand All @@ -1088,8 +1086,6 @@ bool GuiderMultiStar::IsValidLockPosition(const PHD_Point& pt)
bool GuiderMultiStar::IsValidSecondaryStarPosition(const PHD_Point& pt)
{
const usImage *pImage = CurrentImage();
if (!pImage)
return false;
// As above, tightly coupled to Star::Find but with somewhat relaxed constraints. Find handles cases where search region is
// only partly within image
return pt.X >= 5 && pt.X + 5 < pImage->Size.GetX() && pt.Y >= 5 && pt.Y + 5 < pImage->Size.GetY();
Expand Down