head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.40 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.38 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.36 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.34 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.32 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.30 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.28 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.26 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.24 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.22 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.20 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.18 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.16 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.14 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.12 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.10 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.8 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.6 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.4 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.2 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.2.0.16 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.14 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.12 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.10 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.8 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.6 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.4 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.2 netbsd-1-6-1-base:1.2 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1 netbsd-1-5-PATCH001:1.1; locks; strict; comment @# @; 1.3 date 2005.08.10.16.50.18; author he; state dead; branches; next 1.2; 1.2 date 2002.10.06.16.26.57; author he; state Exp; branches 1.2.16.1; next 1.1; 1.1 date 2001.04.05.13.57.16; author wiz; state Exp; branches; next ; 1.2.16.1 date 2005.08.19.11.37.05; author salo; state dead; branches; next ; desc @@ 1.3 log @Instead of separately integrating several different patches, instead pull in the Jumbo patches from http://www.sonic.net/~roelofs/greg_xv.html. As far as I can see this covers all our existing patches for added functionality, although I cannot claim that I have tested each and every one of them in the new version. These patches disable a number of image formats that I think are less common, which have potential heap overflows in the code due to in- sufficient validation of image dimensions. The version of the Jumbo patch used here is the 20050501 version. Package revision bumped to nb10. @ text @$NetBSD: patch-al,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.h.orig Fri Aug 9 17:09:14 2002 +++ xv.h @@@@ -8,8 +8,8 @@@@ #include "config.h" -#define REVDATE "Version 3.10a Rev: 12/29/94" -#define VERSTR "3.10a" +#define REVDATE "Version 3.10a Rev: 12/29/94 (PNG patch 1.2)" +#define VERSTR "3.10a(PNG)" /* * uncomment the following, and modify for your site, but only if you've @@@@ -343,6 +343,10 @@@@ #define HAVE_TIFF #endif +#ifdef DOPNG +#define HAVE_PNG +#endif + #ifdef DOPDS #define HAVE_PDS #endif @@@@ -478,31 +482,38 @@@@ #define MACBSIZE 128 #endif +#ifdef HAVE_PNG +#define F_PNGINC 1 +#else +#define F_PNGINC 0 +#endif + #define F_GIF 0 #define F_JPEG ( 0 + F_JPGINC) #define F_TIFF ( 0 + F_JPGINC + F_TIFINC) -#define F_PS ( 1 + F_JPGINC + F_TIFINC) -#define F_PBMRAW ( 2 + F_JPGINC + F_TIFINC) -#define F_PBMASCII ( 3 + F_JPGINC + F_TIFINC) -#define F_XBM ( 4 + F_JPGINC + F_TIFINC) -#define F_XPM ( 5 + F_JPGINC + F_TIFINC) -#define F_BMP ( 6 + F_JPGINC + F_TIFINC) -#define F_SUNRAS ( 7 + F_JPGINC + F_TIFINC) -#define F_IRIS ( 8 + F_JPGINC + F_TIFINC) -#define F_TARGA ( 9 + F_JPGINC + F_TIFINC) -#define F_FITS (10 + F_JPGINC + F_TIFINC) -#define F_PM (11 + F_JPGINC + F_TIFINC) -#define F_MAG (12 + F_JPGINC + F_TIFINC) -#define F_PIC (13 + F_JPGINC + F_TIFINC) -#define F_MAKI (14 + F_JPGINC + F_TIFINC) -#define F_PI (15 + F_JPGINC + F_TIFINC) -#define F_PIC2_SS (16 + F_JPGINC + F_TIFINC) -#define F_PIC2_SF (17 + F_JPGINC + F_TIFINC) -#define F_PIC2_BM (18 + F_JPGINC + F_TIFINC) -#define F_PIC2_BI (19 + F_JPGINC + F_TIFINC) /* ----- */ -#define F_DELIM1 (20 + F_JPGINC + F_TIFINC) -#define F_FILELIST (21 + F_JPGINC + F_TIFINC) -#define F_MAXFMTS (22 + F_JPGINC + F_TIFINC) /* 16, normally */ +#define F_PNG ( 0 + F_JPGINC + F_TIFINC + F_PNGINC) +#define F_PS ( 1 + F_JPGINC + F_TIFINC + F_PNGINC) +#define F_PBMRAW ( 2 + F_JPGINC + F_TIFINC + F_PNGINC) +#define F_PBMASCII ( 3 + F_JPGINC + F_TIFINC + F_PNGINC) +#define F_XBM ( 4 + F_JPGINC + F_TIFINC + F_PNGINC) +#define F_XPM ( 5 + F_JPGINC + F_TIFINC + F_PNGINC) +#define F_BMP ( 6 + F_JPGINC + F_TIFINC + F_PNGINC) +#define F_SUNRAS ( 7 + F_JPGINC + F_TIFINC + F_PNGINC) +#define F_IRIS ( 8 + F_JPGINC + F_TIFINC + F_PNGINC) +#define F_TARGA ( 9 + F_JPGINC + F_TIFINC + F_PNGINC) +#define F_FITS (10 + F_JPGINC + F_TIFINC + F_PNGINC) +#define F_PM (11 + F_JPGINC + F_TIFINC + F_PNGINC) +#define F_MAG (12 + F_JPGINC + F_TIFINC + F_PNGINC) +#define F_PIC (13 + F_JPGINC + F_TIFINC + F_PNGINC) +#define F_MAKI (14 + F_JPGINC + F_TIFINC + F_PNGINC) +#define F_PI (15 + F_JPGINC + F_TIFINC + F_PNGINC) +#define F_PIC2_SS (16 + F_JPGINC + F_TIFINC + F_PNGINC) +#define F_PIC2_SF (17 + F_JPGINC + F_TIFINC + F_PNGINC) +#define F_PIC2_BM (18 + F_JPGINC + F_TIFINC + F_PNGINC) +#define F_PIC2_BI (19 + F_JPGINC + F_TIFINC + F_PNGINC) +#define F_DELIM1 (20 + F_JPGINC + F_TIFINC + F_PNGINC) /* ----- */ +#define F_FILELIST (21 + F_JPGINC + F_TIFINC + F_PNGINC) +#define F_MAXFMTS (22 + F_JPGINC + F_TIFINC + F_PNGINC) /* 25, normally */ @@@@ -538,6 +549,7 @@@@ #define RFT_PI 23 #define RFT_PIC2 24 #define RFT_PCD 25 +#define RFT_PNG 26 /* HF: was 20 */ /* definitions for page up/down, arrow up/down list control */ #define LS_PAGEUP 0 @@@@ -798,9 +810,10 @@@@ typedef struct { Window win; /* window ID */ int x,y,w,h; /* window coords in parent */ int active; /* true if can do anything*/ - int min,max; /* min/max values 'pos' can take */ - int val; /* 'value' of dial */ - int page; /* amt val change on pageup/pagedown */ + double min,max; /* min/max values 'pos' can take */ + double val; /* 'value' of dial */ + double inc; /* amt val change on up/down */ + double page; /* amt val change on pageup/pagedown */ char *title; /* title for this guage */ char *units; /* string appended to value */ u_long fg,bg,hi,lo; /* colors */ @@@@ -1192,6 +1205,13 @@@@ WHERE Window pcdW; WHERE int pcdUp; /* is pcdW mapped, or what? */ +#ifdef HAVE_PNG +/* stuff used for 'png' box */ +WHERE Window pngW; +WHERE int pngUp; /* is pngW mapped, or what? */ +#endif + + #undef WHERE @@@@ -1289,6 +1309,7 @@@@ void xv_getwd PARM((char *, size_t)); char *xv_strstr PARM((char *, char *)); FILE *xv_fopen PARM((char *, char *)); +void xv_mktemp PARM((char *, char *)); void Timer PARM((int)); /*************************** XVCOLOR.C ***************************/ @@@@ -1506,12 +1527,12 @@@@ /*************************** XVDIAL.C ***************************/ -void DCreate PARM((DIAL *, Window, int, int, int, int, int, - int, int, int, u_long, u_long, u_long, - u_long, char *, char *)); +void DCreate PARM((DIAL *, Window, int, int, int, int, double, + double, double, double, double, u_long, + u_long, u_long, u_long, char *, char *)); -void DSetRange PARM((DIAL *, int, int, int, int)); -void DSetVal PARM((DIAL *, int)); +void DSetRange PARM((DIAL *, double,double,double,double,double)); +void DSetVal PARM((DIAL *, double)); void DSetActive PARM((DIAL *, int)); void DRedraw PARM((DIAL *)); int DTrack PARM((DIAL *, int, int)); @@@@ -1648,11 +1669,18 @@@@ void JPEGSaveParams PARM((char *, int)); /**************************** XVTIFF.C ***************************/ -int LoadTIFF PARM((char *, PICINFO *)); +int LoadTIFF PARM((char *, PICINFO *, int)); void CreateTIFFW PARM((void)); void TIFFDialog PARM((int)); int TIFFCheckEvent PARM((XEvent *)); void TIFFSaveParams PARM((char *, int)); + +/**************************** XVPNG.C ***************************/ +int LoadPNG PARM((char *, PICINFO *)); +void CreatePNGW PARM((void)); +void PNGDialog PARM((int)); +int PNGCheckEvent PARM((XEvent *)); +void PNGSaveParams PARM((char *, int)); /**************************** XVPDS.C ***************************/ int LoadPDS PARM((char *, PICINFO *)); @ 1.2 log @Merge in the multi-page TIFF file support patch from ftp://ftp.trilon.com/pub/xv/patches/mp-tiff-patch as found on http://www.trilon.com/xv/downloads.html#patches Bump package revision to 4. @ text @d1 1 a1 1 $NetBSD$ @ 1.2.16.1 log @Pullup ticket 689 - requested by Havard Eidnes security fixes for xv Revisions pulled up: - pkgsrc/graphics/xv/Makefile 1.59 - pkgsrc/graphics/xv/PLIST 1.3 - pkgsrc/graphics/xv/distinfo 1.11 - pkgsrc/graphics/xv/patches/patch-aa removed - pkgsrc/graphics/xv/patches/patch-ab removed - pkgsrc/graphics/xv/patches/patch-ac 1.8 - pkgsrc/graphics/xv/patches/patch-ad 1.9 - pkgsrc/graphics/xv/patches/patch-ae removed - pkgsrc/graphics/xv/patches/patch-af 1.5 - pkgsrc/graphics/xv/patches/patch-ag removed - pkgsrc/graphics/xv/patches/patch-ah 1.2 - pkgsrc/graphics/xv/patches/patch-ai 1.2 - pkgsrc/graphics/xv/patches/patch-aj 1.2 - pkgsrc/graphics/xv/patches/patch-ak removed - pkgsrc/graphics/xv/patches/patch-al removed - pkgsrc/graphics/xv/patches/patch-am removed - pkgsrc/graphics/xv/patches/patch-an removed - pkgsrc/graphics/xv/patches/patch-ao removed - pkgsrc/graphics/xv/patches/patch-ap removed - pkgsrc/graphics/xv/patches/patch-aq removed - pkgsrc/graphics/xv/patches/patch-ar removed - pkgsrc/graphics/xv/patches/patch-as removed - pkgsrc/graphics/xv/patches/patch-at removed - pkgsrc/graphics/xv/patches/patch-au removed - pkgsrc/graphics/xv/patches/patch-av removed - pkgsrc/graphics/xv/patches/patch-aw removed - pkgsrc/graphics/xv/patches/patch-ax removed - pkgsrc/graphics/xv/patches/patch-ay removed Module Name: pkgsrc Committed By: he Date: Wed Aug 10 16:50:18 UTC 2005 Modified Files: pkgsrc/graphics/xv: Makefile PLIST distinfo pkgsrc/graphics/xv/patches: patch-ac patch-ad patch-af patch-ah patch-ai patch-aj Removed Files: pkgsrc/graphics/xv/patches: patch-aa patch-ab patch-ae patch-ag patch-ak patch-al patch-am patch-an patch-ao patch-ap patch-aq patch-ar patch-as patch-at patch-au patch-av patch-aw patch-ax patch-ay Log Message: Instead of separately integrating several different patches, instead pull in the Jumbo patches from http://www.sonic.net/~roelofs/greg_xv.html. As far as I can see this covers all our existing patches for added functionality, although I cannot claim that I have tested each and every one of them in the new version. These patches disable a number of image formats that I think are less common, which have potential heap overflows in the code due to in- sufficient validation of image dimensions. The version of the Jumbo patch used here is the 20050501 version. Package revision bumped to nb10. @ text @d1 1 a1 1 $NetBSD: patch-al,v 1.2 2002/10/06 16:26:57 he Exp $ @ 1.1 log @Standardize patch file names. @ text @d1 1 a1 1 $NetBSD: patch-png2-xv.h,v 1.1 1999/06/13 16:23:54 hubertf Exp $ d7 3 d13 2 a14 2 --- xv.h.orig Sun Jun 13 03:41:34 1999 +++ xv.h Sun Jun 13 03:53:34 1999 d134 9 a142 1 @@@@ -1506,12 +1526,12 @@@@ d160 7 a166 1 @@@@ -1653,6 +1673,13 @@@@ @