Luna/lily_png
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Namespaced everything

Browse source
This commit is contained in:
Luna 2025-07-18 07:16:46 +02:00
parent c29922ce2a
commit 66ab20c0f0
9 changed files with 61 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

2
file_reader

@ -1 +1 @@
Subproject commit ec3d79677455c47c31f3244a763d53933da84eb8 Subproject commit 5cdd4f883523520c768a5a387d723a504b4922f8

4
src/filter.cpp
View file

@ -1,6 +1,6 @@
#include "filter.h" #include "filter.h"
void filter_scanline(unsigned char *scanline, unsigned char *previous_scanline, unsigned char *dest, metadata &meta, unsigned char filter_type) void lily_png::filter_scanline(unsigned char *scanline, unsigned char *previous_scanline, unsigned char *dest, metadata &meta, unsigned char filter_type)
{ {
size_t pixel_size = get_pixel_bit_size(meta); size_t pixel_size = get_pixel_bit_size(meta);
size_t pixel_size_bytes = (pixel_size + 7)/8; size_t pixel_size_bytes = (pixel_size + 7)/8;
@ -43,7 +43,7 @@ void filter_scanline(unsigned char *scanline, unsigned char *previous_scanline,
} }
} }
void filter(buffer<unsigned char> &data, buffer<unsigned char> &dest ,metadata &meta) void lily_png::filter(file_reader::buffer<unsigned char> &data, file_reader::buffer<unsigned char> &dest ,metadata &meta)
{ {
unsigned long index = 0; unsigned long index = 0;
unsigned long index_dest = 0; unsigned long index_dest = 0;

8
src/filter.h
View file

@ -1,6 +1,10 @@
#pragma once #pragma once
#include "utils.h" #include "utils.h"
#include <cmath>
void filter_scanline(unsigned char *scanline, unsigned char *previous_scanline, unsigned char *dest, metadata &meta, unsigned char filter_type); namespace lily_png
void filter(buffer<unsigned char> &data, buffer<unsigned char> &dest ,metadata &meta); {
void filter_scanline(unsigned char *scanline, unsigned char *previous_scanline, unsigned char *dest, metadata &meta, unsigned char filter_type);
void filter(file_reader::buffer<unsigned char> &data, file_reader::buffer<unsigned char> &dest ,metadata &meta);
}

36
src/lily_png.cpp
View file

@ -1,13 +1,13 @@
#include "lily_png.h" #include "lily_png.h"
std::vector<color> palette; std::vector<lily_png::color> palette;
bool palette_found = false; bool palette_found = false;
static void read_raw_data(const std::string &file_path, buffer<unsigned char> &data, metadata &meta) static void read_raw_data(const std::string &file_path, file_reader::buffer<unsigned char> &data, lily_png::metadata &meta)
{ {
std::println("Zlib version is {}", zlibVersion()); std::println("Zlib version is {}", zlibVersion());
unsigned char magic[9] = {137, 80, 78, 71, 13, 10, 26, 10}; unsigned char magic[9] = {137, 80, 78, 71, 13, 10, 26, 10};
file_reader reader(file_path); file_reader::file_reader reader(file_path);
char file_magic[9] = {0}; char file_magic[9] = {0};
reader.read_buffer(file_magic, 8); reader.read_buffer(file_magic, 8);
if (memcmp(magic, file_magic, 8) != 0) if (memcmp(magic, file_magic, 8) != 0)
@ -15,13 +15,13 @@ static void read_raw_data(const std::string &file_path, buffer<unsigned char> &d
std::println("File is not a png!"); std::println("File is not a png!");
return ; return ;
} }
buffer<unsigned char> raw_dat{}; file_reader::buffer<unsigned char> raw_dat{};
while (true) while (true)
{ {
std::tuple<unsigned int, buffer<char>> chunk_header; std::tuple<unsigned int, file_reader::buffer<char>> chunk_header;
std::get<1>(chunk_header).size = 4; std::get<1>(chunk_header).size = 4;
auto ret = reader.read_from_tuple(chunk_header); auto ret = reader.read_from_tuple(chunk_header);
if (ret.second == READ_FILE_ENDED || ret.second == READ_INCOMPLETE) if (ret.second == file_reader::READ_FILE_ENDED || ret.second == file_reader::READ_INCOMPLETE)
{ {
std::println("Chunk incomplete!"); std::println("Chunk incomplete!");
return ; return ;
@ -29,12 +29,12 @@ static void read_raw_data(const std::string &file_path, buffer<unsigned char> &d
unsigned int size = std::get<0>(chunk_header); unsigned int size = std::get<0>(chunk_header);
//std::println("Chunk type {} Size {}", std::get<1>(chunk_header).data, std::get<0>(chunk_header)); //std::println("Chunk type {} Size {}", std::get<1>(chunk_header).data, std::get<0>(chunk_header));
buffer<unsigned char> raw_data{}; file_reader::buffer<unsigned char> raw_data{};
raw_data.size = std::get<0>(chunk_header); raw_data.size = std::get<0>(chunk_header);
std::tuple<buffer<char>, unsigned> dat; std::tuple<file_reader::buffer<char>, unsigned> dat;
std::get<0>(dat).size = std::get<0>(chunk_header); std::get<0>(dat).size = std::get<0>(chunk_header);
ret = reader.read_from_tuple(dat); ret = reader.read_from_tuple(dat);
if (ret.second == READ_FILE_ENDED || ret.second == READ_INCOMPLETE) if (ret.second == file_reader::READ_FILE_ENDED || ret.second == file_reader::READ_INCOMPLETE)
{ {
std::println("Chunk incomplete!"); std::println("Chunk incomplete!");
return ; return ;
@ -51,7 +51,7 @@ static void read_raw_data(const std::string &file_path, buffer<unsigned char> &d
} }
else if (strncmp(std::get<1>(chunk_header).data, "IHDR", 4) == 0) else if (strncmp(std::get<1>(chunk_header).data, "IHDR", 4) == 0)
{ {
meta = parse_metadata(std::get<0>(dat)); meta = lily_png::parse_metadata(std::get<0>(dat));
} }
else if (strncmp(std::get<1>(chunk_header).data, "PLTE", 4) == 0) else if (strncmp(std::get<1>(chunk_header).data, "PLTE", 4) == 0)
{ {
@ -63,7 +63,7 @@ static void read_raw_data(const std::string &file_path, buffer<unsigned char> &d
} }
for (int i = 0; i < size; i += 3) for (int i = 0; i < size; i += 3)
{ {
color tmp_color; lily_png::color tmp_color;
tmp_color.r = std::get<0>(dat).data[i]; tmp_color.r = std::get<0>(dat).data[i];
tmp_color.g = std::get<0>(dat).data[i + 1]; tmp_color.g = std::get<0>(dat).data[i + 1];
tmp_color.b = std::get<0>(dat).data[i + 2]; tmp_color.b = std::get<0>(dat).data[i + 2];
@ -85,7 +85,7 @@ static void read_raw_data(const std::string &file_path, buffer<unsigned char> &d
} }
static void apply_palette_scanline(unsigned char *scanline, unsigned char *dest, metadata &meta) static void apply_palette_scanline(unsigned char *scanline, unsigned char *dest, lily_png::metadata &meta)
{ {
size_t pixel_size = get_pixel_bit_size(meta); size_t pixel_size = get_pixel_bit_size(meta);
size_t pixel_size_bytes = (pixel_size + 7)/8; size_t pixel_size_bytes = (pixel_size + 7)/8;
@ -93,18 +93,18 @@ static void apply_palette_scanline(unsigned char *scanline, unsigned char *dest,
unsigned long dest_index = 0; unsigned long dest_index = 0;
for (int i = 0; i < scanline_size; i++) for (int i = 0; i < scanline_size; i++)
{ {
color tmp_color = palette[scanline[i]]; lily_png::color tmp_color = palette[scanline[i]];
dest[dest_index] = tmp_color.r; dest[dest_index] = tmp_color.r;
dest[dest_index++] = tmp_color.g; dest[dest_index++] = tmp_color.g;
dest[dest_index++] = tmp_color.b; dest[dest_index++] = tmp_color.b;
} }
} }
static void apply_palette(buffer<unsigned char> &data, buffer<unsigned char> &dest, metadata &meta) static void apply_palette(file_reader::buffer<unsigned char> &data, file_reader::buffer<unsigned char> &dest, lily_png::metadata &meta)
{ {
unsigned long index = 0; unsigned long index = 0;
unsigned long index_dest = 0; unsigned long index_dest = 0;
size_t pixel_size = get_pixel_bit_size(meta); size_t pixel_size = lily_png::get_pixel_bit_size(meta);
size_t pixel_size_bytes = (pixel_size + 7)/8; size_t pixel_size_bytes = (pixel_size + 7)/8;
size_t scanline_size = (meta.width * pixel_size + 7)/8; size_t scanline_size = (meta.width * pixel_size + 7)/8;
unsigned long scanlines = 0; unsigned long scanlines = 0;
@ -120,14 +120,14 @@ static void apply_palette(buffer<unsigned char> &data, buffer<unsigned char> &de
} }
} }
void read_png(const std::string &file_path, buffer<unsigned char> &data) void lily_png::read_png(const std::string &file_path, file_reader::buffer<unsigned char> &data)
{ {
buffer<unsigned char> tmp_data{}; file_reader::buffer<unsigned char> tmp_data{};
metadata meta{0}; metadata meta{0};
read_raw_data(file_path, tmp_data, meta); read_raw_data(file_path, tmp_data, meta);
if (palette_found == true) if (palette_found == true)
{ {
buffer<unsigned char> dest_palette{}; file_reader::buffer<unsigned char> dest_palette{};
apply_palette(tmp_data, dest_palette, meta); apply_palette(tmp_data, dest_palette, meta);
tmp_data = dest_palette; tmp_data = dest_palette;
} }

16
src/lily_png.h
View file

@ -7,11 +7,15 @@
#include "filter.h" #include "filter.h"
#include <zlib.h> #include <zlib.h>
struct color namespace lily_png
{ {
unsigned char r = 0; struct color
unsigned char g = 0; {
unsigned char b = 0; unsigned char r = 0;
}; unsigned char g = 0;
unsigned char b = 0;
};
void read_png(const std::string &file_path, buffer<unsigned char> &data);
void read_png(const std::string &file_path, file_reader::buffer<unsigned char> &data);
}

5
src/metadata.cpp
View file

@ -1,11 +1,10 @@
#include "metadata.h" #include "metadata.h"
lily_png::metadata lily_png::parse_metadata(file_reader::buffer<char> &data)
metadata parse_metadata(buffer<char> &data)
{ {
std::tuple<unsigned int, unsigned int, char, char, char, char, char> meta; std::tuple<unsigned int, unsigned int, char, char, char, char, char> meta;
constexpr std::size_t size = std::tuple_size_v<decltype(meta)>; constexpr std::size_t size = std::tuple_size_v<decltype(meta)>;
parsing_buffer par_buf(data); file_reader::parsing_buffer par_buf(data);
par_buf.point = par_buf.buf.data; par_buf.point = par_buf.buf.data;
par_buf.consumed_size = 0; par_buf.consumed_size = 0;
read_comp(size, par_buf, meta); read_comp(size, par_buf, meta);

23
src/metadata.h
View file

@ -1,15 +1,18 @@
#pragma once #pragma once
#include "../file_reader/src/file_read.h" #include "../file_reader/src/file_read.h"
struct metadata namespace lily_png
{ {
unsigned int width; struct metadata
unsigned int height; {
char bit_depth; unsigned int width;
char color_type; unsigned int height;
char compression; char bit_depth;
char filter; char color_type;
char interface; char compression;
}; char filter;
char interface;
};
metadata parse_metadata(buffer<char> &data); metadata parse_metadata(file_reader::buffer<char> &data);
}

6
src/utils.cpp
View file

@ -1,7 +1,7 @@
#include "utils.h" #include "utils.h"
size_t get_pixel_bit_size(const metadata &meta) size_t lily_png::get_pixel_bit_size(const metadata &meta)
{ {
size_t ret = 0; size_t ret = 0;
switch (meta.color_type) switch (meta.color_type)
@ -52,7 +52,7 @@ size_t get_pixel_bit_size(const metadata &meta)
return ret; return ret;
} }
size_t get_uncompressed_size(const metadata meta) size_t lily_png::get_uncompressed_size(const metadata meta)
{ {
size_t ret = (meta.width * get_pixel_bit_size(meta) + 7)/8; //ceil() but for bytes size_t ret = (meta.width * get_pixel_bit_size(meta) + 7)/8; //ceil() but for bytes
ret = (ret + 1) * meta.height; ret = (ret + 1) * meta.height;
@ -60,7 +60,7 @@ size_t get_uncompressed_size(const metadata meta)
return ret; return ret;
} }
int paeth_predict(int a, int b, int c) int lily_png::paeth_predict(int a, int b, int c)
{ {
int pred = a+b-c; int pred = a+b-c;
int pred1 = abs(pred - a); int pred1 = abs(pred - a);

9
src/utils.h
View file

@ -1,6 +1,9 @@
#pragma once #pragma once
#include "metadata.h" #include "metadata.h"
size_t get_pixel_bit_size(const metadata &meta); namespace lily_png
size_t get_uncompressed_size(const metadata meta); {
int paeth_predict(int a, int b, int c); size_t get_pixel_bit_size(const metadata &meta);
size_t get_uncompressed_size(const metadata meta);
int paeth_predict(int a, int b, int c);
}