Skip to content
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

ACS: Fix incompatible pointer types #619

Merged
merged 1 commit into from
Nov 21, 2024
Merged

ACS: Fix incompatible pointer types #619

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
10 changes: 5 additions & 5 deletions pkg/acs/lib/getacskeys.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ int getACSKeys (ACSInfo *acs, Hdr *phdr) {
if (GetKeyInt (phdr, "NEXTEND", USE_DEFAULT, EXT_PER_GROUP, &acs->nextend))
return (status);

if (GetKeyBool (phdr, "SUBARRAY", NO_DEFAULT, 0, &acs->subarray))
if (GetKeyInt (phdr, "SUBARRAY", NO_DEFAULT, 0, &acs->subarray))
return (status);

/* Get CCD-specific parameters. */
Expand Down Expand Up @@ -145,9 +145,9 @@ int checkACSKeys(ACSInfo *acs)
return INVALID_EXPTIME;
}

upperCase(&acs->aperture);
upperCase(&acs->jwrotype);
upperCase(&acs->flashstatus);
upperCase(acs->aperture);
upperCase(acs->jwrotype);
upperCase(acs->flashstatus);

// Convert number of extensions to number of SingleGroups.
// NOTE: this is technically incorrect and instead findTotalNumberOfImsets()
Expand All @@ -163,7 +163,7 @@ int checkACSKeys(ACSInfo *acs)
/* Get CCD-specific parameters. */
if (acs->detector != MAMA_DETECTOR)
{
upperCase(&acs->ccdamp);
upperCase(acs->ccdamp);
/* Verify that only the letters 'ABCD' are in the string. */
const char * ampAlphabet = "ABCD";
if (!isStrInLanguage(acs->ccdamp, ampAlphabet))
Expand Down
Loading