mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-04 08:46:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace use of new with make_unique

Browse Source
This commit is contained in:
Martín Capello 2022-12-29 10:06:21 -03:00
parent 6c886cfa19
commit 03f0c7ff08
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/dio/aseprite_decoder.cpp
View File

@ -59,12 +59,12 @@ bool AsepriteDecoder::decode()
// Create the new sprite // Create the new sprite
std::unique_ptr<doc::Sprite> sprite( std::unique_ptr<doc::Sprite> sprite(
new doc::Sprite(doc::ImageSpec(header.depth == 32 ? doc::ColorMode::RGB: std::make_unique<doc::Sprite>(doc::ImageSpec(header.depth == 32 ? doc::ColorMode::RGB:
header.depth == 16 ? doc::ColorMode::GRAYSCALE: header.depth == 16 ? doc::ColorMode::GRAYSCALE:
doc::ColorMode::INDEXED, doc::ColorMode::INDEXED,
header.width, header.width,
header.height), header.height),
header.ncolors)); header.ncolors));
// Set frames and speed // Set frames and speed
sprite->setTotalFrames(doc::frame_t(header.frames)); sprite->setTotalFrames(doc::frame_t(header.frames));
@ -784,7 +784,7 @@ doc::Cel* AsepriteDecoder::readCelChunk(doc::Sprite* sprite,
break; break;
} }
cel.reset(new doc::Cel(frame, image)); cel = std::make_unique<doc::Cel>(frame, image);
cel->setPosition(x, y); cel->setPosition(x, y);
cel->setOpacity(opacity); cel->setOpacity(opacity);
} }
@ -825,7 +825,7 @@ doc::Cel* AsepriteDecoder::readCelChunk(doc::Sprite* sprite,
doc::ImageRef image(doc::Image::create(pixelFormat, w, h)); doc::ImageRef image(doc::Image::create(pixelFormat, w, h));
read_compressed_image(f(), delegate(), image.get(), header, chunk_end); read_compressed_image(f(), delegate(), image.get(), header, chunk_end);
cel.reset(new doc::Cel(frame, image)); cel = std::make_unique<doc::Cel>(frame, image);
cel->setPosition(x, y); cel->setPosition(x, y);
cel->setOpacity(opacity); cel->setOpacity(opacity);
} }
@ -870,7 +870,7 @@ doc::Cel* AsepriteDecoder::readCelChunk(doc::Sprite* sprite,
return doc::tile_geti(tile) >= tilesetSize ? doc::notile : tile; return doc::tile_geti(tile) >= tilesetSize ? doc::notile : tile;
}); });
cel.reset(new doc::Cel(frame, image)); cel = std::make_unique<doc::Cel>(frame, image);
cel->setPosition(x, y); cel->setPosition(x, y);
cel->setOpacity(opacity); cel->setOpacity(opacity);
} }
@ -1075,7 +1075,7 @@ doc::Slice* AsepriteDecoder::readSliceChunk(doc::Slices& slices)
read32(); // 4 bytes reserved read32(); // 4 bytes reserved
std::string name = readString(); // Name std::string name = readString(); // Name
std::unique_ptr<doc::Slice> slice(new doc::Slice); std::unique_ptr<doc::Slice> slice(std::make_unique<doc::Slice>());
slice->setName(name); slice->setName(name);
// For each key // For each key