Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

コピーが重いクラスに右辺値向けオーバーロードを追加 #1064

Merged
merged 2 commits into from
Aug 27, 2023
Merged

コピーが重いクラスに右辺値向けオーバーロードを追加 #1064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
478707f
コピーが重いクラスに右辺値向けオーバーロードを追加
Raclamusi Aug 20, 2023
a5f2e13
余分なセミコロンを削除
Raclamusi Aug 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions Siv3D/include/Siv3D/Array.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,13 @@ namespace s3d
/// @param index
/// @return
[[nodiscard]]
Array removed_at(size_t index) const;
Array removed_at(size_t index) const&;

/// @brief
/// @param index
/// @return
[[nodiscard]]
Array removed_at(size_t index) &&;

/// @brief 条件を満たす要素を配列から削除します。
/// @tparam Fty 条件を記述した関数の型
Expand Down Expand Up @@ -1049,7 +1055,12 @@ namespace s3d
/// @brief
/// @return
[[nodiscard]]
Array stable_uniqued() const;
Array stable_uniqued() const&;

/// @brief
/// @return
[[nodiscard]]
Array stable_uniqued() &&;

/// @brief
/// @return
Expand Down
125 changes: 100 additions & 25 deletions Siv3D/include/Siv3D/Image.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,96 +407,144 @@ namespace s3d
Image& negate();

[[nodiscard]]
Image negated() const;
Image negated() const&;

[[nodiscard]]
Image negated() &&;

/// @brief 画像をグレイスケール画像に変換します。
/// @return *this
Image& grayscale();

[[nodiscard]]
Image grayscaled() const;
Image grayscaled() const&;

[[nodiscard]]
Image grayscaled() &&;

/// @brief 画像をセピア画像に変換します。
/// @return *this
Image& sepia();

[[nodiscard]]
Image sepiaed() const;
Image sepiaed() const&;

[[nodiscard]]
Image sepiaed() &&;

Image& posterize(int32 level);

[[nodiscard]]
Image posterized(int32 level) const;
Image posterized(int32 level) const&;

[[nodiscard]]
Image posterized(int32 level) &&;

Image& brighten(int32 level);

[[nodiscard]]
Image brightened(int32 level) const;
Image brightened(int32 level) const&;

[[nodiscard]]
Image brightened(int32 level) &&;

/// @brief 画像を左右反転します。
/// @return *this
Image& mirror();

[[nodiscard]]
Image mirrored() const;
Image mirrored() const&;

[[nodiscard]]
Image mirrored() &&;

/// @brief 画像を上下反転します。
/// @return *this
Image& flip();

[[nodiscard]]
Image flipped() const;
Image flipped() const&;

[[nodiscard]]
Image flipped() &&;

/// @brief 画像を時計回りに 90° 回転します。
/// @return *this
Image& rotate90();

[[nodiscard]]
Image rotated90() const;
Image rotated90() const&;

[[nodiscard]]
Image rotated90() &&;

/// @brief 画像を時計回りに 180° 回転します。
/// @return *this
Image& rotate180();

[[nodiscard]]
Image rotated180() const;
Image rotated180() const&;

[[nodiscard]]
Image rotated180() &&;

/// @brief 画像を時計回りに 270° 回転します。
/// @return *this
Image& rotate270();

[[nodiscard]]
Image rotated270() const;
Image rotated270() const&;

[[nodiscard]]
Image rotated270() &&;

Image& gammaCorrect(double gamma);

[[nodiscard]]
Image gammaCorrected(double gamma) const;
Image gammaCorrected(double gamma) const&;

[[nodiscard]]
Image gammaCorrected(double gamma) &&;

Image& threshold(uint8 threshold, InvertColor invertColor = InvertColor::No);

[[nodiscard]]
Image thresholded(uint8 threshold, InvertColor invertColor = InvertColor::No) const;
Image thresholded(uint8 threshold, InvertColor invertColor = InvertColor::No) const&;

[[nodiscard]]
Image thresholded(uint8 threshold, InvertColor invertColor = InvertColor::No) &&;

Image& threshold_Otsu(InvertColor invertColor = InvertColor::No);

