[SCM] image display tool for astronomy branch, master, updated. ea1e235f714bd8cd4d143864a340eef7e1e8b5ad
Ole Streicher
debian at liska.ath.cx
Mon May 28 11:59:48 UTC 2012
The following commit has been merged in the master branch:
commit ea1e235f714bd8cd4d143864a340eef7e1e8b5ad
Author: Ole Streicher <debian at liska.ath.cx>
Date: Mon May 28 13:58:23 2012 +0200
Fix some minor warnings in blt and iis
diff --git a/debian/patches/fix_blt.patch b/debian/patches/fix_blt.patch
index adc4951..f22042c 100644
--- a/debian/patches/fix_blt.patch
+++ b/debian/patches/fix_blt.patch
@@ -46,3 +46,80 @@ Description: BLT crashes when it reaches this code. This seems to be some
typedef struct {
const char *name; /* Name of format. */
unsigned int flags;
+--- a/blt3.0/src/bltGrMesh.c
++++ b/blt3.0/src/bltGrMesh.c
+@@ -1708,6 +1708,10 @@ ComparePoints(const void *a, const void *b)
+ return 0;
+ }
+
++int
++Blt_Triangulate(Tcl_Interp *interp, size_t nPoints, Point2f *points,
++ int sorted, int *nTrianglesPtr, Triplet **trianglesPtr);
++
+ static void
+ Triangulate(Tcl_Interp *interp, Mesh *meshPtr)
+ {
+--- a/blt3.0/src/bltPaneset.c
++++ b/blt3.0/src/bltPaneset.c
+@@ -1896,7 +1896,7 @@ PaneCustodyProc(ClientData clientData, Tk_Window tkwin)
+ if (Tk_IsMapped(panePtr->tkwin)) {
+ Tk_UnmapWindow(panePtr->tkwin);
+ }
+- fprintf(stderr, "PaneCustodyProc: DestoryPane(%x, %s)\n", panePtr, panePtr->name);
++ fprintf(stderr, "PaneCustodyProc: DestoryPane(%p, %s)\n", panePtr, panePtr->name);
+ DestroyPane(panePtr);
+ setPtr->flags |= LAYOUT_PENDING;
+ EventuallyRedraw(setPtr);
+@@ -2586,7 +2586,7 @@ PaneFreeProc(DestroyData dataPtr)
+ {
+ Pane *panePtr = (Pane *)dataPtr;
+
+- fprintf(stderr, "PaneFreeProc: DestoryPane(%x, %s)\n", panePtr, panePtr->name);
++ fprintf(stderr, "PaneFreeProc: DestoryPane(%p, %s)\n", panePtr, panePtr->name);
+ DestroyPane(panePtr);
+ }
+
+@@ -2773,7 +2773,7 @@ DestroyPaneset(Paneset *setPtr) /* Paneset structure */
+ panePtr->link = NULL; /* Don't disrupt this chain of
+ * entries. */
+ panePtr->hashPtr = NULL;
+- fprintf(stderr, "PanesetFreeProc: DestoryPane(%x, %s)\n", panePtr, panePtr->name);
++ fprintf(stderr, "PanesetFreeProc: DestoryPane(%p, %s)\n", panePtr, panePtr->name);
+ DestroyPane(panePtr);
+ }
+ Tk_FreeCursor(setPtr->display, setPtr->defHorzCursor);
+--- a/blt3.0/src/bltBind.c
++++ b/blt3.0/src/bltBind.c
+@@ -1244,6 +1244,12 @@ static TkStateMap propNotify[] = {
+ {-1, NULL}
+ };
+
++void TkpSetKeycodeAndState(Tk_Window tkwin, KeySym keySym,
++ XEvent *eventPtr);
++int TkFindStateNumObj (Tcl_Interp *interp, Tcl_Obj *optionPtr,
++ const TkStateMap *mapPtr, Tcl_Obj *keyPtr);
++KeySym TkStringToKeysym(char *name);
++
+ /*
+ *---------------------------------------------------------------------------
+ *
+--- a/blt3.0/src/bltImage.c
++++ b/blt3.0/src/bltImage.c
+@@ -131,7 +131,7 @@ Blt_Image_GetType(Tk_Image tkImage) /* Token for image. */
+ {
+ TkImageMaster *masterPtr;
+
+- masterPtr = Blt_Image_GetMaster(tkImage);
++ masterPtr = (TkImageMaster *)Blt_Image_GetMaster(tkImage);
+ return masterPtr->typePtr;
+ }
+
+@@ -149,7 +149,7 @@ Blt_Image_NameOfType(Tk_Image tkImage)
+ {
+ TkImageMaster *masterPtr;
+
+- masterPtr = Blt_Image_GetMaster(tkImage);
++ masterPtr = (TkImageMaster *)Blt_Image_GetMaster(tkImage);
+ return masterPtr->typePtr->name;
+ }
+
diff --git a/debian/patches/iis.patch b/debian/patches/iis.patch
index cc75fc9..61087b0 100644
--- a/debian/patches/iis.patch
+++ b/debian/patches/iis.patch
@@ -27,6 +27,15 @@ Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool"
register XimDataPtr xim;
{
int nopen = 0;
+@@ -141,7 +145,7 @@ register XimDataPtr xim;
+ chan = &xim->chan[i];
+ if (chan->id) {
+ xim_removeInput (xim, chan->id);
+- chan->id = NULL;
++ chan->id = 0;
+ }
+
+ switch (chan->type) {
@@ -296,7 +300,7 @@ register XimDataPtr xim;
fcntl(s, F_SETFD, FD_CLOEXEC);
@@ -54,6 +63,15 @@ Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool"
chan->xim = (XtPointer) xim;
chan->type = chan_port->type;
chan->datain = s;
+@@ -448,7 +452,7 @@ register IoChanPtr chan;
+ close (chan->datain);
+ if (chan->id) {
+ xim_removeInput (chan->xim, chan->id);
+- chan->id = NULL;
++ chan->id = 0;
+ }
+ chan->type = 0;
+ break;
@@ -464,7 +468,6 @@ static IoChanPtr
get_iochan (xim)
register XimDataPtr xim;
@@ -62,6 +80,15 @@ Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool"
register int i;
for (i=0; i < XtNumber(xim->chan); i++)
+@@ -505,7 +508,7 @@ XtInputId *id_addr;
+ if ((n = chan_read (datain, (char *)&iis, sizeof(iis))) < sizeof(iis)) {
+ if (n != 0)
+ fprintf (stderr,
+- "ximtool: command input read error, n=%d of %d, errno=%d\n",
++ "ximtool: command input read error, n=%d of %lu, errno=%d\n",
+ n, sizeof(iis), errno);
+ if (n <= 0)
+ xim_disconnectClient (chan);
@@ -751,7 +754,7 @@ XtInputId *id_addr;
*/
char emsg[SZ_WCSBUF];
@@ -84,7 +111,7 @@ Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool"
* elsewhere if needed, our only purpose here is to extract the frame WCS.
*/
-+print_mappings (FrameBufPtr fr);
++void print_mappings (FrameBufPtr fr);
+
static void
add_mapping (xim, ctran, wcsbuf, fr)
@@ -95,7 +122,7 @@ Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool"
*/
-print_mappings (fr)
-FrameBufPtr fr;
-+print_mappings (FrameBufPtr fr)
++void print_mappings (FrameBufPtr fr)
{
MappingPtr mp;
register int i;
@@ -146,3 +173,14 @@ Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool"
#else
Tcl_CreateEventSource(setupProc, checkProc, (void*)fd);
#endif
+--- a/iis/ximtool.h
++++ b/iis/ximtool.h
+@@ -149,7 +149,7 @@ typedef struct {
+ /* Client IIS I/O channel. */
+ typedef struct {
+ XtPointer xim; /* backpointer to xim descriptor */
+- XtPointer id; /* input callback id */
++ int id; /* input callback id */
+ int type; /* channel type */
+ int datain; /* input channel */
+ int dataout; /* output channel */
--
image display tool for astronomy
More information about the debian-science-commits
mailing list