From 171b8b613f840ec55eed07c6e5e69cf3ab6c5518 Mon Sep 17 00:00:00 2001 From: Ingo Date: Mon, 2 Dec 2013 22:42:57 +0100 Subject: [PATCH] Fixes another two bugs detected by cppcheck, no Issue --- rtengine/rawimage.cc | 2 +- rtgui/bqentryupdater.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rtengine/rawimage.cc b/rtengine/rawimage.cc index 22c3f7a12..393ca4a6e 100755 --- a/rtengine/rawimage.cc +++ b/rtengine/rawimage.cc @@ -499,7 +499,7 @@ DCraw::dcraw_coeff_overrides(const char make[], const char model[], const int is *black_level = -1; *white_level = -1; - memset(trans, 0, sizeof(trans)); + memset(trans, 0, sizeof(*trans)*12); // indicate that DCRAW wants these from constants (rather than having loaded these from RAW file // note: this is simplified so far, in some cases dcraw calls this when it has say the black level diff --git a/rtgui/bqentryupdater.cc b/rtgui/bqentryupdater.cc index 95a9be7ca..8e9e271e8 100644 --- a/rtgui/bqentryupdater.cc +++ b/rtgui/bqentryupdater.cc @@ -151,7 +151,7 @@ void BatchQueueEntryUpdater::terminate () { if (!stopped) { // Yield to currently running thread and wait till it's finished - GThreadUnLock(); + GThreadUnLock lock; tostop = true; Glib::Thread::self()->yield(); if (!stopped) thread->join ();