commit 156570906febd26e55778f96653037254f3308bf
author Alexandre Julliard <julliard@winehq.org> Sun May 23 10:25:25 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun May 23 10:25:25 1999 +0000
tree 615e7121dbb58b71ff5d615a72bedd8a4f50968f
parent 158f00ed8d3d04f0188d9b533c1d705681adcc59

Converted to the new debug interface, using script written by Patrik
Stridvall.

objects/dib.c

diff --git a/objects/dib.c b/objects/dib.c
index 017ac72..1d480d4 100644
--- a/objects/dib.c
+++ b/objects/dib.c
@@ -9,7 +9,7 @@
 #include "bitmap.h"
 #include "callback.h"
 #include "dc.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "monitor.h"
 #include "palette.h"
 
@@ -35,7 +35,7 @@
 	case 24: words = (width * 3 + 3)/4; break;
 
 	default:
-            WARN(bitmap, "(%d): Unsupported depth\n", depth );
+            WARN("(%d): Unsupported depth\n", depth );
 	/* fall through */
 	case 32:
 	        words = width;
@@ -107,7 +107,7 @@
         *compr  = 0;
         return 0;
     }
-    WARN(bitmap, "(%ld): wrong size for header\n", header->biSize );
+    WARN("(%ld): wrong size for header\n", header->biSize );
     return -1;
 }
 
@@ -253,7 +253,7 @@
 					     ySrc, startscan, lines, bits,
 					     info, coloruse );
     else {
-        FIXME(bitmap, "unimplemented on hdc %08x\n", hdc);
+        FIXME("unimplemented on hdc %08x\n", hdc);
 	ret = 0;
     }
 
@@ -565,7 +565,7 @@
 	}
     }
 
-    TRACE(bitmap, "biSizeImage = %ld, biWidth = %ld, biHeight = %ld\n",
+    TRACE("biSizeImage = %ld, biWidth = %ld, biHeight = %ld\n",
 	  info->bmiHeader.biSizeImage, info->bmiHeader.biWidth,
 	  info->bmiHeader.biHeight);
 
@@ -640,7 +640,7 @@
         }
         else
         {
-            WARN(bitmap, "(%ld): wrong size for data\n",
+            WARN("(%ld): wrong size for data\n",
                      data->bmiHeader.biSize );
             return 0;
         }
@@ -736,7 +736,7 @@
   if (bmi->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) incr = 4;
   else if (bmi->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) incr = 3;
   else {
-    WARN(bitmap, "Wrong bitmap header size!\n");
+    WARN("Wrong bitmap header size!\n");
     return;
   }
   colors = bmi->bmiHeader.biClrUsed;
@@ -752,11 +752,11 @@
       case 4: pix = pix >> 4; break;
       case 8: break;
       default: 
-        WARN(bitmap, "(%d): Unsupported depth\n", bmi->bmiHeader.biBitCount); 
+        WARN("(%d): Unsupported depth\n", bmi->bmiHeader.biBitCount); 
 	return;
     }
     if (pix >= colors) {
-      WARN(bitmap, "pixel has color index greater than biClrUsed!\n");
+      WARN("pixel has color index greater than biClrUsed!\n");
       return;
     }
     if (loadflags & LR_LOADMAP3DCOLORS) c_W = c_F;