/[packages]/cauldron/abiword/current/SOURCES/abiword-2.8.6-libpng1.5.patch
ViewVC logotype

Diff of /cauldron/abiword/current/SOURCES/abiword-2.8.6-libpng1.5.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 145935 by fwang, Mon Sep 12 10:10:43 2011 UTC revision 145936 by fwang, Tue Sep 20 06:02:23 2011 UTC
# Line 40  Line 40 
40                  png_destroy_read_struct( &png_ptr, &info_ptr, NULL );                  png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
41          }          }
42    
43    --- plugins/bmp/xp/ie_impGraphic_BMP.cpp.libpng 2011-09-20 13:52:25.816337091 +0800
44    +++ plugins/bmp/xp/ie_impGraphic_BMP.cpp        2011-09-20 14:00:06.256340211 +0800
45    @@ -191,7 +191,7 @@
46    
47            /* Clean Up Memory Used */
48                    
49    -       FREEP(m_pPNGInfo->palette);
50    +       png_free_data(m_pPNG, m_pPNGInfo, PNG_FREE_PLTE, -1);
51            DELETEP(pBB);
52            png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
53        
54    @@ -313,7 +313,7 @@
55             * the normal method of doing things with libpng).  REQUIRED unless you
56             * set up your own error handlers in the png_create_read_struct() earlier.
57             */
58    -       if (setjmp(m_pPNG->jmpbuf))
59    +       if (setjmp(png_jmpbuf(m_pPNG)))
60            {
61                    /* Free all of the memory associated with the png_ptr and info_ptr */
62                    png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
63    @@ -332,7 +332,7 @@
64            UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB)
65            {
66                    /* Reset error handling for libpng */
67    -               if (setjmp(m_pPNG->jmpbuf))
68    +               if (setjmp(png_jmpbuf(m_pPNG)))
69                    {
70                            png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
71                            return UT_ERROR;
72    @@ -372,7 +372,7 @@
73     UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB)
74     {
75            /* Reset error handling for libpng */
76    -       if (setjmp(m_pPNG->jmpbuf))
77    +       if (setjmp(png_jmpbuf(m_pPNG)))
78            {
79                    png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
80                    return UT_ERROR;
Legend:
Removed from v.145935  
changed lines
  Added in v.145936
  ViewVC Help
Powered by ViewVC 1.1.30