diff options
| author | joye <joye> | 2014-03-13 16:55:22 (GMT) |
|---|---|---|
| committer | joye <joye> | 2014-03-13 16:55:22 (GMT) |
| commit | 5f8553a0e16878eb1981379a0c25d8e700f1c93b (patch) | |
| tree | 658af75d2621ea5cc3f1dae4791043de126e10ec /bltGrMarkerBitmap.C | |
| parent | 35807ea105b0ec89351a7361d657fcb3f1e5e59e (diff) | |
| download | blt-5f8553a0e16878eb1981379a0c25d8e700f1c93b.zip blt-5f8553a0e16878eb1981379a0c25d8e700f1c93b.tar.gz blt-5f8553a0e16878eb1981379a0c25d8e700f1c93b.tar.bz2 | |
*** empty log message ***
Diffstat (limited to 'bltGrMarkerBitmap.C')
| -rw-r--r-- | bltGrMarkerBitmap.C | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/bltGrMarkerBitmap.C b/bltGrMarkerBitmap.C index 0eac229..fa5ea48 100644 --- a/bltGrMarkerBitmap.C +++ b/bltGrMarkerBitmap.C @@ -27,16 +27,17 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +extern "C" { #include "bltGraph.h" #include "bltBitmap.h" + Point2d Blt_MapPoint(Point2d *pointPtr, Axis2d *axesPtr); + int Blt_BoxesDontOverlap(Graph* graphPtr, Region2d *extsPtr); +}; + #include "bltGrMarkerBitmap.h" #define GETBITMAP(b) (((b)->destBitmap == None) ? (b)->srcBitmap : (b)->destBitmap) -extern Point2d Blt_MapPoint(Point2d *pointPtr, Axis2d *axesPtr); -extern int Blt_BoxesDontOverlap(Graph* graphPtr, Region2d *extsPtr); -extern void Blt_FreeMarker(char*); - static Tk_OptionSpec optionSpecs[] = { {TK_OPTION_ANCHOR, "-anchor", "anchor", "Anchor", "center", -1, Tk_Offset(BitmapMarker, anchor), 0, NULL, 0}, @@ -100,7 +101,7 @@ static MarkerClass bitmapMarkerClass = { Marker* Blt_CreateBitmapProc(Graph* graphPtr) { - BitmapMarker* bmPtr = calloc(1, sizeof(BitmapMarker)); + BitmapMarker* bmPtr = (BitmapMarker*)calloc(1, sizeof(BitmapMarker)); bmPtr->classPtr = &bitmapMarkerClass; bmPtr->optionTable = Tk_CreateOptionTable(graphPtr->interp, optionSpecs); |