Cleanup and fix texture loading

1 files changed, 8 insertions, 6 deletions

diff --git a/tex.c b/tex.c
index 81e6d05..11c09f7 100644
--- a/tex.c
+++ b/tex.c
@@ -13,24 +13,26 @@ GLuint png2tex(FILE *f)
 {
 	png_image pi = { .version = PNG_IMAGE_VERSION };
 	unsigned char *data;
-	size_t size;
+	size_t stride, size;
 	GLuint id;
 
 	assert(f != NULL);
 
 	png_image_begin_read_from_stdio(&pi, f);
 	pi.format = PNG_FORMAT_RGB;
-	size = sizeof *data * 3 * pi.width * pi.height;
+	stride = sizeof *data * PNG_IMAGE_SAMPLE_CHANNELS(pi.format) * pi.width;
+	stride = (stride + 3) & ~(size_t)3;
+	size = stride * pi.height;
 	data = emalloc(size);
-	png_image_finish_read(&pi, NULL, data, size / pi.height, NULL);
+	png_image_finish_read(&pi, NULL, data, stride, NULL);
 
 	gl_tex_gen(1, &id);
 	gl_tex_bind(GL_TEXTURE_2D, id);
 	gl_tex_parami(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 	gl_tex_parami(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-	gl_tex_parami(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
-	gl_tex_parami(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
-	gl_tex_img2d(GL_TEXTURE_2D, 0, GL_RGB, pi.width, pi.height, 0, GL_RGB, GL_UNSIGNED_BYTE, data);
+	gl_tex_parami(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+	gl_tex_parami(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+	gl_tex_img2d(GL_TEXTURE_2D, 0, GL_SRGB, pi.width, pi.height, 0, GL_RGB, GL_UNSIGNED_BYTE, data);
 	gl_tex_genmip(GL_TEXTURE_2D);
 
 	free(data);