Skip to content

Commit 15a6f28

Browse files
committed
Automatic fixes of clang-tidy warnings: misc-unused-using-decls,modernize-use-auto,performance-inefficient-vector-operation,performance-move-const-arg,readability-container-size-empty,readability-redundant-member-init,performance-noexcept-swap,readability-redundant-inline-specifier,readability-container-data-pointer
1 parent e97a21d commit 15a6f28

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

include/libsiedler2/ColorBGRA.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ inline bool operator!=(const ColorBGRA& lhs, const ColorBGRA& rhs)
5353
return !(lhs == rhs);
5454
}
5555

56-
inline constexpr ColorBGRA::ColorBGRA(uint8_t b, uint8_t g, uint8_t r, uint8_t a) : value{b, g, r, a} {}
57-
inline constexpr ColorBGRA::ColorBGRA(ColorRGB clrRGB, uint8_t a) : ColorBGRA(clrRGB.b, clrRGB.g, clrRGB.r, a) {}
56+
constexpr ColorBGRA::ColorBGRA(uint8_t b, uint8_t g, uint8_t r, uint8_t a) : value{b, g, r, a} {}
57+
constexpr ColorBGRA::ColorBGRA(ColorRGB clrRGB, uint8_t a) : ColorBGRA(clrRGB.b, clrRGB.g, clrRGB.r, a) {}
5858
inline ColorBGRA::ColorBGRA(const void* bgraBuffer)
5959
{
6060
std::memcpy(value.data(), bgraBuffer, 4);

include/libsiedler2/PixelBuffer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ class PixelBuffer
2828
uint16_t getHeight() const { return height_; }
2929
uint32_t getSizeInBytes() const { return static_cast<uint32_t>(getNumPixels() * sizeof(T_Pixel)); }
3030
uint32_t getNumPixels() const { return static_cast<uint32_t>(pixels_.size()); }
31-
uint8_t* getPixelPtr() { return pixels_.empty() ? nullptr : reinterpret_cast<uint8_t*>(&pixels_[0]); }
31+
uint8_t* getPixelPtr() { return pixels_.empty() ? nullptr : reinterpret_cast<uint8_t*>(pixels_.data()); }
3232
const uint8_t* getPixelPtr() const
3333
{
34-
return pixels_.empty() ? nullptr : reinterpret_cast<const uint8_t*>(&pixels_[0]);
34+
return pixels_.empty() ? nullptr : reinterpret_cast<const uint8_t*>(pixels_.data());
3535
}
3636
std::vector<T_Pixel>& getPixels() { return pixels_; }
3737
const std::vector<T_Pixel>& getPixels() const { return pixels_; }

src/ArchivItem_Bitmap_Raw.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ int libsiedler2::baseArchivItem_Bitmap_Raw::load(std::istream& file, const Archi
6969
// Speicher anlegen
7070
if(length > 0)
7171
{
72-
int ec = create(&data[0], width, height, TextureFormat::Paletted, palette);
72+
int ec = create(data.data(), width, height, TextureFormat::Paletted, palette);
7373
if(ec)
7474
return ec;
7575
ec = convertFormat(outFormat);

src/ArchivItem_Sound_XMidi.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ int ArchivItem_Sound_XMidi::load(std::istream& file, uint32_t length)
117117
return ErrorCode::WRONG_FORMAT;
118118
tracklist[track_nr].getTimbres().resize(numTimbres);
119119
if(numTimbres > 0)
120-
fs.readRaw(&tracklist[track_nr].getTimbres()[0], numTimbres);
120+
fs.readRaw(tracklist[track_nr].getTimbres().data(), numTimbres);
121121
fs >> chunkId;
122122
}
123123
if(!isChunk(chunkId, "EVNT"))
@@ -177,7 +177,7 @@ int ArchivItem_Sound_XMidi::write(std::ostream& file) const
177177
fs.write("TIMB", 4);
178178
fs << uint32_t(track.getTimbres().size() * 2 + 2);
179179
fsLE << uint16_t(track.getTimbres().size());
180-
fs.writeRaw(&track.getTimbres()[0], track.getTimbres().size());
180+
fs.writeRaw(track.getTimbres().data(), track.getTimbres().size());
181181
}
182182
fs.write("EVNT", 4);
183183
fs << uint32_t(track.getData().size());

src/LoadBMP.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ static int read_palette(ArchivItem_BitmapBase& bitmap, T_FStream& bmpFs, const B
2929
if(numClrsUsed > 0)
3030
{
3131
std::array<ColorBGRA, 256> colors;
32-
if(!bmpFs.read(reinterpret_cast<char*>(&colors[0]), numClrsUsed * 4))
32+
if(!bmpFs.read(reinterpret_cast<char*>(colors.data()), numClrsUsed * 4))
3333
return ErrorCode::UNEXPECTED_EOF;
3434

3535
auto pal = getAllocator().create<ArchivItem_Palette>(BobType::Palette);
@@ -203,7 +203,7 @@ int loader::LoadBMP(const boost::filesystem::path& filepath, Archiv& image,
203203
return ErrorCode::UNEXPECTED_EOF;
204204
}
205205

206-
if(int ec = bitmap->create(bmih.width, bmih.height, &buffer[0], bmih.width, bmih.height, format))
206+
if(int ec = bitmap->create(bmih.width, bmih.height, buffer.data(), bmih.width, bmih.height, format))
207207
return ec;
208208
if(ArchivItem_BitmapBase::getWantedFormat(bitmap->getFormat()) != bitmap->getFormat())
209209
{

src/MIDI_Track.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ int MIDI_Track::read(std::istream& file, size_t length)
2323
return ErrorCode::NONE;
2424

2525
mid_data.resize(length);
26-
if(!file.read(reinterpret_cast<char*>(&mid_data[0]), length))
26+
if(!file.read(reinterpret_cast<char*>(mid_data.data()), length))
2727
return ErrorCode::UNEXPECTED_EOF;
2828
return ErrorCode::NONE;
2929
}
@@ -37,7 +37,7 @@ const uint8_t* MIDI_Track::getMid() const
3737
{
3838
if(mid_data.empty())
3939
return nullptr;
40-
return &mid_data[0];
40+
return mid_data.data();
4141
}
4242

4343
uint32_t MIDI_Track::getMidLength() const

0 commit comments

Comments
 (0)