diff mbox

[Branch,~glmark2-dev/glmark2/trunk] Rev 268: ImageReader: cast to void*, not voidp

Message ID 20130417182022.8491.92325.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

alexandros.frantzis@linaro.org April 17, 2013, 6:20 p.m. UTC
------------------------------------------------------------
revno: 268
fixes bug: https://launchpad.net/bugs/1166507
author: Joe Konno <joe.konno@intel.com>
committer: Alexandros Frantzis <alexandros.frantzis@canonical.com>
branch nick: trunk
timestamp: Wed 2013-04-17 21:15:34 +0300
message:
  ImageReader: cast to void*, not voidp
  
  voidp is exposed by (1.2 era) libpng includes, not a glmark2 header.
  Therefore, just cast to void*, which was the intent in the first place.
modified:
  src/image-reader.cpp


--
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
diff mbox

Patch

=== 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);