Mailing-List: contact ooo-dev-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: ooo-dev@incubator.apache.org
Received-SPF: pass (athena.apache.org: domain of
 ariel.constenla.haile@gmail.com designates 209.85.160.175 as permitted
 sender)
Date: Tue, 1 Nov 2011 03:12:48 -0300
From: Ariel Constenla-Haile <ariel.constenla.haile@gmail.com>
To: ooo-dev@incubator.apache.org
Subject: Re: [code] [issue 118517] Twain header update for testing
Message-ID: <20111101061248.GB16445@localhost>
References: <1318815027.49434.YahooMailClassic@web113518.mail.gq1.yahoo.com>
 <1319839962.79868.YahooMailClassic@web113517.mail.gq1.yahoo.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="8X7/QrJGcKSMr1RN"
Content-Disposition: inline
In-Reply-To: <1319839962.79868.YahooMailClassic@web113517.mail.gq1.yahoo.com>
User-Agent: Mutt/1.5.21 (2010-09-15)

--8X7/QrJGcKSMr1RN
Content-Type: multipart/mixed; boundary="kXdP64Ggrk/fb43R"
Content-Disposition: inline


--kXdP64Ggrk/fb43R
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Pedro,

On Fri, Oct 28, 2011 at 03:12:42PM -0700, Pedro Giffuni wrote:
> Hi again;
>=20
> I waited for a while but I didn't get any report on how
> well (or bad) the new twain header works while building
> on Windows. I am pretty sure the authors take care of
> GCC and most commercial compilers so the only special
> case is mingw32.
>=20
> Ming32 is something that was indeed hacked into our old
> header so I adapted the code to suit our previous behavior
> and now that I have something robust I have committed it.
> I did everything I could to ensure this works but I am not
> perfect, and there has been little feedback, so please
> don't panic and let me know if something related with
> scanners changes.

I didn't test scanning, but building breaks:

ifdef defined(TWH_CMP_MING32)
     #pragma pack (push, 2)
#elif TWH_CMP_MSC

see attached patch.

Regards
--=20
Ariel Constenla-Haile
La Plata, Argentina

--kXdP64Ggrk/fb43R
Content-Type: text/plain; charset=utf-8
Content-Disposition: attachment; filename="extensions.source.scanner.txt"
Content-Transfer-Encoding: quoted-printable

Compiling: extensions/source/scanner/scanwin.cxx
C:/ARCHIV~1/MICROS~1.0/VC/bin/cl.exe  -Zm500 -Zc:forScope,wchar_t- -GR -GS =
-c -nologo -Gs  -Gy -Ob1 -Oxs -Oy- -DENABLE_LAYOUT=3D0 -DENABLE_LAYOUT_EXPE=
RIMENTAL=3D0 -Gd  -I. -I../../wntmsci12.pro/inc/scn -I../inc -I../../inc/pc=
h -I../../inc -I../../WIN/inc -I../../wntmsci12.pro/inc -I. -IY:/apache/tru=
nk/main/solver/340/wntmsci12.pro/inc/stl -IY:/apache/trunk/main/solver/340/=
wntmsci12.pro/inc/external -IY:/apache/trunk/main/solver/340/wntmsci12.pro/=
inc -IY:/apache/trunk/main/solenv/wntmsci12/inc -IY:/apache/trunk/main/sole=
nv/inc -IY:/apache/trunk/main/res -IY:/apache/trunk/main/solver/340/wntmsci=
12.pro/inc/stl -IC:/ARCHIV~1/Java/JDK16~2.0_1/include/win32 -IC:/ARCHIV~1/J=
ava/JDK16~2.0_1/include -IC:/ARCHIV~1/MICROS~3/Windows/v6.1/include -IC:/AR=
CHIV~1/MICROS~1.0/VC/include -IC:/ARCHIV~1/MI599E~1/include -IC:/ARCHIV~1/M=
I599E~1/include  -IY:/apache/trunk/main/solver/340/wntmsci12.pro/inc/offuh =
-I. -I../../res -I. -Wall -wd4061 -wd4127 -wd4191 -wd4217 -wd4250 -wd4251 -=
wd4275     -wd4290 -wd4294 -wd4355 -wd4511 -wd4512 -wd4514 -wd4611 -wd4625 =
-wd4626     -wd4640 -wd4675 -wd4710 -wd4711 -wd4786 -wd4800 -wd4820 -wd4503=
 -wd4619     -wd4365 -wd4668 -wd4738 -wd4826 -wd4350 -wd4505 -wd4692 -wd418=
9 -wd4005     -wd4180   -DWNT -DWNT -DNT351 -DMSC -DM1500 -DINTEL -D_X86_=
=3D1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONF=
ORMING_SWPRINTFS -DFULL_DESK -DBOOST_MEM_FN_ENABLE_CDECL -DSTLPORT_VERSION=
=3D400 -D_MT -DWINVER=3D0x0500 -D_WIN32_WINNT=3D0x0500 -D_WIN32_IE=3D0x0500=
 -DCPPU_ENV=3Dmsci -DSUPD=3D340 -DPRODUCT -DNDEBUG -DOSL_DEBUG_LEVEL=3D0 -D=
