| <dle...@operamail.com> |
mp;lt;/span&gt;&lt;span class="cx"&gt; /////////////////////////////////////////////////////////////////////////////
&lt;/span&gt;&lt;span class="rem"&gt;-// Name: palette.cpp
&lt;/span&gt;&lt;span class="add"&gt;+// Name: src/msw/palette.cpp
&lt;/span&gt;&lt;span class="cx"&gt; // Purpose: wxPalette
// Author: Julian Smart
// Modified by:
// Created: 04/01/98
&lt;/span&gt;&lt;span class="rem"&gt;-// RCS-ID: $Id: palette.cpp,v 1.15 2005/09/23 12:55:07 MR Exp $
&lt;/span&gt;&lt;span class="add"&gt;+// RCS-ID: $Id: palette.cpp,v 1.16 2005/10/06 14:37:39 ABX Exp $
&lt;/span&gt;&lt;span class="cx"&gt; // Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
&lt;/span&gt;&lt;span class="lines"&gt;@@ -33,7 +33,7 @@
&lt;/span&gt;&lt;span class="cx"&gt;
wxPaletteRefData::wxPaletteRefData(void)
{
&lt;/span&gt;&lt;span class="rem"&gt;- m_hPalette = 0;
&lt;/span&gt;&lt;span class="add"&gt;+ m_hPalette = 0;
&lt;/span&gt;&lt;span class="cx"&gt; }
wxPaletteRefData::~wxPaletteRefData(void)
&lt;/span&gt;&lt;span class="lines"&gt;@@ -67,71 +67,72 @@
&lt;/span&gt;&lt;span class="cx"&gt;
bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)
{
&lt;/span&gt;&lt;span class="rem"&gt;- UnRef();
&lt;/span&gt;&lt;span class="add"&gt;+ UnRef();
&lt;/span&gt;&lt;span class="cx"&gt;
#if defined(__WXMICROWIN__)
&lt;/span&gt;&lt;span class="rem"&gt;- return false;
&lt;/span&gt;&lt;span class="add"&gt;+ return false;
&lt;/span&gt;&lt;span class="cx"&gt;
#else
&lt;/span&gt;&lt;span class="rem"&gt;- m_refData = new wxPaletteRefData;
&lt;/span&gt;&lt;span class="add"&gt;+ m_refData = new wxPaletteRefData;
&lt;/span&gt;&lt;span classcx"&gt;
&lt;/span&gt;&lt;span class="rem"&gt;- NPLOGPALETTE npPal = (NPLOGPALETTE)LocalAlloc(LMEM_FIXED, sizeof(LOGPALETTE) +
- (WORD)n * sizeof(PALETTEENTRY));
- if (!npPal)
- return false;
&lt;/span&gt;&lt;span class="add"&gt;+ NPLOGPALETTE npPal = (NPLOGPALETTE)LocalAlloc(LMEM_FIXED, sizeof(LOGPALETTE) +
+ (WORD)n * sizeof(PALETTEENTRY));
+ if (!npPal)
+ return false;
&lt;/span&gt;&lt;span class="cx"&gt;
&lt;/span&gt;&lt;span class="rem"&gt;- npPal-&amp;gt;palVersion = 0x300;
- npPal-&amp;gt;palNumEntries = (WORD)n;
&lt;/span&gt;&lt;span class="add"&gt;+ npPal-&amp;gt;palVersion = 0x300;
+ npPal-&amp;gt;palNumEntries = (WORD)n;
&lt;/span&gt;&lt;span class="cx"&gt;
&lt;/span&gt;&lt;span class="rem"&gt;- int i;
- for (i = 0; i &amp;lt; n; i ++)
- {
- npPal-&amp;gt;palPalEntry[i].peRed = red[i];
- npPal-&amp;gt;palPalEntry[i].peGreen = green[i];
- npPal-&amp;gt;palPalEntry[i].peBlue = blue[i];
- npPal-&amp;gt;palPalEntry[i].peFlags = 0;
- }
- M_PALETTEDATA-&amp;gt;m_hPalette = (WXHPALETTE) CreatePalette((LPLOGPALETTE)npPal);
- LocalFree((HANDLE)npPal);
- return true;
&lt;/span&gt;&lt;span class="add"&gt;+ int i;
+ for (i = 0; i &amp;lt; n; i ++)
+ {
+ npPal-&amp;gt;palPalEntry[i].peRed = red[i];
+ npPal-&amp;gt;palPalEntry[i].peGreen = green[i];
+ npPal-&amp;gt;palPalEntry[i].peBlue = blue[i];
+ npPal-&amp;gt;palPalEntry[i].peFlags = 0;
+ }
+ M_PALETTEDATA-&amp;gt;m_hPalette = (WXHPALETTE) CreatePalette((LPLOGPALETTE)npPal);
+ LocalFree((HANDLE)npPal);
+ return true;
&lt;/span&gt;&lt;span class="cx"&gt;
#endif
}
&lt;/span&gt;&lt;span class="rem"&gt;-int wxPalette::GetPixel(const unsigned char red, const unsigned char green, const unsigned char blue) const
&lt;/span&gt;&lt;span class="add"&gt;+int wxPalette::GetPixel(unsigned char red, unsigned char green, unsigned char blue) const
&lt;/span&gt;&lt;span class="cx"&gt; {
#ifdef __WXMICROWIN__
&lt;/span&gt;&lt;span class="rem"&gt;- return 0;
&lt;/span&gt;&lt;span class="add"&gt;+ returpan&gt;&lt;span class="cx"&gt; #endif
#if wxUSE_PROLOGIO
&lt;/span&gt;&lt;span class="rem"&gt;-#include &amp;lt;wx/deprecated/wxexpr.h&amp;gt;
&lt;/span&gt;&lt;span class="add"&gt;+#include &amp;quot;wx/deprecated/wxexpr.h&amp;quot;
&lt;/span&gt;&lt;span class="cx"&gt; #endif
#include &amp;quot;wx/ogl/ogl.h&amp;quot;
&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
&lt;a id="trunkinternalwxcontribsrcoglcanvascpp"&gt;&lt;/a&gt;
&lt;div class="modfile"&gt;&lt;h4&gt;Modified: trunk/internal/wx/contrib/src/ogl/canvas.cpp (7662 =&gt; 7663)&lt;/h4&gt;
&lt;pre class="diff"&gt;
&lt;span class="info"&gt;--- trunk/internal/wx/contrib/src/ogl/canvas.cpp 2005-10-06 19:04:40 UTC (rev 7662)
+++ trunk/internal/wx/contrib/src/ogl/canvas.cpp 2005-10-06 19:28:02 UTC (rev 7663)
&lt;/span&gt;&lt;span class="lines"&gt;@@ -4,7 +4,7 @@
&lt;/span&gt;&lt;span class="cx"&gt; // Author: Julian Smart
// Modified by:
// Created: 12/07/98
&lt;/span&gt;&lt;span class="rem"&gt;-// RCS-ID: $Id: canvas.cpp,v 1.17 2005/09/23 12:48:04 MR Exp $
&lt;/span&gt;&lt;span class="add"&gt;+// RCS-ID: $Id: canvas.cpp,v 1.18 2005/10/06 18:17:21 ABX Exp $
&lt;/span&gt;&lt;span class="cx"&gt; // Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
&lt;/span&gt;&lt;span class="lines"&gt;@@ -17,11 +17,11 @@
&lt;/span&gt;&lt;span class="cx"&gt; #endif
#ifndef WX_PRECOMP
&lt;/span&gt;&lt;span class="rem"&gt;-#include &amp;lt;wx/wx.h&amp;gt;
&lt;/span&gt;&lt;span class="add"&gt;+#include &amp;quot;wx/wx.h&amp;quot;
&lt;/span&gt;&lt;span class="cx"&gt; #endif
#if wxUSE_PROLOGIO
&lt;/span&gt;&lt;span class="rem"&gt;-#include &amp;lt;wx/deprecated/wxexpr.h&amp;gt;
&lt;/span&gt;&lt;span class="add"&gt;+#include &amp;quot;wx/deprecated/wxexpr.h&amp;quot;
&lt;/span&gt;&lt;span class="cx"&gt; #endif
#ifdef new
&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
&lt;a id="trunkinternalwxcontribsrcoglcompositcpp"&gt;&lt;/a&gt;
&lt;div class="modfile"&gt;&lt;h4&gt;Modified: trunk/internal/wx/contrib/src/ogl/composit.cpp (7662 =&gt; 7663)&lt;/h4&gt;
&lt;pre class="diff"&gt;
&lt;span class="info"&gt;--- trunk/internal/wx/contrib/src/ogl/composit.cpp 2005-10-06 19:04:40 UTC (rev 7662)
+++ trunk/internal/wx/contrib/src/ogl/composit.cpp 2005-10-06 19:28:02 UTC (rev 7663)
&lt;/span&gt;&lt;span class="lines"&gt;@@ -4,7 +4,7 @@
&lt;/span&gt;&lt;span class="cx"&gt; // Author: Julian Smart
// Modified by:
// Created: 12/07/98
&lt;/span&gt;&lt;span class="rem"&gt;-// RCS-ID: $Id: composit.cpp,v 1.16 2005/09/23 12:48:04 MR Exp $
&lt;/span&gt;&lt;span class="add"&gt;+// RCS-ID: $Id: composit.cpp,v 1.17 2005/10/06 18:17:21 ABX Exp $
&lt;/span&gt;&lt;span class="cx"&gt; // Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
&lt;/span&gt;&lt;span class="lines"&gt;@@ -17,11 +17,11 @@
&lt;/span&gt;&lt;span class="cx"&gt; #endif
#ifndef WX_PRECOMP
&lt;/span&gt;&lt;span class="rem"&gt;-#include &amp;lt;wx/wx.h&amp;gt;
&lt;/span&gt;&lt;span class="add"&gt;+#include &amp;quot;wx/wx.h&amp;quot;
&lt;/span&gt;&lt;span class="cx"&gt; #endif
#if wxUSE_PROLOGIO
&lt;/span&gt;&lt;span class="rem"&gt;-#include &amp;lt;wx/deprecated/wxexpr.h&amp;gt;
&lt;/span&gt;&lt;span class="add"&gt;+#include &amp;quot;wx/deprecated/wxexpr.h&amp;quot;
&lt;/span&gt;&lt;span class="cx"&gt; #endif
#include &amp;quot;wx/ogl/ogl.h&amp;quot;
&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
&lt;a id="trunkinternalwxcontribsrcoglco npPal-&amp;gt;palPalEntry[i].peFlags = 0;
- }
- M_PALETTEDATA-&amp;gt;m_hPalette = (WXHPALETTE) CreatePalette((LPLOGPALETTE)npPal);
- LocalFree((HANDLE)npPal);
- return true;
&lt;/span&gt;&lt;spalowerWorkerThread.java:81)
at
org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:689)
at java.lang.Thread.run(Thread.java:619)
08-Nov-2008 16:34:52 org.apache.catalina.core.StandardWrapperValve invoke
SEVERE: Servlet.service() for servlet cmp threw exception
java.lang.NoCla;
+ properties.add(new ScheduleOutboxURL(getResourceLocator(), user));
+ }
+
</ins> |
Sat, 22 Nov, 11:50 |