ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 23:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1027 from Kelimion/png

Browse Source 
Replace `core:image`'s `sidecar` with explicit pointer and type
This commit is contained in:
Jeroen van Rijn
2021-06-21 16:41:38 +02:00
committed by GitHub
parent 18471f358e e036a321a0
commit 797c41950a
3 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/image/common.odin
+5 -2
View File
@@ -15,7 +15,9 @@ Image :: struct {
in our viewer, and can just test against nil. in our viewer, and can just test against nil.
*/ */
background: Maybe([3]u16), background: Maybe([3]u16),
sidecar: any,
metadata_ptr: rawptr,
metadata_type: typeid,
} }
/* /*
@@ -196,7 +198,8 @@ return_single_channel :: proc(img: ^Image, channel: Channel) -> (res: ^Image, ok
res.depth = img.depth; res.depth = img.depth;
res.pixels = t; res.pixels = t;
res.background = img.background; res.background = img.background;
res.sidecar = img.sidecar; res.metadata_ptr = img.metadata_ptr;
res.metadata_type = img.metadata_type;
return res, true; return res, true;
} }
core/image/png/example.odin
+3 -3
View File
@@ -14,7 +14,7 @@ import "core:os"
main :: proc() { main :: proc() {
file: string; file: string;
options := image.Options{}; options := image.Options{.return_metadata};
err: compress.Error; err: compress.Error;
img: ^image.Image; img: ^image.Image;
@@ -27,11 +27,11 @@ main :: proc() {
fmt.printf("Trying to read PNG file %v returned %v\n", file, err); fmt.printf("Trying to read PNG file %v returned %v\n", file, err);
} else { } else {
v: ^png.Info; v: ^png.Info;
ok: bool;
fmt.printf("Image: %vx%vx%v, %v-bit.\n", img.width, img.height, img.channels, img.depth); fmt.printf("Image: %vx%vx%v, %v-bit.\n", img.width, img.height, img.channels, img.depth);
if v, ok = img.sidecar.(^png.Info); ok { if img.metadata_ptr != nil && img.metadata_type == png.Info {
v = (^png.Info)(img.metadata_ptr);
// Handle ancillary chunks as you wish. // Handle ancillary chunks as you wish.
// We provide helper functions for a few types. // We provide helper functions for a few types.
for c in v.chunks { for c in v.chunks {
core/image/png/png.odin
+3 -6
View File
@@ -392,10 +392,7 @@ load_from_stream :: proc(stream: io.Stream, options := Options{}, allocator := c
img = new(Image); img = new(Image);
} }
info: ^Info; info := new(Info, context.allocator);
if img.sidecar == nil {
info = new(Info);
}
ctx := &compress.Context{ ctx := &compress.Context{
input = stream, input = stream,
@@ -417,7 +414,6 @@ load_from_stream :: proc(stream: io.Stream, options := Options{}, allocator := c
header: IHDR; header: IHDR;
img.sidecar = info;
info.chunks.allocator = context.temp_allocator; info.chunks.allocator = context.temp_allocator;
// State to ensure correct chunk ordering. // State to ensure correct chunk ordering.
@@ -659,7 +655,8 @@ load_from_stream :: proc(stream: io.Stream, options := Options{}, allocator := c
} }
if .return_header in options || .return_metadata in options { if .return_header in options || .return_metadata in options {
img.sidecar = info; img.metadata_ptr = info;
img.metadata_type = typeid_of(Info);
} }
if .do_not_decompress_image in options { if .do_not_decompress_image in options {
img.channels = final_image_channels; img.channels = final_image_channels;