(image.c) Cleanups

This commit is contained in:
twinaphex 2015-03-22 04:15:30 +01:00
parent 842d0aafa5
commit 326e7907ae

View File

@ -100,8 +100,8 @@ static bool rpng_image_load_argb_shift(const char *path,
static bool rpng_gx_convert_texture32(struct texture_image *image)
{
unsigned tmp_pitch, width2, i;
const uint16_t *src;
uint16_t *dst;
const uint16_t *src = NULL;
uint16_t *dst = NULL;
/* Memory allocation in libogc is extremely primitive so try
* to avoid gaps in memory when converting by copying over to
* a temporary buffer first, then converting over into
@ -119,9 +119,7 @@ static bool rpng_gx_convert_texture32(struct texture_image *image)
image->width &= ~3;
image->height &= ~3;
width2 = image->width << 1;
src = (uint16_t*)tmp;
dst = (uint16_t*)image->pixels;
@ -158,11 +156,8 @@ void texture_image_free(struct texture_image *img)
bool texture_image_load(struct texture_image *out_img, const char *path)
{
D3DXIMAGE_INFO m_imageInfo;
d3d_video_t *d3d = NULL;
driver_t *driver = driver_get_ptr();
d3d = (d3d_video_t*)driver->video_data;
d3d_video_t *d3d = (d3d_video_t*)driver->video_data;
out_img->vertex_buf = NULL;
out_img->pixels = d3d_texture_new(d3d->dev, path,