Itk - the [incr Tk] extension

Check-in [2fc403285e]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:merge trunk
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | itk-4-0-1-rc
Files: files | file ages | folders
SHA1: 2fc403285ef865d2b43c4b8ddc25aac4502a9514
User & Date: dgp 2015-01-26 17:00:51
Context
2015-01-30
18:50
merge trunk check-in: cb282e78f1 user: dgp tags: itk-4-0-1-rc
2015-01-26
17:00
merge trunk check-in: 2fc403285e user: dgp tags: itk-4-0-1-rc
17:00
Accommodate the changed Tcl_GetHashKey() signature. check-in: e764406f0f user: dgp tags: trunk
2015-01-07
19:46
Bump to Itk 4.0.1 for release. check-in: bf26558279 user: dgp tags: itk-4-0-1-rc
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to generic/itkUtil.c.

103
104
105
106
107
108
109
110
111
112
113
114

115
116
117
118
119
120
121
    }

    /*
     *  Perform a binary search to find the option switch quickly.
     */
    first = 0;
    last  = olist->len-1;
    swname = Tcl_GetHashKey(olist->options, entry) + 1;

    while (last >= first) {
        pos = (first+last)/2;
        optname = Tcl_GetHashKey(olist->options, olist->list[pos]) + 1;

        if (*swname == *optname) {
            cmp = strcmp(swname, optname);
            if (cmp == 0) {
                break;    /* found it! */
            }
        }
        else if (*swname < *optname) {







|



|
>







103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
    }

    /*
     *  Perform a binary search to find the option switch quickly.
     */
    first = 0;
    last  = olist->len-1;
    swname = ((char *)Tcl_GetHashKey(olist->options, entry)) + 1;

    while (last >= first) {
        pos = (first+last)/2;
        optname = ((char *)Tcl_GetHashKey(olist->options,
		olist->list[pos])) + 1;
        if (*swname == *optname) {
            cmp = strcmp(swname, optname);
            if (cmp == 0) {
                break;    /* found it! */
            }
        }
        else if (*swname < *optname) {
168
169
170
171
172
173
174
175
176
177
178
179

180
181
182
183
184
185
186
    int last;
    int cmp;
    char *swname;
    char *optname;

    first = 0;
    last  = olist->len-1;
    swname = Tcl_GetHashKey(olist->options, entry) + 1;

    while (last >= first) {
        pos = (first+last)/2;
        optname = Tcl_GetHashKey(olist->options, olist->list[pos]) + 1;

        if (*swname == *optname) {
            cmp = strcmp(swname, optname);
            if (cmp == 0) {
                break;    /* found it! */
            }
        }
        else if (*swname < *optname) {







|



|
>







169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
    int last;
    int cmp;
    char *swname;
    char *optname;

    first = 0;
    last  = olist->len-1;
    swname = ((char *)Tcl_GetHashKey(olist->options, entry)) + 1;

    while (last >= first) {
        pos = (first+last)/2;
        optname = ((char *)Tcl_GetHashKey(olist->options,
		olist->list[pos])) + 1;
        if (*swname == *optname) {
            cmp = strcmp(swname, optname);
            if (cmp == 0) {
                break;    /* found it! */
            }
        }
        else if (*swname < *optname) {