<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>61738</bug_id>
          
          <creation_ts>2011-05-30 10:42:53 -0700</creation_ts>
          <short_desc>compilation fails with libpng-1.5</short_desc>
          <delta_ts>2011-06-18 12:54:13 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>WebCore Misc.</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>0</everconfirmed>
          <reporter name="Christoph Mende">angelos</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>webkit.review.bot</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>412290</commentid>
    <comment_count>0</comment_count>
      <attachid>95355</attachid>
    <who name="Christoph Mende">angelos</who>
    <bug_when>2011-05-30 10:42:53 -0700</bug_when>
    <thetext>Created attachment 95355
patch to use the current API

WebCore::writeOutput() in WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp tries to access (struct *png_struct)-&gt;io_ptr which is deprecated in libpng-1.4 and removed in 1.5. The new way is to use png_get_io_ptr(). Attached is a patch that uses this function.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>412330</commentid>
    <comment_count>1</comment_count>
      <attachid>95363</attachid>
    <who name="Christoph Mende">angelos</who>
    <bug_when>2011-05-30 12:50:53 -0700</bug_when>
    <thetext>Created attachment 95363
Updated libpng15 patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>412491</commentid>
    <comment_count>2</comment_count>
    <who name="Christoph Mende">angelos</who>
    <bug_when>2011-05-31 01:08:02 -0700</bug_when>
    <thetext>fyi, from the libpng manual:
The png_get_io_ptr() function has been present since libpng-0.88, has never
changed, and is unaffected by conditional compilation macros.
so this patch is backwards compatible with pretty much every distribution that&apos;s newer than 1999.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>412953</commentid>
    <comment_count>3</comment_count>
      <attachid>95363</attachid>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2011-05-31 15:45:09 -0700</bug_when>
    <thetext>Comment on attachment 95363
Updated libpng15 patch

View in context: https://bugs.webkit.org/attachment.cgi?id=95363&amp;action=review

&gt; WebCore/ChangeLog:8
&gt; +        No new tests. (OOPS!)

Commit queue can&apos;t land the patch with this line. You should just remove it, as it&apos;s obvious why no test is needed.

&gt; WebCore/ChangeLog:11
&gt; +        * platform/image-encoders/skia/PNGImageEncoder.cpp:
&gt; +        (WebCore::writeOutput): Use the new API

As you explained in Bugzilla, the API is not new.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>413188</commentid>
    <comment_count>4</comment_count>
      <attachid>95555</attachid>
    <who name="Christoph Mende">angelos</who>
    <bug_when>2011-06-01 00:26:25 -0700</bug_when>
    <thetext>Created attachment 95555
updated ChangeLog entry</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>423198</commentid>
    <comment_count>5</comment_count>
      <attachid>95555</attachid>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2011-06-18 12:54:09 -0700</bug_when>
    <thetext>Comment on attachment 95555
updated ChangeLog entry

Clearing flags on attachment: 95555

