diff options
author | joye <joye> | 2014-03-13 22:32:39 (GMT) |
---|---|---|
committer | joye <joye> | 2014-03-13 22:32:39 (GMT) |
commit | 29cc5181407d04f35425952d840373e62663f797 (patch) | |
tree | fe12e65ce86f542c23fde04908646b9bcac526a3 /bltGrMarkerBitmap.C | |
parent | 4415b9fca5a03d8ae7f4a67bdd109ad87d95bf7d (diff) | |
download | blt-29cc5181407d04f35425952d840373e62663f797.zip blt-29cc5181407d04f35425952d840373e62663f797.tar.gz blt-29cc5181407d04f35425952d840373e62663f797.tar.bz2 |
*** empty log message ***
Diffstat (limited to 'bltGrMarkerBitmap.C')
-rw-r--r-- | bltGrMarkerBitmap.C | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/bltGrMarkerBitmap.C b/bltGrMarkerBitmap.C index 74b544c..bc5da82 100644 --- a/bltGrMarkerBitmap.C +++ b/bltGrMarkerBitmap.C @@ -123,12 +123,12 @@ static int ConfigureBitmapProc(Marker *markerPtr) } gcMask = 0; - if (bmPtr->outlineColor != NULL) { + if (bmPtr->outlineColor) { gcMask |= GCForeground; gcValues.foreground = bmPtr->outlineColor->pixel; } - if (bmPtr->fillColor != NULL) { + if (bmPtr->fillColor) { /* Opaque bitmap: both foreground and background (fill) colors * are used. */ gcValues.background = bmPtr->fillColor->pixel; @@ -146,17 +146,17 @@ static int ConfigureBitmapProc(Marker *markerPtr) * this particular bitmap. */ newGC = Tk_GetGC(graphPtr->tkwin, gcMask, &gcValues); - if (bmPtr->gc != NULL) { + if (bmPtr->gc) { Tk_FreeGC(graphPtr->display, bmPtr->gc); } bmPtr->gc = newGC; /* Create the background GC containing the fill color. */ - if (bmPtr->fillColor != NULL) { + if (bmPtr->fillColor) { gcValues.foreground = bmPtr->fillColor->pixel; newGC = Tk_GetGC(graphPtr->tkwin, gcMask, &gcValues); - if (bmPtr->fillGC != NULL) { + if (bmPtr->fillGC) { Tk_FreeGC(graphPtr->display, bmPtr->fillGC); } bmPtr->fillGC = newGC; @@ -400,7 +400,7 @@ static void DrawBitmapProc(Marker *markerPtr, Drawable drawable) * If the bitmap is rotated and a filled background is required, then * a filled polygon is drawn before the bitmap. */ - if (bmPtr->fillColor != NULL) { + if (bmPtr->fillColor) { int i; XPoint polygon[MAX_OUTLINE_POINTS]; @@ -433,7 +433,7 @@ static void BitmapToPostscriptProc(Marker *markerPtr, Blt_Ps ps) if ((bitmap == None) || (bmPtr->destWidth < 1) || (bmPtr->destHeight < 1)) { return; /* No bitmap to display. */ } - if (bmPtr->fillColor != NULL) { + if (bmPtr->fillColor) { Blt_Ps_XSetBackground(ps, bmPtr->fillColor); Blt_Ps_XFillPolygon(ps, bmPtr->outline, 4); } @@ -458,10 +458,10 @@ static void FreeBitmapProc(Marker *markerPtr) BitmapMarker *bmPtr = (BitmapMarker *)markerPtr; Graph* graphPtr = markerPtr->obj.graphPtr; - if (bmPtr->gc != NULL) { + if (bmPtr->gc) { Tk_FreeGC(graphPtr->display, bmPtr->gc); } - if (bmPtr->fillGC != NULL) { + if (bmPtr->fillGC) { Tk_FreeGC(graphPtr->display, bmPtr->fillGC); } if (bmPtr->destBitmap != None) { |