From 43f2a7d979eac630309064e5de3af1f22ba168e9 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 22 Feb 2017 22:02:48 +0100 Subject: Better make the zero-initialization more explicit ...if initializing these members is necessary at all; a bit hard to tell from the code. Change-Id: I3ddb25c35f0d1b44a092bdb2cb0192ce619f947c --- cppcanvas/source/mtfrenderer/emfplus.cxx | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'cppcanvas/source') diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index bb8f0a84b8fb..97f6e01920eb 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -693,7 +693,12 @@ namespace cppcanvas case EmfPlusObjectTypeImage: { EMFPImage *image; - aObjects [index] = image = new EMFPImage (); + aObjects [index] = image = new EMFPImage; + image->type = 0; + image->width = 0; + image->height = 0; + image->stride = 0; + image->pixelFormat = 0; image->Read (rObjectStream, dataSize, bUseWholeStream); break; @@ -701,7 +706,10 @@ namespace cppcanvas case EmfPlusObjectTypeFont: { EMFPFont *font; - aObjects [index] = font = new EMFPFont (); + aObjects [index] = font = new EMFPFont; + font->emSize = 0; + font->sizeUnit = 0; + font->fontFlags = 0; font->Read (rObjectStream); break; -- cgit v1.2.3