summaryrefslogtreecommitdiffstats
path: root/src/extension/internal
diff options
context:
space:
mode:
authorThomas Holder <thomas@thomas-holder.de>2019-08-23 15:25:01 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2019-08-23 17:38:10 +0000
commitac61104df7df1b452666a037aeac55d5b71da85d (patch)
tree6240a92eebb158c8785e15342a5db7c0ecf3d0a6 /src/extension/internal
parentUpdate of Czech translation (diff)
downloadinkscape-ac61104df7df1b452666a037aeac55d5b71da85d.tar.gz
inkscape-ac61104df7df1b452666a037aeac55d5b71da85d.zip
Eliminate clang warnings
-Winfinite-recursion -Wpessimizing-move -Wunused-label -Wunneeded-internal-declaration -Wself-assign-overloaded -Wunused-const-variable (some) -Wsometimes-uninitialized (some)
Diffstat (limited to 'src/extension/internal')
-rw-r--r--src/extension/internal/wmf-inout.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/extension/internal/wmf-inout.cpp b/src/extension/internal/wmf-inout.cpp
index 4a080da00..2c68076dc 100644
--- a/src/extension/internal/wmf-inout.cpp
+++ b/src/extension/internal/wmf-inout.cpp
@@ -1100,12 +1100,12 @@ Wmf::select_brush(PWMF_CALLBACK_DATA d, int index)
uint32_t tidx;
uint16_t Style;
uint16_t cUsage;
- const char *Bm16h; // Pointer to Bitmap16 header (px follows)
- const char *dib; // Pointer to DIB
+ const char *Bm16h = nullptr; // Pointer to Bitmap16 header (px follows)
+ const char *dib = nullptr; // Pointer to DIB
(void) U_WMRDIBCREATEPATTERNBRUSH_get(record, &Style, &cUsage, &Bm16h, &dib);
if(dib || Bm16h){
if(dib){ tidx = add_dib_image(d, dib, cUsage); }
- else if(Bm16h){
+ else {
U_BITMAP16 Bm16;
const char *px;
memcpy(&Bm16, Bm16h, U_SIZE_BITMAP16);