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

Fix https://github.com/GPUOpen-Tools/compressonator/issues/326 #327

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix https://github.com/GPUOpen-Tools/compressonator/issues/326 #327

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
71ddf7f
Correctly interpret a gamma of 0 to set no gamma correction
Nov 28, 2024
e111695
Fix typos
Nov 28, 2024
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 applications/_plugins/cfilter/boxfilter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ int Plugin_BoxFilter::TC_CFilter(MipSet* pMipSet, CMP_MipSet* pMipSetDst, CMP_CF
#endif
}

if (pCFilterParams->fGammaCorrection != 1.0f)
if (pCFilterParams->fGammaCorrection != 1.0f && pCFilterParams->fGammaCorrection != 0.0f)
CMP_SetMipSetGamma(pMipSet, pCFilterParams->fGammaCorrection);

return result;
Expand Down
6 changes: 3 additions & 3 deletions cmp_compressonatorlib/compressonator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,8 +577,8 @@ typedef struct

// Setting that applies to a CAS Filter
float fSharpness; // Uses Fidelity Fx CAS sharpness, default 0 No sharpness set
int destWidth; // Scale source texture width to destWidth default 0 no scaleing
int destHeight; // Scale source texture height to destHeight default 0 no scalwing
int destWidth; // Scale source texture width to destWidth default 0 no scaling
int destHeight; // Scale source texture height to destHeight default 0 no scaling
bool useSRGB; // if set true process image as SRGB else use linear color space. Default is false

} CMP_CFilterParams;
Expand All @@ -592,7 +592,7 @@ typedef enum
typedef struct
{
CMP_VISION_PROCESS nProcessType; // Type of image processing to perform
CMP_BOOL Auto; // Use Auto stting to align and crop images
CMP_BOOL Auto; // Use Auto setting to align and crop images
CMP_BOOL AlignImages; // Align the Test image with the source image
CMP_BOOL ShowImages; // Display processed images
CMP_BOOL SaveMatch; // Save auto match image
Expand Down
2 changes: 1 addition & 1 deletion cmp_framework/common/cmp_boxfilter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ CMP_INT CMP_API CMP_GenerateMIPLevelsEx(CMP_MipSet* pMipSet, CMP_CFilterParams*
break;
}

if (CFilterParam->fGammaCorrection != 1.0f)
if (CFilterParam->fGammaCorrection != 1.0f && CFilterParam->fGammaCorrection != 0.0f)
CMP_SetMipSetGamma(pMipSet, CFilterParam->fGammaCorrection);

return CMP_OK;
Expand Down