Skip to content

Commit

Permalink
Merge branch 'OIIO' of https://github.com/antond-weta/rawtoaces into …
Browse files Browse the repository at this point in the history
…OIIO
  • Loading branch information
antond-weta committed Aug 5, 2024
2 parents 78dade1 + 2a6a71d commit 0dec3ab
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
CMAKE_CXX_STANDARD: ${{matrix.cxx_std}}
OPENEXR_VERSION: ${{matrix.openexr_ver}}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Print
shell: bash
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
c_compiler: gcc

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set reusable strings
# Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clang-format-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
name: Formatting Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Run clang-format style check for C/C++ programs.
uses: DoozyX/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# https://hub.docker.com/r/aswf/ci-vfxall/tags
FROM aswf/ci-vfxall:2022
FROM aswf/ci-vfxall:2024

# Base Building Dependencies.
RUN yum install --setopt=tsflags=nodocs -y \
Expand Down
2 changes: 1 addition & 1 deletion include/rawtoaces/define.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
# include <string.h>
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
# define snprintf _snprintf
//# define snprintf _snprintf
# define _CRT_SECURE_NO_WARNINGS
# define cmp_str stricmp
#else
Expand Down

0 comments on commit 0dec3ab

Please sign in to comment.