From 9b96cf2bdee856d41910ff0869c8521e430ff1e5 Mon Sep 17 00:00:00 2001 From: Ian Gulliver Date: Sun, 6 Aug 2017 19:00:45 +0000 Subject: [PATCH] Style --- piphoto.cc | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/piphoto.cc b/piphoto.cc index 1addbab..d6895dd 100644 --- a/piphoto.cc +++ b/piphoto.cc @@ -192,21 +192,21 @@ class PiRaw { std::unique_ptr> image_; }; -typedef PiRaw<3280,2464,10,16,2> PiRaw2; +typedef PiRaw<3280, 2464, 10, 16, 2> PiRaw2; template -PiRaw::PiRaw(std::unique_ptr> image) +PiRaw::PiRaw(std::unique_ptr> image) : image_(std::move(image)) {} template -PiRaw PiRaw::FromJpeg(const std::string_view& jpeg) { +PiRaw PiRaw::FromJpeg(const std::string_view& jpeg) { auto container_len = GetRawBytes() + kJpegHeaderBytes; assert(jpeg.substr(jpeg.size() - container_len, 4) == kJpegHeaderMagic); return FromRaw(jpeg.substr(jpeg.size() - GetRawBytes(), GetRawBytes())); } template -PiRaw PiRaw::FromRaw(const std::string_view& raw) { +PiRaw PiRaw::FromRaw(const std::string_view& raw) { static_assert(X % 2 == 0); static_assert(Y % 2 == 0); static_assert(kPixelsPerChunk == 4); @@ -223,36 +223,36 @@ PiRaw PiRaw::FromRaw(const std::string_view& raw) { image->at(out_y).at(out_x + 1) = CombineRaw(chunk1.at(2), chunk1.at(3), chunk2.at(2), chunk2.at(3)); } } - return PiRaw(std::move(image)); + return PiRaw(std::move(image)); } template -constexpr uint32_t PiRaw::GetRawBytes() { +constexpr uint32_t PiRaw::GetRawBytes() { return GetRowBytes() * GetNumRows(); } template -constexpr uint32_t PiRaw::GetRowBytes() { +constexpr uint32_t PiRaw::GetRowBytes() { return Align(Align(X + P) * D / kBitsPerByte); } template -constexpr uint32_t PiRaw::GetNumRows() { +constexpr uint32_t PiRaw::GetNumRows() { return Align(Y + P); } template -constexpr uint32_t PiRaw::GetChunkBytes() { +constexpr uint32_t PiRaw::GetChunkBytes() { return D * kPixelsPerChunk / kBitsPerByte; } template -constexpr uint32_t PiRaw::Align(uint32_t val) { +constexpr uint32_t PiRaw::Align(uint32_t val) { return (~(A - 1)) & ((val) + (A - 1)); } template -typename PiRaw::Chunk PiRaw::GetChunk(const std::string_view& raw, const uint32_t x_chunk, const uint32_t y) { +typename PiRaw::Chunk PiRaw::GetChunk(const std::string_view& raw, const uint32_t x_chunk, const uint32_t y) { // Function is bit depth & layout specific static_assert(D == 10); @@ -272,7 +272,7 @@ typename PiRaw::Chunk PiRaw::GetChunk(const std::string_vi } template -Color PiRaw::CombineRaw(uint32_t y0x0, uint32_t y0x1, uint32_t y1x0, uint32_t y1x1) { +Color PiRaw::CombineRaw(uint32_t y0x0, uint32_t y0x1, uint32_t y1x0, uint32_t y1x1) { // Function is bit layout specific Color ret; ret.r = y1x1; @@ -287,7 +287,7 @@ static void WriteCallback(png_structp png_ptr, png_bytep data, png_size_t length } template -std::string PiRaw::ToPng() { +std::string PiRaw::ToPng() { std::string ret; auto png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); @@ -319,12 +319,12 @@ std::string PiRaw::ToPng() { } template -Image* PiRaw::GetImage() { +Image* PiRaw::GetImage() { return image_.get(); } template -const Image& PiRaw::GetImage() const { +const Image& PiRaw::GetImage() const { return *image_; }