Add new debug definition file.

charmedlabs · Jan 21, 2015 · cadc3e6 · cadc3e6
1 parent 2f08922
commit cadc3e6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/src/common/blob.cpp b/src/common/blob.cpp
@@ -19,9 +19,10 @@
 #include "exec.h"
 #else
 #include "pixymon.h"
-#include "debug.h"
+#include "debuglog.h"
 #endif
 #include <blob.h>
+#include "../host/pixymon/debug.h"
 
 #ifdef DEBUG
 #ifndef HOST
@@ -321,7 +322,7 @@ int CBlobAssembler::Add(const SSegment &segment) {
     CBlob *newBlob= new (std::nothrow) CBlob();
     if (newBlob==NULL)
     {
-//        DBG("blobs %d\nheap full", m_blobCount);
+        DBG("blobs %d\nheap full", m_blobCount);
         return -1;
     }
     m_blobCount++;

diff --git a/src/common/blobs.cpp b/src/common/blobs.cpp
@@ -14,9 +14,10 @@
 //
 
 #ifndef PIXY
-#include "debug.h"
+#include "debuglog.h"
 #endif
 #include "blobs.h"
+#include "../host/pixymon/debug.h"
 
 #define CC_SIGNATURE(s) (m_ccMode==CC_ONLY || m_clut.getType(s)==CL_MODEL_TYPE_COLORCODE)
 
@@ -777,8 +778,8 @@ bool Blobs::analyzeDistances(BlobA *blobs0[], int16_t numBlobs0, BlobA *blobs[],
         }
     }
 #ifndef PIXY
-//    if (!result)
-//        DBG("not set!");
+    if (!result)
+        DBG("not set!");
 #endif
     return result;
 }
@@ -827,8 +828,8 @@ void Blobs::cleanup(BlobA *blobs[], int16_t *numBlobs)
         if (lowerArea<=maxEqualArea && maxEqualArea<=upperArea)
             newBlobs[numNewBlobs++] = blobs[i];
 #ifndef PIXY
-//        else if (*numBlobs>=5 && (blobs[i]->m_model&0x07)==2)
-//            DBG("eliminated!");
+        else if (*numBlobs>=5 && (blobs[i]->m_model&0x07)==2)
+            DBG("eliminated!");
 #endif
     }
 
@@ -873,8 +874,8 @@ void Blobs::printBlobs()
 #ifndef PIXY
     int i;
     BlobA *blobs = (BlobA *)m_blobs;
-//    for (i=0; i<m_numBlobs; i++)
-//        DBG("blob %d: %d %d %d %d %d", i, blobs[i].m_model, blobs[i].m_left, blobs[i].m_right, blobs[i].m_top, blobs[i].m_bottom);
+    for (i=0; i<m_numBlobs; i++)
+        DBG("blob %d: %d %d %d %d %d", i, blobs[i].m_model, blobs[i].m_left, blobs[i].m_right, blobs[i].m_top, blobs[i].m_bottom);
 #endif
 }
 

diff --git a/src/common/colorlut.cpp b/src/common/colorlut.cpp
@@ -17,7 +17,7 @@
 #include <math.h>
 #include <string.h>
 #ifndef PIXY
-#include "debug.h"
+#include "debuglog.h"
 #endif
 #include "colorlut.h"
 #include "calc.h"

diff --git a/src/host/pixymon/pixymon.pro b/src/host/pixymon/pixymon.pro
@@ -84,7 +84,6 @@ INCLUDEPATH += ../../common
 
 QMAKE_CXXFLAGS_DEBUG += -O0
 QMAKE_CXXFLAGS += -Wno-unused-parameter
-#QMAKE_CXXFLAGS += -mno-ms-bitfields
 FORMS    += mainwindow.ui \
     configdialog.ui \
     about.ui
@@ -96,7 +95,7 @@ win32 {
     LIBS += ../windows/libusb-1.0.dll.a
     HEADERS += ../windows/libusb.h
     INCLUDEPATH += ../windows
-
+    QMAKE_CXXFLAGS += -mno-ms-bitfields
 }
 
 macx {