Página inicial Explorar contacts
Entrar
LDA010
/
bug_ebuild
Observar 0
Favorito 0
Fork 0
Arquivos Issues 0 Pull Requests 0 Wiki
Branch: master
Branches Tags
bug_ebuild
/
gentoo
/
media-gfx
/
autotrace
/
files
/
autotrace-0.31.1-libpng-1.5.patch

autotrace-0.31.1-libpng-1.5.patch 2.3 KB
Link permanente Histórico Raw

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465 
  1. https://sourceforge.net/mailarchive/forum.php?thread_name=01e601cbc22e%24f45d7200%24dd185600%24%40acm.org&forum_name=png-mng-implement
    2. 

  2. 

  3. $NetBSD$
    4. 

  4. 

  5. Fix build with png-1.5.
    6. 

  6. 

  7. --- input-png.c.orig	2002-10-10 20:44:14.000000000 +0000
    8. 

  8. +++ input-png.c
    9. 

  9. @@ -42,17 +42,17 @@ static png_bytep * read_png(png_structp 
    10. 

  10.  
    11. 

  11.  static void handle_warning(png_structp png, const at_string message) {
    12. 

  12.          LOG1("PNG warning: %s", message);
    13. 

  13. -	at_exception_warning((at_exception_type *)png->error_ptr,
    14. 

  14. +	at_exception_warning((at_exception_type *)png_get_error_ptr(png),
    15. 

  15.  			     message);
    16. 

  16. -	/* at_exception_fatal((at_exception_type *)at_png->error_ptr,
    17. 

  17. +	/* at_exception_fatal((at_exception_type *)png_get_error_ptr(at_png),
    18. 

  18.  	   "PNG warning"); */
    19. 

  19.  }
    20. 

  20.  
    21. 

  21.  static void handle_error(png_structp png, const at_string message) {
    22. 

  22.  	LOG1("PNG error: %s", message);
    23. 

  23. -	at_exception_fatal((at_exception_type *)png->error_ptr,
    24. 

  24. +	at_exception_fatal((at_exception_type *)png_get_error_ptr(png),
    25. 

  25.  			   message);
    26. 

  26. -	/* at_exception_fatal((at_exception_type *)at_png->error_ptr,
    27. 

  27. +	/* at_exception_fatal((at_exception_type *)png_get_error_ptr(at_png),
    28. 

  28.  	   "PNG error"); */
    29. 

  29.  	
    30. 

  30.  }
    31. 

  31. @@ -157,8 +157,8 @@ read_png(png_structp png_ptr, png_infop 
    32. 

  32.  
    33. 

  33.  	png_set_strip_16(png_ptr);
    34. 

  34.  	png_set_packing(png_ptr);
    35. 

  35. -	if ((png_ptr->bit_depth < 8) ||
    36. 

  36. -	    (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ||
    37. 

  37. +	if ((png_get_bit_depth(png_ptr, info_ptr) < 8) ||
    38. 

  38. +	    (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE) ||
    39. 

  39.  	    (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)))
    40. 

  40.  		png_set_expand(png_ptr);
    41. 

  41.  
    42. 

  42. @@ -181,20 +181,10 @@ read_png(png_structp png_ptr, png_infop 
    43. 

  43.  				   PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
    44. 

  44.  	} else
    45. 

  45.  		png_set_strip_alpha(png_ptr);
    46. 

  46. +	png_set_interlace_handling(png_ptr);
    47. 

  47.  	png_read_update_info(png_ptr, info_ptr);
    48. 

  48.  
    49. 

  49. -
    50. 

  50. -	info_ptr->row_pointers = (png_bytepp)png_malloc(png_ptr,
    51. 

  51. -							info_ptr->height * sizeof(png_bytep));
    52. 

  52. -#ifdef PNG_FREE_ME_SUPPORTED
    53. 

  53. -	info_ptr->free_me |= PNG_FREE_ROWS;
    54. 

  54. -#endif
    55. 

  55. -	for (row = 0; row < (int)info_ptr->height; row++)
    56. 

  56. -		info_ptr->row_pointers[row] = (png_bytep)png_malloc(png_ptr,
    57. 

  57. -								    png_get_rowbytes(png_ptr, info_ptr));
    58. 

  58. -	
    59. 

  59. -	png_read_image(png_ptr, info_ptr->row_pointers);
    60. 

  60. -	info_ptr->valid |= PNG_INFO_IDAT;
    61. 

  61. +	png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL);
    62. 

  62.  	png_read_end(png_ptr, info_ptr);
    63. 

  63.  	return png_get_rows(png_ptr, info_ptr);
    64. 

  64.  }
    65. 

  65.