Skip to content

Commit 15c5033

Browse files
Merge pull request #4 from Yellow-Dog-Man/fix/convert-errors
fix(CMP_ConvertTexture): Correct error code from CMP_ConvertTexture
2 parents 20b922c + e3838a5 commit 15c5033

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

.github/workflows/cmake.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
run: cmake --build . --config $BUILD_TYPE
4545

4646
- name: Upload Build Artifacts
47-
uses: actions/upload-artifact@v3
47+
uses: actions/upload-artifact@v4
4848
with:
4949
name: CompressonatorCLI_64_Windows_Master_Build
5050
path: ${{github.workspace}}/build/bin/bin/Release
@@ -134,7 +134,7 @@ jobs:
134134
135135
# Will probably want to collect the files into a better structure before running this command
136136
- name: Upload Build Artifacts
137-
uses: actions/upload-artifact@v3
137+
uses: actions/upload-artifact@v4
138138
with:
139139
name: CompressonatorFramework_Windows_Master_Build
140140
path: CompressonatorFramework_result/

cmp_compressonatorlib/compressonator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ CMP_ERROR CMP_API CMP_ConvertTexture(CMP_Texture* pSourceTexture,
308308
CodecType destType = GetCodecType(pDestTexture->format);
309309
assert(destType != CT_Unknown);
310310
if (destType == CT_Unknown)
311-
return CMP_ERR_UNSUPPORTED_SOURCE_FORMAT;
311+
return CMP_ERR_UNSUPPORTED_DEST_FORMAT;
312312

313313
// Figure out the type of processing we are doing
314314

0 commit comments

Comments
 (0)