blob: de88b29a82aab704f35ea300058d97a62bfeeca5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
From 4e2066a7eb108503bfea2092672329e19ffbde49 Mon Sep 17 00:00:00 2001
From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
Date: Tue, 2 Jan 2024 21:09:04 +0300
Subject: [PATCH] Fix strict-aliasing warnings
---
src/dio/aseprite_decoder.cpp | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/dio/aseprite_decoder.cpp b/src/dio/aseprite_decoder.cpp
index e01fbba32..209a67307 100644
--- a/src/dio/aseprite_decoder.cpp
+++ b/src/dio/aseprite_decoder.cpp
@@ -28,10 +28,20 @@
#include "zlib.h"
#include <cstdio>
+#include <cstring>
#include <vector>
namespace dio {
+template <typename T>
+T
+copy_reinterpret_cast(const void* ptr)
+{
+ T tmp;
+ std::memcpy(&tmp, ptr, sizeof(T));
+ return tmp;
+}
+
bool AsepriteDecoder::decode()
{
bool ignore_old_color_chunks = false;
@@ -425,7 +435,7 @@ float AsepriteDecoder::readFloat()
// Little endian.
int v = ((b4 << 24) | (b3 << 16) | (b2 << 8) | b1);
- return *reinterpret_cast<float*>(&v);
+ return *copy_reinterpret_cast<float*>(&v);
}
double AsepriteDecoder::readDouble()
@@ -465,7 +475,7 @@ double AsepriteDecoder::readDouble()
((long long)b3 << 16) |
((long long)b2 << 8) |
(long long)b1);
- return *reinterpret_cast<double*>(&v);
+ return *copy_reinterpret_cast<double*>(&v);
}
doc::Palette* AsepriteDecoder::readColorChunk(doc::Palette* prevPal,
--
2.41.0
|
