mirror of
				https://git.code.sf.net/p/libpng/code.git
				synced 2025-07-10 18:04:09 +02:00 
			
		
		
		
	Merge branch 'libpng17' into libpng17-20151201
This commit is contained in:
		
						commit
						71c5123a4d
					
				
							
								
								
									
										4
									
								
								ANNOUNCE
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								ANNOUNCE
									
									
									
									
									
								
							@ -1055,8 +1055,8 @@ Version 1.7.0beta70 [December 1, 2015]
 | 
				
			|||||||
    compression code with the decompression code; IDAT_size replaces
 | 
					    compression code with the decompression code; IDAT_size replaces
 | 
				
			||||||
    IDAT_read_size and zbuffer_size, IDAT reading and writing is no longer
 | 
					    IDAT_read_size and zbuffer_size, IDAT reading and writing is no longer
 | 
				
			||||||
    controlled by the size of the compression buffer.
 | 
					    controlled by the size of the compression buffer.
 | 
				
			||||||
  Updated manual to require png_set_PLTE() to precede png_set_tRNS()
 | 
					  Separated png_compress_IDAT into write/compress, removed some
 | 
				
			||||||
    and png_set_hIST() if either is present.
 | 
					    trailing spaces and cleaned up pnglibconf.
 | 
				
			||||||
  Removed the side-effect on the png_struct palette of calling png_set_PLTE()
 | 
					  Removed the side-effect on the png_struct palette of calling png_set_PLTE()
 | 
				
			||||||
    or png_set_tRNS(). This is a quiet API change; it was previously possible
 | 
					    or png_set_tRNS(). This is a quiet API change; it was previously possible
 | 
				
			||||||
    to alter the palette on a PNG image by using png_set_PLTE, but this was
 | 
					    to alter the palette on a PNG image by using png_set_PLTE, but this was
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								CHANGES
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								CHANGES
									
									
									
									
									
								
							@ -5354,8 +5354,6 @@ Version 1.7.0beta70 [December 1, 2015]
 | 
				
			|||||||
    compression code with the decompression code; IDAT_size replaces
 | 
					    compression code with the decompression code; IDAT_size replaces
 | 
				
			||||||
    IDAT_read_size and zbuffer_size, IDAT reading and writing is no longer
 | 
					    IDAT_read_size and zbuffer_size, IDAT reading and writing is no longer
 | 
				
			||||||
    controlled by the size of the compression buffer.
 | 
					    controlled by the size of the compression buffer.
 | 
				
			||||||
  Updated manual to require png_set_PLTE() to precede png_set_tRNS()
 | 
					 | 
				
			||||||
    and png_set_hIST() if either is present.
 | 
					 | 
				
			||||||
  Separated png_compress_IDAT into write/compress, removed some
 | 
					  Separated png_compress_IDAT into write/compress, removed some
 | 
				
			||||||
    trailing spaces and cleaned up pnglibconf.
 | 
					    trailing spaces and cleaned up pnglibconf.
 | 
				
			||||||
  Removed the side-effect on the png_struct palette of calling png_set_PLTE()
 | 
					  Removed the side-effect on the png_struct palette of calling png_set_PLTE()
 | 
				
			||||||
 | 
				
			|||||||
@ -2947,7 +2947,8 @@ Some of the more important parts of the png_info are:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
If you call png_set_IHDR(), the call must appear before any of the
 | 
					If you call png_set_IHDR(), the call must appear before any of the
 | 
				
			||||||
other png_set_*() functions, because they might require access to some of
 | 
					other png_set_*() functions, because they might require access to some of
 | 
				
			||||||
the IHDR settings.
 | 
					the IHDR settings.  The remaining png_set_*() functions can be called
 | 
				
			||||||
 | 
					in any order.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
If you wish, you can reset the compression_type, interlace_type, or
 | 
					If you wish, you can reset the compression_type, interlace_type, or
 | 
				
			||||||
filter_method later by calling png_set_IHDR() again; if you do this, the
 | 
					filter_method later by calling png_set_IHDR() again; if you do this, the
 | 
				
			||||||
@ -2960,12 +2961,6 @@ width, height, bit_depth, and color_type must be the same in each call.
 | 
				
			|||||||
                     (array of png_color)
 | 
					                     (array of png_color)
 | 
				
			||||||
    num_palette    - number of entries in the palette
 | 
					    num_palette    - number of entries in the palette
 | 
				
			||||||
 | 
					
 | 
				
			||||||
If you call png_set_PLTE(), the call must appear before either of
 | 
					 | 
				
			||||||
png_set_tRNS() or png_set_hIST() appears, because they require access
 | 
					 | 
				
			||||||
to the palette length.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
The remaining png_set_*() functions can be called in any order.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    png_set_gAMA(png_ptr, info_ptr, file_gamma);
 | 
					    png_set_gAMA(png_ptr, info_ptr, file_gamma);
 | 
				
			||||||
    png_set_gAMA_fixed(png_ptr, info_ptr, int_file_gamma);
 | 
					    png_set_gAMA_fixed(png_ptr, info_ptr, int_file_gamma);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										9
									
								
								libpng.3
									
									
									
									
									
								
							
							
						
						
									
										9
									
								
								libpng.3
									
									
									
									
									
								
							@ -3445,7 +3445,8 @@ Some of the more important parts of the png_info are:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
If you call png_set_IHDR(), the call must appear before any of the
 | 
					If you call png_set_IHDR(), the call must appear before any of the
 | 
				
			||||||
other png_set_*() functions, because they might require access to some of
 | 
					other png_set_*() functions, because they might require access to some of
 | 
				
			||||||
the IHDR settings.
 | 
					the IHDR settings.  The remaining png_set_*() functions can be called
 | 
				
			||||||
 | 
					in any order.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
If you wish, you can reset the compression_type, interlace_type, or
 | 
					If you wish, you can reset the compression_type, interlace_type, or
 | 
				
			||||||
filter_method later by calling png_set_IHDR() again; if you do this, the
 | 
					filter_method later by calling png_set_IHDR() again; if you do this, the
 | 
				
			||||||
@ -3458,12 +3459,6 @@ width, height, bit_depth, and color_type must be the same in each call.
 | 
				
			|||||||
                     (array of png_color)
 | 
					                     (array of png_color)
 | 
				
			||||||
    num_palette    - number of entries in the palette
 | 
					    num_palette    - number of entries in the palette
 | 
				
			||||||
 | 
					
 | 
				
			||||||
If you call png_set_PLTE(), the call must appear before either of
 | 
					 | 
				
			||||||
png_set_tRNS() or png_set_hIST() appears, because they require access
 | 
					 | 
				
			||||||
to the palette length.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
The remaining png_set_*() functions can be called in any order.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    png_set_gAMA(png_ptr, info_ptr, file_gamma);
 | 
					    png_set_gAMA(png_ptr, info_ptr, file_gamma);
 | 
				
			||||||
    png_set_gAMA_fixed(png_ptr, info_ptr, int_file_gamma);
 | 
					    png_set_gAMA_fixed(png_ptr, info_ptr, int_file_gamma);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user