[[nodiscard]]
Image thresholded_Otsu(InvertColor invertColor = InvertColor::No) const;
Image thresholded_Otsu(InvertColor invertColor = InvertColor::No) const&;

[[nodiscard]]
Image thresholded_Otsu(InvertColor invertColor = InvertColor::No) &&;

Image& adaptiveThreshold(AdaptiveThresholdMethod method, int32 blockSize, double c, InvertColor invertColor = InvertColor::No);

[[nodiscard]]
Image adaptiveThresholded(AdaptiveThresholdMethod method, int32 blockSize, double c, InvertColor invertColor = InvertColor::No) const;
Image adaptiveThresholded(AdaptiveThresholdMethod method, int32 blockSize, double c, InvertColor invertColor = InvertColor::No) const&;

[[nodiscard]]
Image adaptiveThresholded(AdaptiveThresholdMethod method, int32 blockSize, double c, InvertColor invertColor = InvertColor::No) &&;

Image& mosaic(int32 size);

Image& mosaic(int32 horizontal, int32 vertical);

[[nodiscard]]
Image mosaiced(int32 size) const;
Image mosaiced(int32 size) const&;

[[nodiscard]]
Image mosaiced(int32 size) &&;

[[nodiscard]]
Image mosaiced(int32 horizontal, int32 vertical) const&;

[[nodiscard]]
Image mosaiced(int32 horizontal, int32 vertical) const;
Image mosaiced(int32 horizontal, int32 vertical) &&;

Image& spread(int32 size);

Expand All @@ -513,45 +561,72 @@ namespace s3d
Image& blur(int32 horizontal, int32 vertical, BorderType borderType = BorderType::Reflect_101);

[[nodiscard]]
Image blurred(int32 size, BorderType borderType = BorderType::Reflect_101) const;
Image blurred(int32 size, BorderType borderType = BorderType::Reflect_101) const&;

[[nodiscard]]
Image blurred(int32 horizontal, int32 vertical, BorderType borderType = BorderType::Reflect_101) const;
Image blurred(int32 size, BorderType borderType = BorderType::Reflect_101) &&;

[[nodiscard]]
Image blurred(int32 horizontal, int32 vertical, BorderType borderType = BorderType::Reflect_101) const&;

[[nodiscard]]
Image blurred(int32 horizontal, int32 vertical, BorderType borderType = BorderType::Reflect_101) &&;

Image& medianBlur(int32 apertureSize);

[[nodiscard]]
Image medianBlurred(int32 apertureSize) const;
Image medianBlurred(int32 apertureSize) const&;

[[nodiscard]]
Image medianBlurred(int32 apertureSize) &&;

Image& gaussianBlur(int32 size, BorderType borderType = BorderType::Reflect_101);

Image& gaussianBlur(int32 horizontal, int32 vertical, BorderType borderType = BorderType::Reflect_101);

[[nodiscard]]
Image gaussianBlurred(int32 size, BorderType borderType = BorderType::Reflect_101) const;
Image gaussianBlurred(int32 size, BorderType borderType = BorderType::Reflect_101) const&;

[[nodiscard]]
Image gaussianBlurred(int32 horizontal, int32 vertical, BorderType borderType = BorderType::Reflect_101) const;
Image gaussianBlurred(int32 size, BorderType borderType = BorderType::Reflect_101) &&;

[[nodiscard]]
Image gaussianBlurred(int32 horizontal, int32 vertical, BorderType borderType = BorderType::Reflect_101) const&;

[[nodiscard]]
Image gaussianBlurred(int32 horizontal, int32 vertical, BorderType borderType = BorderType::Reflect_101) &&;

Image& bilateralFilter(int32 d, double sigmaColor, double sigmaSpace, BorderType borderType = BorderType::Reflect_101);

[[nodiscard]]
Image bilateralFiltered(int32 d, double sigmaColor, double sigmaSpace, BorderType borderType = BorderType::Reflect_101) const;
Image bilateralFiltered(int32 d, double sigmaColor, double sigmaSpace, BorderType borderType = BorderType::Reflect_101) const&;

[[nodiscard]]
Image bilateralFiltered(int32 d, double sigmaColor, double sigmaSpace, BorderType borderType = BorderType::Reflect_101) &&;

