← Back to branch summary

~noskcaj/ubuntu/trusty/libpng/libpng

« back to all changes in this revision

Viewing changes to contrib/gregbook/readpng2.c

  • Committer: Bazaar Package Importer
  • Author(s): Anibal Monsalve Salazar
  • Date: 2009-12-04 11:23:50 UTC
  • mfrom: (1.1.10 upstream) (15.2.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091204112350-ln22xyakgn9bh39k
Tags: 1.2.41-1
* New upstream release
* Debian source format is 3.0 (quilt)
* Update debian/watch
* Add 02-export-png_set_strip_error_numbers.patch
  Define PNG_ERROR_NUMBERS_SUPPORTED
  Upstream doesn't define PNG_ERROR_NUMBERS_SUPPORTED since 1.2.41. As
  a consecuence, the symbol png_set_strip_error_numbe@@PNG12_0 wasn't
  exported.

Show diffs side-by-side

added added

removed removed

Lines of Context:
contrib/gregbook/readpng2.c
159
159
 
160
160
int readpng2_check_sig(uch *sig, int num)
161
161
{
162
 
    return png_check_sig(sig, num);
 
162
    return !png_sig_cmp(sig, 0, num);
163
163
}
164
164
 
165
165
 
379
379
{
380
380
    mainprog_info  *mainprog_ptr;
381
381
    int  color_type, bit_depth;
 
382
    png_uint_32 width, height;
382
383
    double  gamma;
383
384
 
384
385
 
414
415
 
415
416
    /* this is just like in the non-progressive case */
416
417
 
417
 
    png_get_IHDR(png_ptr, info_ptr, &mainprog_ptr->width,
418
 
      &mainprog_ptr->height, &bit_depth, &color_type, NULL, NULL, NULL);
 
418
    png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
 
419
       NULL, NULL, NULL);
 
420
    mainprog_ptr->width = (ulg)width;
 
421
    mainprog_ptr->height = (ulg)height;
419
422
 
420
423
 
421
424
    /* since we know we've read all of the PNG file's "header" (i.e., up