Committed r89200: &lt;http://trac.webkit.org/changeset/89200&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>423199</commentid>
    <comment_count>6</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2011-06-18 12:54:13 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>95355</attachid>
            <date>2011-05-30 10:42:53 -0700</date>
            <delta_ts>2011-05-30 12:50:53 -0700</delta_ts>
            <desc>patch to use the current API</desc>
            <filename>webkit-libpng15.patch</filename>
            <type>text/plain</type>
            <size>643</size>
            <attacher name="Christoph Mende">angelos</attacher>
            
              <data encoding="base64">SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZW5jb2RlcnMvc2tpYS9QTkdJbWFnZUVuY29k
ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZW5jb2RlcnMvc2tp
YS9QTkdJbWFnZUVuY29kZXIuY3BwCShyZXZpc2lvbiA4NzYyNykKKysrIFdlYkNvcmUvcGxhdGZv
cm0vaW1hZ2UtZW5jb2RlcnMvc2tpYS9QTkdJbWFnZUVuY29kZXIuY3BwCSh3b3JraW5nIGNvcHkp
CkBAIC00NCw3ICs0NCw3IEBACiAKIHN0YXRpYyB2b2lkIHdyaXRlT3V0cHV0KHBuZ19zdHJ1Y3Rw
IHBuZywgcG5nX2J5dGVwIGRhdGEsIHBuZ19zaXplX3Qgc2l6ZSkKIHsKLSAgICBzdGF0aWNfY2Fz
dDxWZWN0b3I8dW5zaWduZWQgY2hhcj4qPihwbmctPmlvX3B0ciktPmFwcGVuZChkYXRhLCBzaXpl
KTsKKyAgICBzdGF0aWNfY2FzdDxWZWN0b3I8dW5zaWduZWQgY2hhcj4qPihwbmdfZ2V0X2lvX3B0
cihwbmcpKS0+YXBwZW5kKGRhdGEsIHNpemUpOwogfQogCiBzdGF0aWMgdm9pZCBwcmVNdWx0aXBs
aWVkQkdSQXRvUkdCQShjb25zdCB2b2lkKiBwaXhlbHMsIGludCBwaXhlbENvdW50LCB1bnNpZ25l
ZCBjaGFyKiBvdXRwdXQpCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>95363</attachid>
            <date>2011-05-30 12:50:53 -0700</date>
            <delta_ts>2011-06-01 00:26:25 -0700</delta_ts>
            <desc>Updated libpng15 patch</desc>
            <filename>webkit-libpng15.patch</filename>
            <type>text/plain</type>
            <size>1300</size>
            <attacher name="Christoph Mende">angelos</attacher>
            
              <data encoding="base64">SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n
CShyZXZpc2lvbiA4NzY5NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA
IC0xLDMgKzEsMTUgQEAKKzIwMTEtMDUtMzAgIENocmlzdG9waCBNZW5kZSAgPG1lbmRlLmNocmlz
dG9waEBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK
KyAgICAgICAgY29tcGlsYXRpb24gZmFpbHMgd2l0aCBsaWJwbmctMS41CisgICAgICAgIGh0dHBz
Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MTczOAorCisgICAgICAgIE5vIG5l
dyB0ZXN0cy4gKE9PUFMhKQorCisgICAgICAgICogcGxhdGZvcm0vaW1hZ2UtZW5jb2RlcnMvc2tp
YS9QTkdJbWFnZUVuY29kZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6d3JpdGVPdXRwdXQpOiBV
c2UgdGhlIG5ldyBBUEkKKwogMjAxMS0wNS0zMCAgTm9hbSBSb3NlbnRoYWwgIDxub2FtLnJvc2Vu
dGhhbEBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJp
c3RpYW5zZW4uCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWVuY29kZXJzL3NraWEvUE5H
SW1hZ2VFbmNvZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWVu
Y29kZXJzL3NraWEvUE5HSW1hZ2VFbmNvZGVyLmNwcAkocmV2aXNpb24gODc2MjcpCisrKyBXZWJD
b3JlL3BsYXRmb3JtL2ltYWdlLWVuY29kZXJzL3NraWEvUE5HSW1hZ2VFbmNvZGVyLmNwcAkod29y
a2luZyBjb3B5KQpAQCAtNDQsNyArNDQsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHN0YXRp
YyB2b2lkIHdyaXRlT3V0cHV0KHBuZ19zdHJ1Y3RwIHBuZywgcG5nX2J5dGVwIGRhdGEsIHBuZ19z
aXplX3Qgc2l6ZSkKIHsKLSAgICBzdGF0aWNfY2FzdDxWZWN0b3I8dW5zaWduZWQgY2hhcj4qPihw
bmctPmlvX3B0ciktPmFwcGVuZChkYXRhLCBzaXplKTsKKyAgICBzdGF0aWNfY2FzdDxWZWN0b3I8
dW5zaWduZWQgY2hhcj4qPihwbmdfZ2V0X2lvX3B0cihwbmcpKS0+YXBwZW5kKGRhdGEsIHNpemUp
OwogfQogCiBzdGF0aWMgdm9pZCBwcmVNdWx0aXBsaWVkQkdSQXRvUkdCQShjb25zdCB2b2lkKiBw
aXhlbHMsIGludCBwaXhlbENvdW50LCB1bnNpZ25lZCBjaGFyKiBvdXRwdXQpCg==
</data>
<flag name="review"
          id="88835"
          type_id="1"
          status="+"
          setter="ap"
    />
          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>95555</attachid>
            <date>2011-06-01 00:26:25 -0700</date>
            <delta_ts>2011-06-18 12:54:09 -0700</delta_ts>
            <desc>updated ChangeLog entry</desc>
            <filename>webkit-libpng15.patch</filename>
            <type>text/plain</type>
            <size>1296</size>
            <attacher name="Christoph Mende">angelos</attacher>
            
              <data encoding="base64">SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n