Image& dilate(int32 iterations = 1);

[[nodiscard]]
Image dilated(int32 iterations = 1) const;
Image dilated(int32 iterations = 1) const&;

[[nodiscard]]
Image dilated(int32 iterations = 1) &&;

Image& erode(int32 iterations = 1);

[[nodiscard]]
Image eroded(int32 iterations = 1) const;
Image eroded(int32 iterations = 1) const&;

[[nodiscard]]
Image eroded(int32 iterations = 1) &&;

Image& floodFill(const Point& pos, const Color& color, FloodFillConnectivity connectivity = FloodFillConnectivity::Value4, int32 lowerDifference = 0, int32 upperDifference = 0);

[[nodiscard]]
Image floodFilled(const Point& pos, const Color& color, FloodFillConnectivity connectivity = FloodFillConnectivity::Value4, int32 lowerDifference = 0, int32 upperDifference = 0) const;
Image floodFilled(const Point& pos, const Color& color, FloodFillConnectivity connectivity = FloodFillConnectivity::Value4, int32 lowerDifference = 0, int32 upperDifference = 0) const&;

[[nodiscard]]
Image floodFilled(const Point& pos, const Color& color, FloodFillConnectivity connectivity = FloodFillConnectivity::Value4, int32 lowerDifference = 0, int32 upperDifference = 0) &&;

Image& scale(int32 width, int32 height, InterpolationAlgorithm interpolation = InterpolationAlgorithm::Auto);

Expand Down
47 changes: 38 additions & 9 deletions Siv3D/include/Siv3D/LineString.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,12 @@ namespace s3d
/// @brief 連続する線分の向きを反転した新しい LineString を返します。
/// @return 連続する線分の向きを反転した新しい LineString
[[nodiscard]]
LineString reversed() const;
LineString reversed() const&;

/// @brief 連続する線分の向きを反転した新しい LineString を返します。
/// @return 連続する線分の向きを反転した新しい LineString
[[nodiscard]]
LineString reversed() &&;

LineString& shuffle();

Expand Down Expand Up @@ -376,23 +381,38 @@ namespace s3d
Vec2 normalAtLine(size_t index, CloseRing closeRing = CloseRing::No) const;

[[nodiscard]]
LineString movedBy(double x, double y) const;
LineString movedBy(double x, double y) const&;

[[nodiscard]]
LineString movedBy(double x, double y) && noexcept;

[[nodiscard]]
LineString movedBy(Vec2 v) const&;

[[nodiscard]]
LineString movedBy(Vec2 v) const;
LineString movedBy(Vec2 v) && noexcept;

LineString& moveBy(double x, double y) noexcept;

LineString& moveBy(Vec2 v) noexcept;

[[nodiscard]]
LineString scaled(double s) const;
LineString scaled(double s) const&;

[[nodiscard]]
LineString scaled(double s) &&;

[[nodiscard]]
LineString scaled(double sx, double sy) const;
LineString scaled(double sx, double sy) const&;

[[nodiscard]]
LineString scaled(Vec2 s) const;
LineString scaled(double sx, double sy) &&;

[[nodiscard]]
LineString scaled(Vec2 s) const&;

[[nodiscard]]
LineString scaled(Vec2 s) &&;

LineString& scale(double s);

Expand All @@ -401,13 +421,22 @@ namespace s3d
LineString& scale(Vec2 s);

[[nodiscard]]
LineString scaledAt(Vec2 pos, double s) const;
LineString scaledAt(Vec2 pos, double s) const&;

[[nodiscard]]
LineString scaledAt(Vec2 pos, double s) &&;

[[nodiscard]]
LineString scaledAt(Vec2 pos, double sx, double sy) const&;

[[nodiscard]]
LineString scaledAt(Vec2 pos, double sx, double sy) &&;

[[nodiscard]]
LineString scaledAt(Vec2 pos, double sx, double sy) const;
LineString scaledAt(Vec2 pos, Vec2 s) const&;

[[nodiscard]]
LineString scaledAt(Vec2 pos, Vec2 s) const;
LineString scaledAt(Vec2 pos, Vec2 s) &&;

LineString& scaleAt(Vec2 pos, double s);

Expand Down
Loading