"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "tktable/generic/tkTableTag.c" between
ds9.8.2.tar.gz and ds9.8.2.1.tar.gz

About: SAOImage DS9 is an astronomical imaging and data visualization application that supports FITS images and binary tables, multiple frame buffers, region manipulation, and many scale algorithms and colormaps.

tkTableTag.c  (ds9.8.2):tkTableTag.c  (ds9.8.2.1)
skipping to change at line 212 skipping to change at line 212
* None. * None.
* *
*---------------------------------------------------------------------- *----------------------------------------------------------------------
*/ */
void void
TableResetTag(Table *tablePtr, TableTag *tagPtr) TableResetTag(Table *tablePtr, TableTag *tagPtr)
{ {
TableJoinTag *jtagPtr = (TableJoinTag *) tagPtr; TableJoinTag *jtagPtr = (TableJoinTag *) tagPtr;
if (jtagPtr->magic != 0x99ABCDEF) { if (jtagPtr->magic != 0x99ABCDEF) {
Tcl_PanicVA("bad mojo in TableResetTag",NULL); Tcl_Panic("bad mojo in TableResetTag");
} }
memset((VOID *) jtagPtr, 0, sizeof(TableJoinTag)); memset((VOID *) jtagPtr, 0, sizeof(TableJoinTag));
tagPtr->anchor = (Tk_Anchor)-1; tagPtr->anchor = (Tk_Anchor)-1;
tagPtr->justify = (Tk_Justify)-1; tagPtr->justify = (Tk_Justify)-1;
tagPtr->multiline = -1; tagPtr->multiline = -1;
tagPtr->relief = -1; tagPtr->relief = -1;
tagPtr->showtext = -1; tagPtr->showtext = -1;
tagPtr->state = STATE_UNKNOWN; tagPtr->state = STATE_UNKNOWN;
skipping to change at line 268 skipping to change at line 268
* *
*---------------------------------------------------------------------- *----------------------------------------------------------------------
*/ */
void void
TableMergeTag(Table *tablePtr, TableTag *baseTag, TableTag *addTag) TableMergeTag(Table *tablePtr, TableTag *baseTag, TableTag *addTag)
{ {
TableJoinTag *jtagPtr = (TableJoinTag *) baseTag; TableJoinTag *jtagPtr = (TableJoinTag *) baseTag;
unsigned int prio; unsigned int prio;
if (jtagPtr->magic != 0x99ABCDEF) { if (jtagPtr->magic != 0x99ABCDEF) {
Tcl_PanicVA("bad mojo in TableMergeTag",NULL); Tcl_Panic("bad mojo in TableMergeTag");
} }
#ifndef NO_TAG_PRIORITIES #ifndef NO_TAG_PRIORITIES
/* /*
* Find priority for the tag to merge * Find priority for the tag to merge
*/ */
prio = TableTagGetPriority(tablePtr, addTag); prio = TableTagGetPriority(tablePtr, addTag);
if ((addTag->anchor != -1) && (prio < jtagPtr->panchor)) { if ((addTag->anchor != -1) && (prio < jtagPtr->panchor)) {
baseTag->anchor = addTag->anchor; baseTag->anchor = addTag->anchor;
skipping to change at line 429 skipping to change at line 429
if (top) { *top = 0; } if (top) { *top = 0; }
if (bottom) { *bottom = 0; } if (bottom) { *bottom = 0; }
break; break;
case 4: case 4:
if (left) { *left = tagPtr->bd[0]; } if (left) { *left = tagPtr->bd[0]; }
if (right) { *right = tagPtr->bd[1]; } if (right) { *right = tagPtr->bd[1]; }
if (top) { *top = tagPtr->bd[2]; } if (top) { *top = tagPtr->bd[2]; }
if (bottom) { *bottom = tagPtr->bd[3]; } if (bottom) { *bottom = tagPtr->bd[3]; }
break; break;
default: default:
Tcl_PanicVA("invalid border value '%d'\n", tagPtr->borders); Tcl_Panic("invalid border value '%d'\n", tagPtr->borders);
break; break;
} }
return tagPtr->borders; return tagPtr->borders;
} }
/* /*
*---------------------------------------------------------------------- *----------------------------------------------------------------------
* *
* TableTagGetEntry -- * TableTagGetEntry --
* Takes a name and optional args and creates a tag entry in the * Takes a name and optional args and creates a tag entry in the
* table's tag table. * table's tag table.
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)