CShyZXZpc2lvbiA4NzY5NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA
IC0xLDMgKzEsMTMgQEAKKzIwMTEtMDUtMzAgIENocmlzdG9waCBNZW5kZSAgPG1lbmRlLmNocmlz
dG9waEBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK
KyAgICAgICAgY29tcGlsYXRpb24gZmFpbHMgd2l0aCBsaWJwbmctMS41CisgICAgICAgIGh0dHBz
Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MTczOAorCisgICAgICAgICogcGxh
dGZvcm0vaW1hZ2UtZW5jb2RlcnMvc2tpYS9QTkdJbWFnZUVuY29kZXIuY3BwOgorICAgICAgICAo
V2ViQ29yZTo6d3JpdGVPdXRwdXQpOiBVc2UgZ2V0dGVyIGZ1bmN0aW9uIGluc3RlYWQgb2YgZGly
ZWN0IGFjY2VzcworCiAyMDExLTA1LTMwICBOb2FtIFJvc2VudGhhbCAgPG5vYW0ucm9zZW50aGFs
QG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlh
bnNlbi4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZW5jb2RlcnMvc2tpYS9QTkdJbWFn
ZUVuY29kZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZW5jb2Rl
cnMvc2tpYS9QTkdJbWFnZUVuY29kZXIuY3BwCShyZXZpc2lvbiA4NzYyNykKKysrIFdlYkNvcmUv
cGxhdGZvcm0vaW1hZ2UtZW5jb2RlcnMvc2tpYS9QTkdJbWFnZUVuY29kZXIuY3BwCSh3b3JraW5n
IGNvcHkpCkBAIC00NCw3ICs0NCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogc3RhdGljIHZv
aWQgd3JpdGVPdXRwdXQocG5nX3N0cnVjdHAgcG5nLCBwbmdfYnl0ZXAgZGF0YSwgcG5nX3NpemVf
dCBzaXplKQogewotICAgIHN0YXRpY19jYXN0PFZlY3Rvcjx1bnNpZ25lZCBjaGFyPio+KHBuZy0+
aW9fcHRyKS0+YXBwZW5kKGRhdGEsIHNpemUpOworICAgIHN0YXRpY19jYXN0PFZlY3Rvcjx1bnNp
Z25lZCBjaGFyPio+KHBuZ19nZXRfaW9fcHRyKHBuZykpLT5hcHBlbmQoZGF0YSwgc2l6ZSk7CiB9
CiAKIHN0YXRpYyB2b2lkIHByZU11bHRpcGxpZWRCR1JBdG9SR0JBKGNvbnN0IHZvaWQqIHBpeGVs
cywgaW50IHBpeGVsQ291bnQsIHVuc2lnbmVkIGNoYXIqIG91dHB1dCkK
</data>

          </attachment>
      

    </bug>

</bugzilla>