summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/rendutil.cpp
diff options
context:
space:
mode:
author hap <happppp@users.noreply.github.com>2016-03-28 01:00:55 +0200
committer hap <happppp@users.noreply.github.com>2016-03-28 01:01:12 +0200
commit4cd7523ec74d2b0cf5db48fd082c0aa670e5447c (patch)
tree5a3bdf1da8cd00e5d803a471f55fe066eff89eff /src/emu/rendutil.cpp
parent85bafafdeb881ba636b53aa7adae59c043093af9 (diff)
rendutil render_load_jpeg: removed unneeded check, deallocate bitmap on error
Diffstat (limited to 'src/emu/rendutil.cpp')
-rw-r--r--src/emu/rendutil.cpp13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/emu/rendutil.cpp b/src/emu/rendutil.cpp
index 3ec60609953..db8fa94230e 100644
--- a/src/emu/rendutil.cpp
+++ b/src/emu/rendutil.cpp
@@ -533,8 +533,6 @@ void render_load_jpeg(bitmap_argb32 &bitmap, emu_file &file, const char *dirname
// deallocate previous bitmap
bitmap.reset();
- bitmap_format format = bitmap.format();
-
// define file's full name
std::string fname;
@@ -584,21 +582,16 @@ void render_load_jpeg(bitmap_argb32 &bitmap, emu_file &file, const char *dirname
if (s == 1)
for (int i = 0; i < w; ++i)
- if (format == BITMAP_FORMAT_ARGB32)
- bitmap.pix32(j, i) = rgb_t(0xFF, buffer[0][i], buffer[0][i], buffer[0][i]);
- else
- bitmap.pix32(j, i) = rgb_t(buffer[0][i], buffer[0][i], buffer[0][i]);
+ bitmap.pix32(j, i) = rgb_t(0xFF, buffer[0][i], buffer[0][i], buffer[0][i]);
else if (s == 3)
for (int i = 0; i < w; ++i)
- if (format == BITMAP_FORMAT_ARGB32)
- bitmap.pix32(j, i) = rgb_t(0xFF, buffer[0][i * s], buffer[0][i * s + 1], buffer[0][i * s + 2]);
- else
- bitmap.pix32(j, i) = rgb_t(buffer[0][i * s], buffer[0][i * s + 1], buffer[0][i * s + 2]);
+ bitmap.pix32(j, i) = rgb_t(0xFF, buffer[0][i * s], buffer[0][i * s + 1], buffer[0][i * s + 2]);
else
{
osd_printf_error("Cannot read JPEG data from %s file.\n", fname.c_str());
+ bitmap.reset();
break;
}
}