Skip to content

Commit 832fbe3

Browse files
committed
[共通] 細かい修正
1 parent dff7d38 commit 832fbe3

File tree

8 files changed

+23
-23
lines changed

8 files changed

+23
-23
lines changed

Siv3D/include/Siv3D/Math.hpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -244,21 +244,21 @@ namespace s3d
244244
//
245245
//////////////////////////////////////////////////
246246

247-
inline float Modf(float x, float& exp) noexcept;
247+
inline float Modf(float x, float& ip) noexcept;
248248

249-
inline double Modf(double x, double& exp) noexcept;
249+
inline double Modf(double x, double& ip) noexcept;
250250

251-
inline Float2 Modf(Float2 x, Float2& exp) noexcept;
251+
inline Float2 Modf(Float2 x, Float2& ip) noexcept;
252252

253-
inline Float3 Modf(Float3 x, Float3& exp) noexcept;
253+
inline Float3 Modf(Float3 x, Float3& ip) noexcept;
254254

255-
inline Float4 Modf(Float4 x, Float4& exp) noexcept;
255+
inline Float4 Modf(Float4 x, Float4& ip) noexcept;
256256

257-
inline Vec2 Modf(Vec2 x, Vec2& exp) noexcept;
257+
inline Vec2 Modf(Vec2 x, Vec2& ip) noexcept;
258258

259-
inline Vec3 Modf(Vec3 x, Vec3& exp) noexcept;
259+
inline Vec3 Modf(Vec3 x, Vec3& ip) noexcept;
260260

261-
inline Vec4 Modf(Vec4 x, Vec4& exp) noexcept;
261+
inline Vec4 Modf(Vec4 x, Vec4& ip) noexcept;
262262

263263
//////////////////////////////////////////////////
264264
//

Siv3D/include/Siv3D/MathParser.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ namespace s3d
6565
/// @param name 変数名
6666
/// @param value 変数へのポインタ
6767
/// @return 変数の登録に成功した場合 true, それ以外の場合は false
68-
bool setVaribale(StringView name, double* value);
68+
bool setVariable(StringView name, double* value);
6969

7070
/// @brief 関数を登録します。
7171
/// @param name 関数名

Siv3D/include/Siv3D/detail/ImageDecoder.ipp

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313

1414
namespace s3d
1515
{
16-
namespace ImageEncoder
16+
namespace ImageDecoder
1717
{
18-
template <class ImageEncoder>
18+
template <class ImageDecoder>
1919
bool Add()
2020
{
21-
return Add(std::make_unique<ImageEncoder>());
21+
return Add(std::make_unique<ImageDecoder>());
2222
}
2323
}
2424
}

Siv3D/include/Siv3D/detail/ImageEncoder.ipp

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313

1414
namespace s3d
1515
{
16-
namespace ImageDecoder
16+
namespace ImageEncoder
1717
{
18-
template <class ImageDecoder>
18+
template <class ImageEncoder>
1919
bool Add()
2020
{
21-
return Add(std::make_unique<ImageDecoder>());
21+
return Add(std::make_unique<ImageEncoder>());
2222
}
2323
}
2424
}

Siv3D/include/Siv3D/detail/Math.ipp

+4-4
Original file line numberDiff line numberDiff line change
@@ -307,14 +307,14 @@ namespace s3d
307307
//
308308
//////////////////////////////////////////////////
309309

310-
inline float Modf(float x, float& i) noexcept
310+
inline float Modf(float x, float& ip) noexcept
311311
{
312-
return std::modf(x, &i);
312+
return std::modf(x, &ip);
313313
}
314314

315-
inline double Modf(double x, double& i) noexcept
315+
inline double Modf(double x, double& ip) noexcept
316316
{
317-
return std::modf(x, &i);
317+
return std::modf(x, &ip);
318318
}
319319

320320
SIV3D_MATH_FUNCTION_XYREF(Modf)

Siv3D/src/Siv3D/MathParser/MathParserDetail.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ namespace s3d
5252
}
5353
}
5454

55-
bool MathParser::MathParserDetail::setVaribale(const StringView name, double* value)
55+
bool MathParser::MathParserDetail::setVariable(const StringView name, double* value)
5656
{
5757
m_errorMessage.clear();
5858

Siv3D/src/Siv3D/MathParser/MathParserDetail.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ namespace s3d
3838
bool setConstant(StringView name, double value);
3939

4040
[[nodiscard]]
41-
bool setVaribale(StringView name, double* value);
41+
bool setVariable(StringView name, double* value);
4242

4343
template <class Fty>
4444
[[nodiscard]]

Siv3D/src/Siv3D/MathParser/SivMathParser.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ namespace s3d
4646
return pImpl->setConstant(name, value);
4747
}
4848

49-
bool MathParser::setVaribale(const StringView name, double* value)
49+
bool MathParser::setVariable(const StringView name, double* value)
5050
{
51-
return pImpl->setVaribale(name, value);
51+
return pImpl->setVariable(name, value);
5252
}
5353

5454
bool MathParser::setFunction(const StringView name, Fty0 f)

0 commit comments

Comments
 (0)