leonetienne/BmpPP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now throwing exceptions for channel-out-of-range in newer methods

Browse Source
This commit is contained in:
Leonetienne 2022-03-06 14:19:56 +01:00
parent 61c2808e2b
commit 046a694dc4
1 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Src/BMP.cpp
View File

@ -1,5 +1,6 @@
#include "BMP.h" #include "BMP.h"
#include <stdexcept> #include <stdexcept>
#include <algorithm>
#include "BmpWriter.h" #include "BmpWriter.h"
#include "BmpReader.h" #include "BmpReader.h"
@ -175,7 +176,21 @@ namespace Leonetienne::BmpPP {
return isInitialized; return isInitialized;
} }
std::vector<std::uint8_t> &BMP::GetPixelbuffer() {
CHECK_IF_INITIALIZED
return pixelBuffer;
}
const std::vector<std::uint8_t> &BMP::GetPixelbuffer() const {
CHECK_IF_INITIALIZED
return pixelBuffer;
}
bool BMP::operator==(const BMP &other) const { bool BMP::operator==(const BMP &other) const {
// Check initialization status
if (isInitialized != other.isInitialized)
return false;
// Check metadata // Check metadata
if (colormode != other.colormode) if (colormode != other.colormode)
return false; return false;
@ -195,6 +210,11 @@ namespace Leonetienne::BmpPP {
} }
void BMP::FillChannel(const size_t &channel, const std::uint8_t value) { void BMP::FillChannel(const size_t &channel, const std::uint8_t value) {
CHECK_IF_INITIALIZED
if (GetNumChannels() <= channel)
throw std::runtime_error("Channel index out of range!");
const std::size_t numChannels = GetNumChannels(); const std::size_t numChannels = GetNumChannels();
for (std::size_t i = 0; i < pixelBuffer.size(); i += numChannels) for (std::size_t i = 0; i < pixelBuffer.size(); i += numChannels)
@ -203,15 +223,23 @@ namespace Leonetienne::BmpPP {
return; return;
} }
std::vector<std::uint8_t> &BMP::GetPixelbuffer() { void BMP::SwapChannels(const size_t &channel1, const size_t &channel2) {
return pixelBuffer; CHECK_IF_INITIALIZED
}
const std::vector<std::uint8_t> &BMP::GetPixelbuffer() const { if ((GetNumChannels() <= channel1) || (GetNumChannels() <= channel2))
return pixelBuffer; throw std::runtime_error("Channel index out of range!");
const std::size_t numChannels = GetNumChannels();
for (std::size_t i = 0; i < pixelBuffer.size(); i += numChannels)
std::swap(pixelBuffer[i + channel1], pixelBuffer[i + channel2]);
return;
} }
BMP BMP::MirrorHorizontally() const { BMP BMP::MirrorHorizontally() const {
CHECK_IF_INITIALIZED
// Create a new image matching this's metadata // Create a new image matching this's metadata
BMP bmp(size, colormode); BMP bmp(size, colormode);
@ -239,6 +267,8 @@ namespace Leonetienne::BmpPP {
} }
BMP BMP::MirrorVertically() const { BMP BMP::MirrorVertically() const {
CHECK_IF_INITIALIZED
// Create a new image matching this's metadata // Create a new image matching this's metadata
BMP bmp(size, colormode); BMP bmp(size, colormode);