]>
Commit | Line | Data |
---|---|---|
706df2f9 JB |
1 | --- XmHTML-1.1.10/lib/Motif/XCC.c.orig 2015-10-26 11:22:55.113545877 +0100 |
2 | +++ XmHTML-1.1.10/lib/Motif/XCC.c 2018-05-13 21:33:04.770439480 +0200 | |
3 | @@ -124,6 +124,9 @@ | |
4 | #include <X11/Xatom.h> | |
5 | #include <X11/Intrinsic.h> | |
6 | ||
7 | +#ifdef HAVE_CONFIG_H | |
8 | +#include "config.h" | |
9 | +#endif | |
10 | #ifdef DMALLOC | |
11 | #include "dmalloc.h" | |
12 | #endif | |
13 | @@ -131,6 +134,10 @@ | |
14 | #include "toolkit.h" | |
15 | #include XmHTMLPrivateHeader | |
16 | #include "XCCP.h" | |
17 | +#include "XmHTMLconf.h" | |
18 | +#include "debug.h" | |
19 | + | |
20 | +#define MEMBER_CLASS class | |
21 | ||
22 | /*** External Function Prototype Declarations ***/ | |
23 | ||
24 | @@ -360,7 +367,9 @@ | |
25 | { | |
26 | XColor color; | |
27 | ||
28 | +#ifdef DEBUG | |
29 | _XmHTMLWarning(__WFUNC__(NULL, "_initBW"), XMHTML_MSG_5); | |
30 | +#endif | |
31 | ||
32 | _xcc->mode = MODE_BW; | |
33 | ||
34 | @@ -731,7 +740,9 @@ | |
35 | ((xcc->visual != DefaultVisual(_dpy, DefaultScreen(_dpy))) && | |
36 | _colormap == DefaultColormap(_dpy, DefaultScreen(_dpy)))) | |
37 | { | |
38 | +#ifdef DEBUG | |
39 | _XmHTMLWarning(__WFUNC__(w, "XCCCreate"), XMHTML_MSG_6); | |
40 | +#endif | |
41 | xcc->colormap = XCreateColormap(_dpy, | |
42 | RootWindow(_dpy, DefaultScreen(_dpy)), xcc->visual, | |
43 | AllocNone); | |
44 | @@ -1455,7 +1466,9 @@ | |
45 | /* see if the colormap has any colors to read */ | |
46 | if(cmapsize < 1) | |
47 | { | |
48 | +#ifdef DEBUG | |
49 | _XmHTMLWarning(__WFUNC__(NULL, "XCCGetPixels"), XMHTML_MSG_7); | |
50 | +#endif | |
51 | return; | |
52 | } | |
53 | #ifdef DEBUG | |
54 | @@ -1711,8 +1724,10 @@ | |
55 | ||
56 | if(cmapsize < 0) | |
57 | { | |
58 | +#ifdef DEBUG | |
59 | _XmHTMLWarning(__WFUNC__(NULL, "XCCGetPixelsIncremental"), | |
60 | XMHTML_MSG_7); | |
61 | +#endif | |
62 | return; | |
63 | } | |
64 | #ifdef DEBUG |