From 4eea371e4f4b18d64325ffa7be17690d392038eb Mon Sep 17 00:00:00 2001 From: cxl Date: Tue, 18 Oct 2011 12:56:06 +0000 Subject: [PATCH] *CtrlCore: fixed a problem in GetPropertyInts git-svn-id: svn://ultimatepp.org/upp/trunk@4045 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CtrlCore/X11App.cpp | 4 ++-- uppsrc/CtrlCore/init | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/uppsrc/CtrlCore/X11App.cpp b/uppsrc/CtrlCore/X11App.cpp index 8110b3e1f..e7d35c1df 100644 --- a/uppsrc/CtrlCore/X11App.cpp +++ b/uppsrc/CtrlCore/X11App.cpp @@ -124,8 +124,8 @@ Vector GetPropertyInts(Window w, Atom property, Atom rtype) Vector result; String p = GetProperty(w, property, rtype); const long int *ptr = (const long int *)~p; - const long int *lim = ptr + p.GetLength() / 4; - result.Reserve(p.GetLength() / 4); + const long int *lim = ptr + p.GetLength() / sizeof(long int); + result.Reserve(p.GetLength() / sizeof(long int)); while(ptr < lim) result.Add(*ptr++); return result; diff --git a/uppsrc/CtrlCore/init b/uppsrc/CtrlCore/init index 7650143fb..a7248578f 100644 --- a/uppsrc/CtrlCore/init +++ b/uppsrc/CtrlCore/init @@ -3,7 +3,7 @@ #include "Draw/init" #include "plugin\bmp/init" #include "RichText/init" -#define BLITZ_INDEX__ F80D5AB9C140C53FA4A54CDF51E828146 +#define BLITZ_INDEX__ FB8F4A982C72471DC245DDFAE3ACBB156 #include "CtrlCore.icpp" #undef BLITZ_INDEX__ #endif