$NetBSD: patch-ak,v 1.2 2002/10/06 16:26:57 he Exp $ This patch is based on http://www.mit.edu/afs/athena/contrib/graphics/src/xv/patches/png/xvpng.diff It was edited to fit into the NetBSD Packages Collection! - HF It is also modified by ftp://ftp.trilon.com/pub/xv/patches/mp-tiff-patch --------------------------------------------------------------------------- --- xv.c.orig Fri Aug 9 17:09:06 2002 +++ xv.c @@ -279,6 +279,10 @@ pcdW = (Window) NULL; pcdUp = 0; +#ifdef HAVE_PNG + pngW = (Window) NULL; pngUp = 0; +#endif + imap = ctrlmap = gmap = browmap = cmtmap = 0; ch_offx = ch_offy = p_offx = p_offy = 0; @@ -786,6 +790,11 @@ CreatePCDW(); XSetTransientForHint(theDisp, pcdW, dirW); + +#ifdef HAVE_PNG + CreatePNGW(); + XSetTransientForHint(theDisp, pngW, dirW); +#endif LoadFishCursors(); SetCursors(-1); @@ -2649,6 +2658,11 @@ (magicno[0]=='I' && magicno[1]=='I')) rv = RFT_TIFF; #endif +#ifdef HAVE_PNG + else if (magicno[0]==0x89 && magicno[1]=='P' && + magicno[2]=='N' && magicno[3]=='G') rv = RFT_PNG; +#endif + #ifdef HAVE_PDS else if (strncmp((char *) magicno, "NJPL1I00", (size_t) 8)==0 || strncmp((char *) magicno+2,"NJPL1I", (size_t) 6)==0 || @@ -2739,7 +2753,11 @@ #endif #ifdef HAVE_TIFF - case RFT_TIFF: rv = LoadTIFF (fname, pinfo); break; + case RFT_TIFF: rv = LoadTIFF (fname, pinfo, quick); break; +#endif + +#ifdef HAVE_PNG + case RFT_PNG: rv = LoadPNG (fname, pinfo); break; #endif #ifdef HAVE_PDS