Skip to content

Commit

Permalink
rtd: revert patches for printing, currently does not work when not us…
Browse files Browse the repository at this point in the history
…ing X11 shared memory

the problem is in the offset handling - somewhere
  • Loading branch information
pwdraper committed Jun 15, 2013
1 parent 1d6c021 commit aecc31b
Show file tree
Hide file tree
Showing 3 changed files with 363 additions and 137 deletions.
14 changes: 7 additions & 7 deletions rtd/generic/RtdImage.C
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@ extern "C" int gethostname(char *name, unsigned int namelen);
#endif /* NEED_GETHOSTNAME_PROTO */
#endif

// local extension to enable postscript printing for images
extern "C" void TkCanvasPsImage_Init();

// generated code for bitmaps used in tcl scripts
void defineRtdBitmaps(Tcl_Interp*);

Expand Down Expand Up @@ -179,7 +182,6 @@ static Tk_ConfigSpec configSpecs_[] = {
{TK_CONFIG_END, NULL, NULL, NULL, NULL, 0, 0}
};


/*
* Initialize the image control structure with pointers to the handler
* functions
Expand All @@ -191,12 +193,7 @@ static Tk_ImageType rtdImageType = {
TkImage::DisplayImage, /* displayProc */
TkImage::FreeImage, /* freeProc */
TkImage::DeleteImage, /* deleteProc */

#if TCL_MAJOR_VERSION >= 8 && TCL_MINOR_VERSION >= 3
// XXX RtdImage::Postscript, /* postscriptProc */
(Tk_ImagePostscriptProc *) NULL, /* postscriptProc */
#endif

(Tk_ImagePostscriptProc *) NULL, /* postscriptProc, use generic */
(Tk_ImageType *) NULL /* nextPtr */
};

Expand Down Expand Up @@ -332,6 +329,9 @@ int Rtd_Init(Tcl_Interp* interp)
{
// Initialize the local packages that rtd depends on

// PWD: enable postscript printing for images (local ext)
TkCanvasPsImage_Init();

// initialize the tclutil package
if (Tclutil_Init(interp) == TCL_ERROR) {
return TCL_ERROR;
Expand Down
Loading

0 comments on commit aecc31b

Please sign in to comment.