| Message ID | 20130417182022.8491.92325.launchpad@ackee.canonical.com |
|---|---|
| State | Accepted |
| Headers | show
Return-Path: <patchwork-forward+bncBC73BIMB7QIBB2OPXOFQKGQEVALPIOA@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8C7BE23911 for <linaro@patches.linaro.org>; Wed, 17 Apr 2013 18:21:02 +0000 (UTC) Received: by mail-lb0-f197.google.com with SMTP id z13sf2782004lbh.0 for <linaro@patches.linaro.org>; Wed, 17 Apr 2013 11:20:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-beenthere:x-received:received-spf:x-received :x-forwarded-to:x-forwarded-for:delivered-to:x-received:received-spf :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:x-original-sender :x-original-authentication-results:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=Zf+hbIaJQQA2Q6IepqpWSK6dQIzsLnOO/0GYub7/ZIs=; b=CXCe7ekQ+TSGyhlmdybWqRHdGP7sWwZSV284v2QDDGxoqgOiITzAyq15cja51SuOxN 9K/7uotx3ILlLbmkb7ifT6AleXewCsiFy2IVqbjmoE/DQQL7JFNMGhHJeb3iq7X21ujA ZRyzMy/TPzVrqMeuigBH84nMDBLWx/LjUHqCKrD6x/Mql35gB0xUSAz5RNyCKeYpe5gX v6GFgOKBPODDNUdiCp/Pd/VY7jjnQ+v+GzGS+26JFpGLVP9x7wTpf9lGdJLWSVU4ZXAT Tsoq8Mg4W8FUKvYU3wxYzy0W2d6jlLDckolHR0jz28lax0lRxn8TYLtImMciqWsIqWHN +eIA== X-Received: by 10.180.24.132 with SMTP id u4mr6296428wif.6.1366222825671; Wed, 17 Apr 2013 11:20:25 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.180.81.195 with SMTP id c3ls1339630wiy.54.canary; Wed, 17 Apr 2013 11:20:25 -0700 (PDT) X-Received: by 10.180.83.199 with SMTP id s7mr10800419wiy.19.1366222825302; Wed, 17 Apr 2013 11:20:25 -0700 (PDT) Received: from mail-ve0-f178.google.com (mail-ve0-f178.google.com [209.85.128.178]) by mx.google.com with ESMTPS id o17si6287530wij.41.2013.04.17.11.20.24 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 17 Apr 2013 11:20:25 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.178; Received: by mail-ve0-f178.google.com with SMTP id c13so1726549vea.9 for <patchwork-forward@linaro.org>; Wed, 17 Apr 2013 11:20:24 -0700 (PDT) X-Received: by 10.58.188.48 with SMTP id fx16mr5810192vec.22.1366222824210; Wed, 17 Apr 2013 11:20:24 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp86011veb; Wed, 17 Apr 2013 11:20:23 -0700 (PDT) X-Received: by 10.180.36.235 with SMTP id t11mr12978837wij.1.1366222823193; Wed, 17 Apr 2013 11:20:23 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id fp9si6270165wic.116.2013.04.17.11.20.22 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 17 Apr 2013 11:20:23 -0700 (PDT) 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; Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1USWxy-00055P-PV for <patches@linaro.org>; Wed, 17 Apr 2013 18:20:22 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id A8113E00F3 for <patches@linaro.org>; Wed, 17 Apr 2013 18:20:22 +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: 268 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker <patches@linaro.org> From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 268: ImageReader: cast to void*, not voidp Message-Id: <20130417182022.8491.92325.launchpad@ackee.canonical.com> Date: Wed, 17 Apr 2013 18:20:22 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: list X-Generated-By: Launchpad (canonical.com); Revision="16567"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 1236e526b0c3f40d1fa36e5e772f5cdbdd9c9727 X-Gm-Message-State: ALoCoQmMrPyzhAKy8LfXkqe/O4d3C+YcAa8cu3KjWVbj6bUoNiTr0BBH6lH6bmvamr3mY8arlMjb X-Original-Sender: noreply@launchpad.net X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: <patchwork-forward.linaro.org> X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post?hl=en-US>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?hl=en-US&topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/?hl=en-US> List-Unsubscribe: <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe?hl=en-US>, <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com> Content-Type: multipart/mixed; boundary="===============8117982034355184332==" |
=== modified file 'src/image-reader.cpp' --- src/image-reader.cpp 2012-06-27 16:17:42 +0000 +++ src/image-reader.cpp 2013-04-17 18:15:34 +0000 @@ -146,7 +146,7 @@ } /* Read the image information and data */ - png_set_read_fn(priv_->png, reinterpret_cast<voidp>(is_ptr.get()), + png_set_read_fn(priv_->png, reinterpret_cast<void*>(is_ptr.get()), PNGReaderPrivate::png_read_fn); png_read_png(priv_->png, priv_->info, png_transforms, 0);