Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 49887 | Differences between
and this patch

Collapse All | Expand All

(-)libpng-1.0.15-old/pngconf.h (-2 / +7 lines)
Lines 254-261 Link Here
254
#      undef _BSD_SOURCE
254
#      undef _BSD_SOURCE
255
#    endif
255
#    endif
256
#    ifdef _SETJMP_H
256
#    ifdef _SETJMP_H
257
      __png.h__ already includes setjmp.h;
257
/* Explanation added by debian maintainer Philippe Troin <phil@fifi.org>.
258
      __dont__ include it again.;
258
   There are two versions of setjmp, depending wether or not we compile for
259
   BSD. They are incompatible and can cause crashes. The PNG people force
260
   here a unique behavior for setjmp. It fou get the error below,
261
   then include <png.h> before <setjmp.h>.
262
*/
263
#error png.h already includes setjmp.h with some additional fixup.
259
#    endif
264
#    endif
260
#  endif /* __linux__ */
265
#  endif /* __linux__ */
261
266
(-)libpng-1.0.15-old/pngrtran.c (-7 / +9 lines)
Lines 1965-1972 Link Here
1965
         /* This changes the data from RRGGBB to RRGGBBXX */
1965
         /* This changes the data from RRGGBB to RRGGBBXX */
1966
         if (flags & PNG_FLAG_FILLER_AFTER)
1966
         if (flags & PNG_FLAG_FILLER_AFTER)
1967
         {
1967
         {
1968
            png_bytep sp = row + (png_size_t)row_width * 3;
1968
            png_bytep sp = row + (png_size_t)row_width * 6;
1969
            png_bytep dp = sp  + (png_size_t)row_width;
1969
            png_bytep dp = sp  + (png_size_t)row_width * 2;
1970
            for (i = 1; i < row_width; i++)
1970
            for (i = 1; i < row_width; i++)
1971
            {
1971
            {
1972
               *(--dp) = hi_filler;
1972
               *(--dp) = hi_filler;
Lines 1987-1994 Link Here
1987
         /* This changes the data from RRGGBB to XXRRGGBB */
1987
         /* This changes the data from RRGGBB to XXRRGGBB */
1988
         else
1988
         else
1989
         {
1989
         {
1990
            png_bytep sp = row + (png_size_t)row_width * 3;
1990
            png_bytep sp = row + (png_size_t)row_width * 6;
1991
            png_bytep dp = sp  + (png_size_t)row_width;
1991
            png_bytep dp = sp  + (png_size_t)row_width * 2;
1992
            for (i = 0; i < row_width; i++)
1992
            for (i = 0; i < row_width; i++)
1993
            {
1993
            {
1994
               *(--dp) = *(--sp);
1994
               *(--dp) = *(--sp);
1995
-- libpng-1.0.15-old/pngerror.c       2002-10-03 05:32:27.000000000 -0600
1995
++ libpng-1.0.15/pngerror.c     2004-04-29 09:26:18.000000000 -0600
Lines 135-144 Link Here
135
      buffer[iout] = 0;
135
      buffer[iout] = 0;
136
   else
136
   else
137
   {
137
   {
138
      png_size_t len = strnlen(error_message, 63);
139
138
      buffer[iout++] = ':';
140
      buffer[iout++] = ':';
139
      buffer[iout++] = ' ';
141
      buffer[iout++] = ' ';
140
      png_memcpy(buffer+iout, error_message, 64);
142
      png_memcpy(buffer+iout, error_message, len);
141
      buffer[iout+63] = 0;
143
      buffer[iout+len] = 0;
142
   }
144
   }
143
}
145
}

Return to bug 49887