[Gzz-commits] libvob include/vob/Debug.hxx include/vob/vobs/I...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/20 06:24:04

Modified files:
        include/vob    : Debug.hxx 
        include/vob/vobs: Irregu.hxx 
        src/util       : Debug.cxx 
Removed files:
        org/nongnu/libvob/util: ImageSize.java 
        test/vob/util  : imagesize.test 

Log message:
        Getting closer

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/include/vob/Debug.hxx.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/include/vob/vobs/Irregu.hxx.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/util/Debug.cxx.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: libvob/include/vob/Debug.hxx
diff -u libvob/include/vob/Debug.hxx:1.2 libvob/include/vob/Debug.hxx:1.3
--- libvob/include/vob/Debug.hxx:1.2    Wed Mar 12 08:37:57 2003
+++ libvob/include/vob/Debug.hxx        Sun Apr 20 06:24:04 2003
@@ -39,6 +39,9 @@
  * debugging.
  */
 namespace Debug {
+
+    extern std::ostream *debugStream();
+
 /** A macro to get a reference to a debug variable.
  * Example: 
  * <pre>
@@ -81,7 +84,7 @@
  *     if(dbg) cout <<
  * </pre>
  */
-#define DBG(cname) if(!cname);else (std::cout << cname##___DBGNAME << ": ")
+#define DBG(cname) if(!cname);else ((*(::Vob::Debug::debugStream())) << 
cname##___DBGNAME << ": ")
 
   /** Get a variable reference by name.
    * If the name does not exist, a new name is created with an
Index: libvob/include/vob/vobs/Irregu.hxx
diff -u libvob/include/vob/vobs/Irregu.hxx:1.4 
libvob/include/vob/vobs/Irregu.hxx:1.5
--- libvob/include/vob/vobs/Irregu.hxx:1.4      Sat Apr 19 15:37:32 2003
+++ libvob/include/vob/vobs/Irregu.hxx  Sun Apr 20 06:24:04 2003
@@ -438,7 +438,8 @@
         } else {
            DBG(dbg_irregularquad) << "norms\n";
             std::vector<ZVec> norm = Irregu::computeNorms(vert, n);
-           DBG(dbg_irregularquad) << "normed\n";
+           DBG(dbg_irregularquad) << "normed - calling draw: 
"<<const0.size()<<" "
+                               << const1.size()<<"\n";
             Irregu::draw(coords1, vert, norm, texscale,
                         linewidth, refsize, scale_pow,
                         border0, border1, texslicing,
Index: libvob/src/util/Debug.cxx
diff -u libvob/src/util/Debug.cxx:1.2 libvob/src/util/Debug.cxx:1.3
--- libvob/src/util/Debug.cxx:1.2       Wed Mar 12 10:13:41 2003
+++ libvob/src/util/Debug.cxx   Sun Apr 20 06:24:04 2003
@@ -34,6 +34,10 @@
 namespace Vob {
 
 namespace Debug {
+    
+    std::ostream *debugStream() {
+       return &std::cout;
+    }
 
   struct IntPtr {
     int *ptr;