← Back to branch summary

~ubuntu-branches/ubuntu/raring/ncbi-tools6/raring

« back to all changes in this revision

Viewing changes to vibrant/shim3d.c

  • Committer: Bazaar Package Importer
  • Author(s): Aaron M. Ucko
  • Date: 2011-07-30 11:51:21 UTC
  • Revision ID: james.westby@ubuntu.com-20110730115121-chmnfcbez01l0ypk
Tags: 6.1.20100808-3
http://bugs.debian.org/636006
vibrant/shim3d.c: support libpng 1.5+, per Nobuhiro Iwamatsu's most
helpful patch.  (Closes: #636006.)

Show diffs side-by-side

added added

removed removed

Lines of Context:
vibrant/shim3d.c
312
312
 
313
313
#ifdef _PNG
314
314
#include <png.h> /* must go berore ncbi headers */
 
315
#include <zlib.h>
315
316
#endif
316
317
 
317
318
/* from ncbimisc.h */
3165
3166
        Message(MSG_ERROR, "Can't create PNG info structure");
3166
3167
        goto cleanup;
3167
3168
    }
3168
 
 
 
3169
#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
 
3170
        if (setjmp(png_jmpbuf(png_ptr))) {
 
3171
#else
3169
3172
    if (setjmp(png_ptr->jmpbuf)) {
 
3173
#endif
3170
3174
        Message(MSG_ERROR, "PNG write failed");
3171
3175
        goto cleanup;
3172
3176
    }