ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-04 14:48:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change General_Error.OK to nil

Browse Source
This commit is contained in:
Jeroen van Rijn
2021-05-03 15:38:43 +02:00
parent ca0f36be42
commit 9a39ce6b75
8 changed files with 53 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/image/png/example.odin
+2 -2
View File
@@ -23,7 +23,7 @@ main :: proc() {
img, err = png.load(file, options);
defer png.destroy(img);
if err != png.E_General.OK {
if err != nil {
fmt.printf("Trying to read PNG file %v returned %v\n", file, err);
} else {
v: png.Info;
@@ -120,7 +120,7 @@ main :: proc() {
}
}
if err == E_General.OK && .do_not_decompress_image not_in options && .info not_in options {
if err == nil && .do_not_decompress_image not_in options && .info not_in options {
if ok := write_image_as_ppm("out.ppm", img); ok {
fmt.println("Saved decoded image.");
} else {
core/image/png/helpers.odin
+5 -5
View File
@@ -107,7 +107,7 @@ text :: proc(c: Chunk) -> (res: Text, ok: bool) {
buf: bytes.Buffer;
zlib_error := zlib.inflate_from_byte_array(fields[2], &buf);
defer bytes.buffer_destroy(&buf);
if zlib_error != E_General.OK {
if zlib_error != nil {
ok = false; return;
}
@@ -161,7 +161,7 @@ text :: proc(c: Chunk) -> (res: Text, ok: bool) {
buf: bytes.Buffer;
zlib_error := zlib.inflate_from_byte_array(rest, &buf);
defer bytes.buffer_destroy(&buf);
if zlib_error != E_General.OK {
if zlib_error != nil {
ok = false; return;
}
@@ -200,7 +200,7 @@ iccp :: proc(c: Chunk) -> (res: iCCP, ok: bool) {
// Set up ZLIB context and decompress iCCP payload
buf: bytes.Buffer;
zlib_error := zlib.inflate_from_byte_array(fields[2], &buf);
if zlib_error != E_General.OK {
if zlib_error != nil {
bytes.buffer_destroy(&buf);
ok = false; return;
}
@@ -498,7 +498,7 @@ when false {
err = zlib.write_zlib_stream_from_memory(&ctx);
b: []u8;
if err == E_General.OK {
if err == nil {
b = ctx.out_buf[:];
} else {
return err;
@@ -511,6 +511,6 @@ when false {
iend := make_chunk([]u8{}, .IEND);
write_chunk(fd, iend);
return E_General.OK;
return nil;
}
}
core/image/png/png.odin
+20 -20
View File
@@ -267,13 +267,13 @@ read_chunk :: proc(ctx: ^compress.Context) -> (Chunk, Error) {
if chunk.crc != u32be(computed_crc) {
return {}, E_General.Checksum_Failed;
}
return chunk, E_General.OK;
return chunk, nil;
}
read_header :: proc(ctx: ^compress.Context) -> (IHDR, Error) {
c, e := read_chunk(ctx);
if e != E_General.OK {
if e != nil {
return {}, e;
}
@@ -341,7 +341,7 @@ read_header :: proc(ctx: ^compress.Context) -> (IHDR, Error) {
return {}, E_PNG.Unknown_Color_Type;
}
return header, E_General.OK;
return header, nil;
}
chunk_type_to_name :: proc(type: ^Chunk_Type) -> string {
@@ -453,7 +453,7 @@ load_from_stream :: proc(stream: io.Stream, options := Options{}, allocator := c
seen_ihdr = true;
header, err = read_header(&ctx);
if err != E_General.OK {
if err != nil {
return img, err;
}
@@ -506,7 +506,7 @@ load_from_stream :: proc(stream: io.Stream, options := Options{}, allocator := c
}
c, err = read_chunk(&ctx);
if err != E_General.OK {
if err != nil {
return img, err;
}
@@ -527,7 +527,7 @@ load_from_stream :: proc(stream: io.Stream, options := Options{}, allocator := c
if .return_metadata not_in options && .do_not_decompress_image in options {
img.channels = final_image_channels;
img.sidecar = info;
return img, E_General.OK;
return img, nil;
}
// There must be at least 1 IDAT, contiguous if more.
if seen_idat {
@@ -541,7 +541,7 @@ load_from_stream :: proc(stream: io.Stream, options := Options{}, allocator := c
next := ch.type;
for next == .IDAT {
c, err = read_chunk(&ctx);
if err != E_General.OK {
if err != nil {
return img, err;
}
@@ -561,7 +561,7 @@ load_from_stream :: proc(stream: io.Stream, options := Options{}, allocator := c
seen_idat = true;
case .IEND:
c, err = read_chunk(&ctx);
if err != E_General.OK {
if err != nil {
return img, err;
}
seen_iend = true;
@@ -570,7 +570,7 @@ load_from_stream :: proc(stream: io.Stream, options := Options{}, allocator := c
// TODO: Make sure that 16-bit bKGD + tRNS chunks return u16 instead of u16be
c, err = read_chunk(&ctx);
if err != E_General.OK {
if err != nil {
return img, err;
}
seen_bkgd = true;
@@ -605,7 +605,7 @@ load_from_stream :: proc(stream: io.Stream, options := Options{}, allocator := c
}
case .tRNS:
c, err = read_chunk(&ctx);
if err != E_General.OK {
if err != nil {
return img, err;
}
@@ -647,7 +647,7 @@ load_from_stream :: proc(stream: io.Stream, options := Options{}, allocator := c
case:
// Unhandled type
c, err = read_chunk(&ctx);
if err != E_General.OK {
if err != nil {
return img, err;
}
if .return_metadata in options {
@@ -664,7 +664,7 @@ load_from_stream :: proc(stream: io.Stream, options := Options{}, allocator := c
}
if .do_not_decompress_image in options {
img.channels = final_image_channels;
return img, E_General.OK;
return img, nil;
}
if !seen_idat {
@@ -675,7 +675,7 @@ load_from_stream :: proc(stream: io.Stream, options := Options{}, allocator := c
zlib_error := zlib.inflate(idat, &buf);
defer bytes.buffer_destroy(&buf);
if zlib_error != E_General.OK {
if zlib_error != nil {
return {}, zlib_error;
} else {
/*
@@ -712,7 +712,7 @@ load_from_stream :: proc(stream: io.Stream, options := Options{}, allocator := c
as metadata, and set it instead to the raw number of channels.
*/
defilter_error := defilter(img, &buf, &header, options);
if defilter_error != E_General.OK {
if defilter_error != nil {
bytes.buffer_destroy(&img.pixels);
return {}, defilter_error;
}
@@ -727,10 +727,10 @@ load_from_stream :: proc(stream: io.Stream, options := Options{}, allocator := c
*/
if .Paletted in header.color_type && .do_not_expand_indexed in options {
return img, E_General.OK;
return img, nil;
}
if .Color not_in header.color_type && .do_not_expand_grayscale in options {
return img, E_General.OK;
return img, nil;
}
@@ -839,7 +839,7 @@ load_from_stream :: proc(stream: io.Stream, options := Options{}, allocator := c
// If we have 3 in and 3 out, or 4 in and 4 out without premultiplication...
if raw_image_channels == 4 && .alpha_premultiply not_in options && !seen_bkgd {
// Then we're done.
return img, E_General.OK;
return img, nil;
}
}
@@ -1036,7 +1036,7 @@ load_from_stream :: proc(stream: io.Stream, options := Options{}, allocator := c
// If we have 3 in and 3 out, or 4 in and 4 out without premultiplication...
if !premultiply {
// Then we're done.
return img, E_General.OK;
return img, nil;
}
}
@@ -1229,7 +1229,7 @@ load_from_stream :: proc(stream: io.Stream, options := Options{}, allocator := c
unreachable("We should never see bit depths other than 8, 16 and 'Paletted' here.");
}
return img, E_General.OK;
return img, nil;
}
@@ -1651,7 +1651,7 @@ defilter :: proc(img: ^Image, filter_bytes: ^bytes.Buffer, header: ^IHDR, option
}
}
return E_General.OK;
return nil;
}
load :: proc{load_from_file, load_from_slice, load_from_stream};