Skip to content

Commit d744454

Browse files
committed
fix final gcc errors
1 parent 98edde4 commit d744454

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

.github/workflows/cmake-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ jobs:
3535
os: windows-latest
3636
compiler: msvc
3737
compilercxx: msvc
38-
- name: MacOS ARM Clang
38+
- name: MacOS ARM GCC
3939
os: macos-latest
40-
compiler: clang
41-
compilercxx: clang++
40+
compiler: gcc-13
41+
compilercxx: g++-13
4242

4343
steps:
4444
- uses: actions/checkout@v4

.github/workflows/cmake-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ jobs:
4141
compilercxx: msvc
4242
cflags: ""
4343
cxxflags: ""
44-
- name: MacOS ARM Clang
44+
- name: MacOS ARM GCC
4545
os: macos-latest
46-
compiler: clang
47-
compilercxx: clang++
46+
compiler: gcc-13
47+
compilercxx: g++-13
4848
cflags: ""
4949
cxxflags: ""
5050

PhotoshopAPI/src/Core/FileIO/LengthMarkers.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,11 @@ namespace Impl
159159
// right offset.
160160
if (header.m_Version == Enum::Version::Psd)
161161
{
162-
WriteBinaryData<T::psd_t>(document, static_cast<T::psd_t>(0));
162+
WriteBinaryData<typename T::psd_t>(document, static_cast<typename T::psd_t>(0));
163163
}
164164
else
165165
{
166-
WriteBinaryData<T::psb_t>(document, static_cast<T::psb_t>(0));
166+
WriteBinaryData<typename T::psb_t>(document, static_cast<typename T::psb_t>(0));
167167
}
168168
}
169169

PhotoshopAPI/src/Core/TaggedBlocks/LinkedLayerTaggedBlock.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
#include "Core/FileIO/LengthMarkers.h"
44
#include "Util/StringUtil.h"
55

6+
#include <ctime>
7+
68
PSAPI_NAMESPACE_BEGIN
79

810
// ---------------------------------------------------------------------------------------------------------------------

PhotoshopAPI/src/Util/CoordinateUtil.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
#include "Macros.h"
44
#include "PhotoshopFile/FileHeader.h"
55

6+
#include <cmath>
7+
68
PSAPI_NAMESPACE_BEGIN
79

810

0 commit comments

Comments
 (0)