compile bug fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/os2/helpwin.h

@@ -12,7 +12,7 @@
 #ifndef _WX_HELPWIN_H_
 #define _WX_HELPWIN_H_
 
-//EK #include "wx/wx.h"
+#include "wx/wx.h"
 
 #if wxUSE_HELP
 

src/common/quantize.cpp

@@ -55,9 +55,15 @@
 #include <stdlib.h>
 #include <string.h>
 
+#if defined(__VISAGECPP__)
+#define RGB_RED_OS2   0
+#define RGB_GREEN_OS2 1
+#define RGB_BLUE_OS2  2
+#else
 #define RGB_RED       0
 #define RGB_GREEN     1
 #define RGB_BLUE      2
+#endif
 #define RGB_PIXELSIZE 3
 
 #define MAXJSAMPLE        255
@@ -145,6 +151,26 @@ typedef j_decompress *j_decompress_ptr;
  * you'll probably want to tweak the histogram sizes too.
  */
 
+#if defined(__VISAGECPP__)
+
+#if RGB_RED_OS2 == 0
+#define C0_SCALE R_SCALE
+#endif
+#if RGB_BLUE_OS2 == 0
+#define C0_SCALE B_SCALE
+#endif
+#if RGB_GREEN_OS2 == 1
+#define C1_SCALE G_SCALE
+#endif
+#if RGB_RED_OS2 == 2
+#define C2_SCALE R_SCALE
+#endif
+#if RGB_BLUE_OS2 == 2
+#define C2_SCALE B_SCALE
+#endif
+
+#else
+
 #if RGB_RED == 0
 #define C0_SCALE R_SCALE
 #endif
@@ -161,6 +187,7 @@ typedef j_decompress *j_decompress_ptr;
 #define C2_SCALE B_SCALE
 #endif
 
+#endif
 
 /*
  * First we have the histogram data structure and routines for creating it.
@@ -528,6 +555,20 @@ median_cut (j_decompress_ptr cinfo, boxptr boxlist, int numboxes,
     /* We want to break any ties in favor of green, then red, blue last.
      * This code does the right thing for R,G,B or B,G,R color orders only.
      */
+#if defined(__VISAGECPP__)
+
+#if RGB_RED_OS2 == 0
+    cmax = c1; n = 1;
+    if (c0 > cmax) { cmax = c0; n = 0; }
+    if (c2 > cmax) { n = 2; }
+#else
+    cmax = c1; n = 1;
+    if (c2 > cmax) { cmax = c2; n = 2; }
+    if (c0 > cmax) { n = 0; }
+#endif
+
+#else
+
 #if RGB_RED == 0
     cmax = c1; n = 1;
     if (c0 > cmax) { cmax = c0; n = 0; }
@@ -536,6 +577,8 @@ median_cut (j_decompress_ptr cinfo, boxptr boxlist, int numboxes,
     cmax = c1; n = 1;
     if (c2 > cmax) { cmax = c2; n = 2; }
     if (c0 > cmax) { n = 0; }
+#endif
+
 #endif
     /* Choose split point along selected axis, and update box bounds.
      * Current algorithm: split at halfway point.