Itk - the [incr Tk] extension

Check-in [482c48daf2]
Login

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

Overview
Comment:merge trunk
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | dgp-method-type
Files: files | file ages | folders
SHA1: 482c48daf27c5c643ef650116f20d11250d09ed5
User & Date: dgp 2015-07-29 16:45:40.098
Context
2015-08-03
04:20
Debugging work in progress.... check-in: b8982b983a user: dgp tags: dgp-method-type
2015-07-29
16:45
merge trunk check-in: 482c48daf2 user: dgp tags: dgp-method-type
10:01
In progress effort to repair context juggling. check-in: b41e9c4dc4 user: dgp tags: dgp-method-type
2015-05-01
16:50
[fa152b6a6e] Continue support of mixed case pacakge name "Itk". Permits continued use of [package require Itk] in existing scripts. Thanks ralfixx! check-in: b3513260e3 user: dgp tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to generic/itkArchBase.c.
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
            /* isProcCallFrame */ 0);

    if (result == TCL_OK) {
        result = Tcl_EvalObj(interp, objPtr);
        Itcl_PopCallFrame(interp);
    }

    if (objPtr != objv[3]) {
        Tcl_DecrRefCount(objPtr);
    }
    if (result != TCL_OK) {
        goto compFail;
    }

    Itk_DelGenericOptTable(mergeInfo->optionTable);







|







514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
            /* isProcCallFrame */ 0);

    if (result == TCL_OK) {
        result = Tcl_EvalObj(interp, objPtr);
        Itcl_PopCallFrame(interp);
    }

    if (objc != 4) {
        Tcl_DecrRefCount(objPtr);
    }
    if (result != TCL_OK) {
        goto compFail;
    }

    Itk_DelGenericOptTable(mergeInfo->optionTable);
Changes to generic/itkBase.c.
210
211
212
213
214
215
216

217
218
219
220
221
222
223
    /*
     *  Signal that the package has been loaded and provide the Itk Stubs table
     *  for dependent modules.  I know this is unlikely, but possible that
     *  someone could be extending Itk.  Who is to say that Itk is the
     *  end-of-the-line?
     */


    return Tcl_PkgProvideEx(interp, "itk", ITK_PATCH_LEVEL,
            (ClientData) &itkStubs);
}

/*
 * ------------------------------------------------------------------------
 *  Itk_Init()







>







210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
    /*
     *  Signal that the package has been loaded and provide the Itk Stubs table
     *  for dependent modules.  I know this is unlikely, but possible that
     *  someone could be extending Itk.  Who is to say that Itk is the
     *  end-of-the-line?
     */

    Tcl_PkgProvideEx(interp, "Itk", ITK_PATCH_LEVEL, (ClientData) &itkStubs);
    return Tcl_PkgProvideEx(interp, "itk", ITK_PATCH_LEVEL,
            (ClientData) &itkStubs);
}

/*
 * ------------------------------------------------------------------------
 *  Itk_Init()
Changes to pkgIndex.tcl.in.
1
2
3

# Tcl package index file, version 1.0

package ifneeded itk @PACKAGE_VERSION@ [list load [file join $dir "@PKG_LIB_FILE@"] itk]



|
>
1
2
3
4
# Tcl package index file, version 1.0

package ifneeded itk @PACKAGE_VERSION@ [list load [file join $dir "@PKG_LIB_FILE@"] Itk]
package ifneeded Itk @PACKAGE_VERSION@ [list load [file join $dir "@PKG_LIB_FILE@"] Itk]