From patchwork Mon Dec 17 16:10:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barker X-Patchwork-Id: 13627 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id E6E4D23E04 for ; Mon, 17 Dec 2012 16:10:18 +0000 (UTC) Received: from mail-ia0-f180.google.com (mail-ia0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 942AFA199FC for ; Mon, 17 Dec 2012 16:10:18 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id t4so5438304iag.11 for ; Mon, 17 Dec 2012 08:10:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:received-spf :content-type:mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state; bh=Cy+x/jKnCdunHw1KE0I1/Mv1PMMaMfXHDEf0Jz7Iv5w=; b=eqb3qfAPkZthZDt+3hED2pDZ7tzH10S9HJvjeuw2n/q2ADWimxh1roSykSNvD50HU4 B5GdvfmhzYFRQi+ze4i+Fxo+TiWIdBYmC/M5YXFmVYyLyDFyOVIVsg1LbxlJsNZH4b5i bP0cavkXjJ/QxU+ZH0lqf5gA0jGLLwgPwQnsWRbGlLjFrEab1yCGuuBeZ9k7T70Ow8Ht 4hQsF0b7uudG5ItAbpYI7Eqmkd6E8WA1SESP+CAV8On+hsVgTKsupd3VvK+MZWUeTqq8 HtO96xcMC2zs2vORyPxHGV4lYh8MeqpZZIFuPIU3OG0RR9kecEfpQbUhySIJkXS2BRTi 34cg== X-Received: by 10.50.213.69 with SMTP id nq5mr9472542igc.70.1355760618029; Mon, 17 Dec 2012 08:10:18 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp83257igt; Mon, 17 Dec 2012 08:10:17 -0800 (PST) Received: by 10.194.235.6 with SMTP id ui6mr18140965wjc.12.1355760616652; Mon, 17 Dec 2012 08:10:16 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id ck10si10245720wib.10.2012.12.17.08.10.16 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Dec 2012 08:10:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1TkdGi-0007Mp-44 for ; Mon, 17 Dec 2012 16:10:16 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 10114E29B6 for ; Mon, 17 Dec 2012 16:10:16 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: glmark2 X-Launchpad-Branch: ~glmark2-dev/glmark2/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 256 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 256: SceneShadow: Port potential memory leak fix from SceneRefract (detected in both Message-Id: <20121217161016.1552.69161.launchpad@ackee.canonical.com> Date: Mon, 17 Dec 2012 16:10:16 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="16372"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 62a9345a5569ed4e8130a1caccf52aca594a4124 X-Gm-Message-State: ALoCoQkun3es+nH2SXN5NqS0sa4J9FoLhfnCyIN9IT2LtAG3WvA/UE5S2t9tnJFeJ/Vwiz6+PuN9 ------------------------------------------------------------ revno: 256 committer: Jesse Barker branch nick: trunk timestamp: Mon 2012-12-17 08:08:05 -0800 message: SceneShadow: Port potential memory leak fix from SceneRefract (detected in both scenes during code review for that branch merge). modified: src/scene-shadow.cpp src/scene.h --- lp:glmark2 https://code.launchpad.net/~glmark2-dev/glmark2/trunk You are subscribed to branch lp:glmark2. To unsubscribe from this branch go to https://code.launchpad.net/~glmark2-dev/glmark2/trunk/+edit-subscription === modified file 'src/scene-shadow.cpp' --- src/scene-shadow.cpp 2012-10-22 21:43:11 +0000 +++ src/scene-shadow.cpp 2012-12-17 16:08:05 +0000 @@ -463,11 +463,6 @@ "false,true"); } -SceneShadow::~SceneShadow() -{ - delete priv_; -} - bool SceneShadow::supported(bool show_errors) { @@ -526,6 +521,7 @@ { // Add scene-specific teardown here priv_->teardown(); + delete priv_; Scene::teardown(); } === modified file 'src/scene.h' --- src/scene.h 2012-12-15 09:46:12 +0000 +++ src/scene.h 2012-12-17 16:08:05 +0000 @@ -563,7 +563,6 @@ ShadowPrivate* priv_; public: SceneShadow(Canvas& canvas); - ~SceneShadow(); bool supported(bool show_errors); bool load(); void unload();