From 6602a6277abbda8cc39fba28f3fc23a24001aade Mon Sep 17 00:00:00 2001 From: kevin Date: Sun, 13 Jan 2013 16:36:00 -0800 Subject: [PATCH] cmGr.h/c Fixed logic bug in cmGrPExtIsNotNullOrEmpty() --- cmGr.c | 12 ++++++------ cmGr.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmGr.c b/cmGr.c index 668cbae..a10966a 100644 --- a/cmGr.c +++ b/cmGr.c @@ -27,13 +27,13 @@ enum typedef struct cmGrObj_str { - unsigned id; // - unsigned cfgFlags; // - unsigned stateFlags; // - cmGrObjFunc_t f; // - cmGrVExt_t wext; // world coord's contained within this object (children of this object are contained by these extents) + unsigned id; // + unsigned cfgFlags; // + unsigned stateFlags; // + cmGrObjFunc_t f; // + cmGrVExt_t wext; // world coord's contained within this object (children of this object are contained by these extents) unsigned wlimitFlags; // kLeftGrFl | kRightGrFl | kTopGrFl | kBottomGrFl - cmGrVExt_t wlimitExt; // limit extents for wext (ext's with set flags always define the associated wext value) + cmGrVExt_t wlimitExt; // limit extents for wext (ext's with set flags always define the associated wext value) struct cmGrObj_str* parent; struct cmGrObj_str* children; diff --git a/cmGr.h b/cmGr.h index cf12087..cbb050b 100644 --- a/cmGr.h +++ b/cmGr.h @@ -445,7 +445,7 @@ extern "C" { #define cmGrPExtIsNullOrEmpty(e) (cmGrPExtIsNull(e)||cmGrPExtIsEmpty(e)) #define cmGrPExtIsNotEmpty(e) (!cmGrPExtIsEmpty(e)) #define cmGrPExtIsNotNull(e) (!cmGrPExtIsNull(e)) -#define cmGrPExtIsNotNullOrEmpty(e) (cmGrPExtIsNotNull(e)||cmGrPExtIsNoEmpty(e)) +#define cmGrPExtIsNotNullOrEmpty(e) (cmGrPExtIsNotNull(e)&&cmGrPExtIsNotEmpty(e)) #define cmGrPExtIsEqual( e0, e1 ) (cmGrPPtIsEqual(&(e0)->loc,&(e1)->loc) && cmGrPSzIsEqual(&(e0)->sz, &(e1)->sz))