Attachment #30229 for bug #49263

View | Details | Raw Unified | Return to bug 49263
Collapse All | Expand All

Lines 252-259 Link Here

(-)libpng-1.2.5.orig/pngconf.h (-2 / +2 lines)
252	# undef _BSD_SOURCE	252	# undef _BSD_SOURCE
253	# endif	253	# endif
254	# ifdef _SETJMP_H	254	# ifdef _SETJMP_H
255	__png.h__ already includes setjmp.h;	255	#warning __png.h__ already includes setjmp.h;
256	__dont__ include it again.;	256	#warning __dont__ include it again.;
257	# endif	257	# endif
258	# endif /* __linux__ */	258	# endif /* __linux__ */
259		259




         if (flags & PNG_FLAG_FILLER_AFTER)
         {
            png_bytep sp = row + (png_size_t)row_width * 3;
            png_bytep dp = sp  + (png_size_t)row_width ;
            for (i = 1; i < row_width; i++)
            {
               *(--dp) = lo_filler;

         else
         {
            png_bytep sp = row + (png_size_t)row_width * 3;
            png_bytep dp = sp + (png_size_t)row_width ;
            for (i = 0; i < row_width; i++)
            {
               *(--dp) = *(--sp);

         /* This changes the data from RRGGBB to RRGGBBXX */
         if (flags & PNG_FLAG_FILLER_AFTER)
         {
            png_bytep sp = row + (png_size_t)row_width * 6;
            png_bytep dp = sp  + (png_size_t)row_width * 2;
            for (i = 1; i < row_width; i++)
            {
               *(--dp) = hi_filler;

         /* This changes the data from RRGGBB to XXRRGGBB */
         else
         {
            png_bytep sp = row + (png_size_t)row_width * 6;
            png_bytep dp = sp  + (png_size_t)row_width * 2;
            for (i = 0; i < row_width; i++)
            {
               *(--dp) = *(--sp);

Return to bug 49263

Lines 1930-1936 Link Here

(-)libpng-1.2.5.orig/pngrtran.c (-6 / +6 lines)
1930	if (flags & PNG_FLAG_FILLER_AFTER)	1930	if (flags & PNG_FLAG_FILLER_AFTER)
1931	{	1931	{
1932	png_bytep sp = row + (png_size_t)row_width * 3;	1932	png_bytep sp = row + (png_size_t)row_width * 3;
1933	png_bytep dp = sp + (png_size_t)row_width;	1933	png_bytep dp = sp + (png_size_t)row_width ;
1934	for (i = 1; i < row_width; i++)	1934	for (i = 1; i < row_width; i++)
1935	{	1935	{
1936	*(--dp) = lo_filler;	1936	*(--dp) = lo_filler;
Lines 1947-1953 Link Here
1947	else	1947	else
1948	{	1948	{
1949	png_bytep sp = row + (png_size_t)row_width * 3;	1949	png_bytep sp = row + (png_size_t)row_width * 3;
1950	png_bytep dp = sp + (png_size_t)row_width;	1950	png_bytep dp = sp + (png_size_t)row_width ;
1951	for (i = 0; i < row_width; i++)	1951	for (i = 0; i < row_width; i++)
1952	{	1952	{
1953	(--dp) = (--sp);	1953	(--dp) = (--sp);
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);