haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix warnings in rectpack2D.

This commit is contained in:
Alex 2022-09-27 16:26:00 +03:00 committed by Jon Evans
parent 120da60824
commit ec6cb49570
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
thirdparty/rectpack2d/rectpack2d/best_bin_finder.h vendored
View File

@ -167,12 +167,12 @@ namespace rectpack2D {
) { ) {
const auto try_pack = [&]( const auto try_pack = [&](
const bin_dimension tried_dimension, const bin_dimension tried_dimension,
const rect_wh starting_bin const rect_wh a_starting_bin
) { ) {
return best_packing_for_ordering_impl( return best_packing_for_ordering_impl(
root, root,
std::forward<O>(ordering), std::forward<O>(ordering),
starting_bin, a_starting_bin,
discard_step, discard_step,
tried_dimension tried_dimension
); );
@ -187,9 +187,9 @@ namespace rectpack2D {
auto best_bin = std::get<rect_wh>(best_result); auto best_bin = std::get<rect_wh>(best_result);
auto trial = [&](const bin_dimension tried_dimension) { auto trial = [&](const bin_dimension tried_dimension) {
const auto trial = try_pack(tried_dimension, best_bin); const auto l_trial = try_pack(tried_dimension, best_bin);
if (const auto better = std::get_if<rect_wh>(&trial)) { if (const auto better = std::get_if<rect_wh>(&l_trial)) {
best_bin = *better; best_bin = *better;
} }
}; };

6
thirdparty/rectpack2d/rectpack2d/rect_structs.h vendored
View File

@ -6,7 +6,7 @@ namespace rectpack2D {
struct rect_wh { struct rect_wh {
rect_wh() : w(0), h(0) {} rect_wh() : w(0), h(0) {}
rect_wh(const int w, const int h) : w(w), h(h) {} rect_wh(const int w_, const int h_) : w(w_), h(h_) {}
int w; int w;
int h; int h;
@ -45,7 +45,7 @@ namespace rectpack2D {
int h; int h;
rect_xywh() : x(0), y(0), w(0), h(0) {} rect_xywh() : x(0), y(0), w(0), h(0) {}
rect_xywh(const int x, const int y, const int w, const int h) : x(x), y(y), w(w), h(h) {} rect_xywh(const int x_, const int y_, const int w_, const int h_) : x(x_), y(y_), w(w_), h(h_) {}
int area() const { return w * h; } int area() const { return w * h; }
int perimeter() const { return 2 * w + 2 * h; } int perimeter() const { return 2 * w + 2 * h; }
@ -63,7 +63,7 @@ namespace rectpack2D {
bool flipped; bool flipped;
rect_xywhf() : x(0), y(0), w(0), h(0), flipped(false) {} rect_xywhf() : x(0), y(0), w(0), h(0), flipped(false) {}
rect_xywhf(const int x, const int y, const int w, const int h, const bool flipped) : x(x), y(y), w(flipped ? h : w), h(flipped ? w : h), flipped(flipped) {} rect_xywhf(const int x_, const int y_, const int w_, const int h_, const bool aFlipped) : x(x_), y(y_), w(aFlipped ? h_ : w_), h(aFlipped ? w_ : h_), flipped(aFlipped) {}
rect_xywhf(const rect_xywh& b) : rect_xywhf(b.x, b.y, b.w, b.h, false) {} rect_xywhf(const rect_xywh& b) : rect_xywhf(b.x, b.y, b.w, b.h, false) {}
int area() const { return w * h; } int area() const { return w * h; }