Revision: 75998
http://sourceforge.net/p/brlcad/code/75998
Author: starseeker
Date: 2020-06-01 19:37:37 +0000 (Mon, 01 Jun 2020)
Log Message:
-----------
Need to look a little more to be sure, but I think once this is put into the
photo we no longer need the local copy...
Modified Paths:
--------------
brlcad/trunk/src/libdm/dm-tk.c
brlcad/trunk/src/libdm/dm-tk.h
Modified: brlcad/trunk/src/libdm/dm-tk.c
===================================================================
--- brlcad/trunk/src/libdm/dm-tk.c 2020-06-01 19:24:00 UTC (rev 75997)
+++ brlcad/trunk/src/libdm/dm-tk.c 2020-06-01 19:37:37 UTC (rev 75998)
@@ -1085,6 +1085,9 @@
// Let Tk_Photo know we have data
Tk_PhotoPutBlock(interp, privvars->img, &dm_data, 0, 0, dm_data.width,
dm_data.height, TK_PHOTO_COMPOSITE_SET);
+ // Put block operation complete - free local allocated buffer
+ Tcl_Free((char *)dm_data.pixelPtr);
+
bu_vls_sprintf(&photo_cmd, "%s.canvas create image 0 0 -image
%s.canvas.photo -anchor nw", bu_vls_cstr(&dmp->dm_pathName),
bu_vls_cstr(&dmp->dm_pathName));
Tcl_Eval(interp, bu_vls_cstr(&photo_cmd));
Modified: brlcad/trunk/src/libdm/dm-tk.h
===================================================================
--- brlcad/trunk/src/libdm/dm-tk.h 2020-06-01 19:24:00 UTC (rev 75997)
+++ brlcad/trunk/src/libdm/dm-tk.h 2020-06-01 19:37:37 UTC (rev 75998)
@@ -39,13 +39,15 @@
Tk_PhotoHandle img;
GC gc;
+ unsigned long bd, bg, fg; /* color of border, background, foreground */
+#if 0
Pixmap pix;
fastf_t *xmat;
mat_t mod_mat; /* default model transformation matrix */
mat_t disp_mat; /* display transformation matrix */
int is_trueColor;
- unsigned long bd, bg, fg; /* color of border, background, foreground */
unsigned long pixels[NUM_PIXELS];
+#endif
};
#endif /* DM_TK_H */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
