diff options
| author | B. Stack <bgstack15@gmail.com> | 2022-10-11 11:16:39 -0400 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2022-10-11 11:16:39 -0400 |
| commit | cab22f2dc3c5f41b5163f74cbb233e390edff6ff (patch) | |
| tree | a49cfd729d9793681a57fa6f7409b0f0848e9ede /wx+ | |
| parent | Merge branch 'b11.25' into 'master' (diff) | |
| download | FreeFileSync-cab22f2dc3c5f41b5163f74cbb233e390edff6ff.tar.gz FreeFileSync-cab22f2dc3c5f41b5163f74cbb233e390edff6ff.tar.bz2 FreeFileSync-cab22f2dc3c5f41b5163f74cbb233e390edff6ff.zip | |
add upstream 11.26
Diffstat (limited to 'wx+')
| -rw-r--r-- | wx+/graph.cpp | 2 | ||||
| -rw-r--r-- | wx+/image_resources.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/wx+/graph.cpp b/wx+/graph.cpp index f9094386..bee38e36 100644 --- a/wx+/graph.cpp +++ b/wx+/graph.cpp @@ -730,7 +730,7 @@ void Graph2D::render(wxDC& dc) const //unlike wxDC::DrawRectangle() which just widens inner area! wxDCPenChanger dummy (dc, wxPen(it->second.fillColor, 1 /*[!] width*/)); wxDCBrushChanger dummy2(dc, it->second.fillColor); - dc.DrawPolygon(static_cast<int>(points.size()), &points[0]); + dc.DrawPolygon(static_cast<int>(points.size()), points.data()); } //2. draw all currently set mouse selections (including active selection) diff --git a/wx+/image_resources.cpp b/wx+/image_resources.cpp index 58ae4d25..667b5912 100644 --- a/wx+/image_resources.cpp +++ b/wx+/image_resources.cpp @@ -35,8 +35,8 @@ ImageHolder xbrzScale(int width, int height, const unsigned char* imageRgb, cons //get rid of allocation and buffer std::vector<> at thread-level? => no discernable perf improvement std::vector<uint32_t> buf(hqWidth * hqHeight + width * height); - uint32_t* const argbSrc = &buf[0] + hqWidth * hqHeight; - uint32_t* const xbrTrg = &buf[0]; + uint32_t* const argbSrc = buf.data() + hqWidth * hqHeight; + uint32_t* const xbrTrg = buf.data(); //convert RGB (RGB byte order) to ARGB (BGRA byte order) { |