Skip to content

fix(CMP_ConvertTexture): Correct error code from CMP_ConvertTexture #4

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
ProbablePrime merged 2 commits into from
Feb 4, 2025
Merged

fix(CMP_ConvertTexture): Correct error code from CMP_ConvertTexture #4

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
5b09aa6
fix(CMP_ConvertTexture): Correct error code from CMP_ConvertTexture
ProbablePrime Feb 4, 2025
e3838a5
fix(ci): bump old ci to use v4 artifacts
ProbablePrime Feb 4, 2025
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: 2 additions & 2 deletions .github/workflows/cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
run: cmake --build . --config $BUILD_TYPE

- name: Upload Build Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: CompressonatorCLI_64_Windows_Master_Build
path: ${{github.workspace}}/build/bin/bin/Release
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:

# Will probably want to collect the files into a better structure before running this command
- name: Upload Build Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: CompressonatorFramework_Windows_Master_Build
path: CompressonatorFramework_result/
2 changes: 1 addition & 1 deletion cmp_compressonatorlib/compressonator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ CMP_ERROR CMP_API CMP_ConvertTexture(CMP_Texture* pSourceTexture,
CodecType destType = GetCodecType(pDestTexture->format);
assert(destType != CT_Unknown);
if (destType == CT_Unknown)
return CMP_ERR_UNSUPPORTED_SOURCE_FORMAT;
return CMP_ERR_UNSUPPORTED_DEST_FORMAT;

// Figure out the type of processing we are doing

Expand Down