diff --git a/include/zenkit-capi/Texture.h b/include/zenkit-capi/Texture.h index 5b83ae1..684376c 100644 --- a/include/zenkit-capi/Texture.h +++ b/include/zenkit-capi/Texture.h @@ -11,6 +11,7 @@ using ZkTexture = zenkit::Texture; using ZkTextureBuilder = zenkit::TextureBuilder; #else typedef struct ZkInternal_Texture ZkTexture; +typedef struct ZkInternal_TextureBuilder ZkTextureBuilder; #endif typedef enum { @@ -61,5 +62,5 @@ ZKC_API void ZkTexture_enumerateRgbaMipmaps(ZkTexture const* slf, ZkTextureMipma ZKC_API ZkTextureBuilder* ZkTextureBuilder_new(ZkSize width, ZkSize height); ZKC_API void ZkTextureBuilder_del(ZkTextureBuilder* slf); -ZKC_API bool ZkTextureBuilder_addMipmap(ZkTextureBuilder* slf, ZkByte* buf, ZkSize len, ZkTextureFormat fmt); +ZKC_API ZkBool ZkTextureBuilder_addMipmap(ZkTextureBuilder* slf, ZkByte* buf, ZkSize len, ZkTextureFormat fmt); ZKC_API ZkTexture* ZkTextureBuilder_build(ZkTextureBuilder* slf, ZkTextureFormat fmt); diff --git a/src/Texture.cc b/src/Texture.cc index fc313b2..d0d73ee 100644 --- a/src/Texture.cc +++ b/src/Texture.cc @@ -132,15 +132,14 @@ void ZkTexture_enumerateRgbaMipmaps(ZkTexture const* slf, ZkTextureMipmapEnumera ZkTextureBuilder* ZkTextureBuilder_new(ZkSize width, ZkSize height) { ZKC_TRACE_FN(); - return new ZkTextureBuilder {static_cast(width), static_cast(height)}; } void ZkTextureBuilder_del(ZkTextureBuilder* slf) { - delete[] slf; + delete slf; } -bool ZkTextureBuilder_addMipmap(ZkTextureBuilder* slf, ZkByte* buf, ZkSize len, ZkTextureFormat fmt) { +ZkBool ZkTextureBuilder_addMipmap(ZkTextureBuilder* slf, ZkByte* buf, ZkSize len, ZkTextureFormat fmt) { ZKC_TRACE_FN(); ZKC_CHECK_NULL(slf, buf);