OPTIMIZE -DCUI -DSOLAR_JAVA   -DSHAREDLIB -D_DLL_ -DWIN32 -D_MT -D_DLL -DWI=
N32 -D_MT -D_DLL  -EHa -DEXCEPTIONS_ON  -Fo../../wntmsci12.pro/slo/scanwin.=
obj Y:/apache/trunk/main/extensions/source/scanner/scanwin.cxx=20
: &&     PATH=3D/cygdrive/y/apache/trunk/main/solver/340/wntmsci12.pro/bin$=
{PATH:+:${PATH}} Y:/apache/trunk/main/solver/340/wntmsci12.pro/bin/makedepe=
nd @C:/cygwin/tmp/mkFpvjxJ > ../../wntmsci12.pro/misc/s_scanwin.dpcc
scanwin.cxx=0D
Y:/apache/trunk/main/solver/340/wntmsci12.pro/inc/external\twain/twain.h(18=
4) : warning C4067: s=A1mbolos (token) inesperados despu=82s de la directiv=
a del preprocesador; se esperaba una nueva l=A1nea=0D
Y:/apache/trunk/main/solver/340/wntmsci12.pro/inc/external\twain/twain.h(18=
6) : fatal error C1017: expresi=A2n constante de tipo entero no v=A0lida=0D
dmake:  Error code 2, while making '../../wntmsci12.pro/slo/scanwin.obj'

--kXdP64Ggrk/fb43R
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="twain.patch"
Content-Transfer-Encoding: quoted-printable

diff --git a/twain/inc/twain.h b/twain/inc/twain.h
index 95a2a55..11a93e4 100644
--- a/twain/inc/twain.h
+++ b/twain/inc/twain.h
@@ -181,9 +181,9 @@
=20
=20
 /* Set the packing: this occurs before any structures are defined */
-#ifdef defined(TWH_CMP_MING32)
+#if defined(TWH_CMP_MING32)
     #pragma pack (push, 2)
-#elif TWH_CMP_MSC
+#elif defined(TWH_CMP_MSC)
     #pragma pack (push, before_twain)
     #pragma pack (2)
 #elif defined(TWH_CMP_GNU)
@@ -2184,9 +2184,9 @@ typedef struct {
 } TW_ENTRYPOINT, FAR * pTW_ENTRYPOINT;
=20
 /* Restore the previous packing alignment: this occurs after all structure=
s are defined */
-#ifdef defined(TWH_CMP_MING32)
+#if defined(TWH_CMP_MING32)
     #pragma pack (pop)
-#elif TWH_CMP_MSC
+#elif defined(TWH_CMP_MSC)
     #pragma pack (pop, before_twain)
 #elif defined(TWH_CMP_GNU)
     #pragma pack (pop, before_twain)

--kXdP64Ggrk/fb43R--

--8X7/QrJGcKSMr1RN
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBCAAGBQJOr43gAAoJEMjP1bm45QNW2vAQAKpUcey2QftHc6Vwv4i4IPK9
LZa+5tsAWlKsqGVoKgZqQup3/5I4/fnAC8+wSWGQd+3fGE7dRiT2MDkJdTvmEqax
ZTXbBP820PWcFqswM7WEbgeKz75LiMegeL4+gg81wQHQJzQzi5iRi3j6FVW/CtDw
FVwqi+gG1b53YGtylhiZ1ApaDCl6eQ8Sldn6d8sFK2Bdn9jyh+zLLLj9l8Vb8/6e
8Old+Q06QuT6xlr1ZhffvD7Xdj58dxsEr8WUVxWtpPiCT84ShEeQgKBXYCbpgKr5
i7cs7rTFFhUZ8l8n84jau3wFLZuFvKPZjftEf28zabePGyXhZwmj2MPqkCPQne9v
1VfQjHKKnuFZ2H+Pw34IMOynsEYgUPjjEUOLN+MsMGUTMK2Q6mG6qCcub9GnJcg2
tyYIPi0UvEItHmlNVfeLiz5Agg0EqxOXOzbpP/YtOdj72x2NJrniAw027R+SaGr1
ZOiSXURYkQL8Tb1a6valJj5idylkDr2l+EE9TcKFakWw8MLQjIiznTYUvZfjuWpT
egw1UkipQZsw+4b61J1t1ncG45YhN+lH33g9KuKsXA3OxMabLhP/YsUnBBn6nI2s
S+c3St7jTM6o45pJ5FW0b5P7IF0hZQX33fPtUgHdcyOJlJlMaZhIBEC1inll4GA2
0+DNmybfQYJ1xLC9x0By
=Rpaa
-----END PGP SIGNATURE-----

--8X7/QrJGcKSMr1RN--