From raosanath at helixcommunity.org Tue Sep 1 00:42:36 2009
From: raosanath at helixcommunity.org (raosanath@helixcommunity.org)
Date: Tue Sep 1 09:48:04 2009
Subject: [Common-cvs] netio/platform/symbian hxsymbianresolver.cpp, 1.1,
1.1.14.1
Message-ID:
Update of /cvsroot/common/netio/platform/symbian
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv22560
Modified Files:
Tag: hxclient_2_2_3_cayennes
hxsymbianresolver.cpp
Log Message:
Modified by: sanath.rao@sonyericsson.com
Date: <08:27:09>
Project:
Bug Number: 9452
Bug URL: https://bugs.helixcommunity.org/show_bug.cgi?id=9452
Synopsis: 9452 - Helix passing a stack based descriptor into an asynchronous IPC call.
Overview: Bug Description in above links contains, detail description of the problem and the reason why fixes were done.
Files Added:
None
Files Modified:
\helix\source\common\netio\platform\symbian\hxsymbianresolver.cpp
Image Size and Heap Use impact (Client -Only):
N/A
Platforms and Profiles Affected:
BIF branch (hxclient_2_2_3_cayennes)
Target(s) (symbianMmf_wm)
Profile (helix-client-s60-50-mmf-mdf-dsp)
Platform (S60 5.0/ARMV5)
Distribution Libraries Affected:
netiolib.lib
Distribution library impact and planned action:
N/A
Platforms and Profiles Build Verified:
BIF branch (hxclient_2_2_3_cayennes)
Target(s) (symbianMmf_wm)
Profile (helix-client-s60-50-mmf-mdf-dsp)
Platform (S60 5.0/ARMV5)
Platforms and Profiles Functionality verified:
BIF branch (hxclient_2_2_3_cayennes)(hxclient_2_1_0_cayennes)(HEAD)
Target(s) (symbianMmf_wm)
Profile (helix-client-s60-50-mmf-mdf-dsp)
Platform (S60 5.0/ARMV5)
Branch: hxclient_2_2_3_cayennes
Copyright assignment:
3. My company (Sony Ericsson Mobile Communication) submits this code under the terms
of a commercial contribution agreement with RealNetworks,
and I am authorized to contribute this code under said agreement.
QA Instructions:
N/A
Index: hxsymbianresolver.cpp
===================================================================
RCS file: /cvsroot/common/netio/platform/symbian/hxsymbianresolver.cpp,v
retrieving revision 1.1
retrieving revision 1.1.14.1
diff -u -d -r1.1 -r1.1.14.1
--- hxsymbianresolver.cpp 29 Sep 2005 21:02:47 -0000 1.1
+++ hxsymbianresolver.cpp 1 Sep 2009 08:42:33 -0000 1.1.14.1
@@ -1,7 +1,7 @@
/* ***** BEGIN LICENSE BLOCK *****
- *
+ *
* Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.
- *
+ *
* The contents of this file, and the files included with this file,
* are subject to the current version of the RealNetworks Public
* Source License (the "RPSL") available at
@@ -15,7 +15,7 @@
* to this file, the RCSL. Please see the applicable RPSL or RCSL for
* the rights, obligations and limitations governing use of the
* contents of the file.
- *
+ *
* Alternatively, the contents of this file may be used under the
* terms of the GNU General Public License Version 2 or later (the
* "GPL") in which case the provisions of the GPL are applicable
@@ -27,23 +27,23 @@
* the GPL. If you do not delete the provisions above, a recipient may
* use your version of this file under the terms of any one of the
* RPSL, the RCSL or the GPL.
- *
+ *
* This file is part of the Helix DNA Technology. RealNetworks is the
* developer of the Original Code and owns the copyrights in the
* portions it created.
- *
+ *
* This file, and the files included with this file, is distributed
* and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY
* KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS
* ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET
* ENJOYMENT OR NON-INFRINGEMENT.
- *
+ *
* Technology Compatibility Kit Test Suite(s) Location:
* http://www.helixcommunity.org/content/tck
- *
+ *
* Contributor(s):
- *
+ *
* ***** END LICENSE BLOCK ***** */
#include "hxcom.h"
@@ -197,7 +197,7 @@
else
{
m_pRequest->m_pNode = node;
- m_pRequest->m_uPort = port;
+ m_pRequest->m_uPort = port;
}
m_type = EResolvingByName;
@@ -257,8 +257,8 @@
// XXXAG better to include in com i/f
if(m_resolver.Open( ((HXSymbianAccessPointManager*)m_pAPManager)->
GetRSocketServ(),
- KAfInet,
- KProtocolInetUdp,
+ KAfInet,
+ KProtocolInetUdp,
((HXSymbianAccessPointManager*)m_pAPManager)->
GetRConnection()) == KErrNone)
{
@@ -315,10 +315,10 @@
}
else
{
- status = hxr;
+ status = hxr;
}
}
- m_pResponse->GetAddrInfoDone(status, 1, &addr);
+ m_pResponse->GetAddrInfoDone(status, 1, &addr);
HX_RELEASE(addr);
HX_DELETE(m_pRequest);
}
@@ -342,9 +342,9 @@
status = HXR_OUTOFMEMORY;
}
}
- m_pResponse->GetNameInfoDone(status,
- (const char *)hostStr,
- (const char *)portStr);
+ m_pResponse->GetNameInfoDone(status,
+ (const char *)hostStr,
+ (const char *)portStr);
delete hostName;
HX_DELETE(m_pRequest);
}
@@ -382,12 +382,12 @@
// do nothing
}
-void
+void
CHXResolver::StartResolve()
{
if(m_type == EResolvingByName)
{
- m_resolver.GetByName(m_pRequest->m_pNode->Des(), m_nameEntry, iStatus);
+ m_resolver.GetByName(*(m_pRequest->m_pNode), m_nameEntry, iStatus);
}
else if(m_type == EResolvingByAddress)
{
From raosanath at helixcommunity.org Tue Sep 1 00:42:36 2009
From: raosanath at helixcommunity.org (raosanath@helixcommunity.org)
Date: Tue Sep 1 09:48:05 2009
Subject: [Common-cvs] netio/platform/symbian hxsymbianresolver.cpp, 1.1,
1.1.14.1
Message-ID:
Update of /cvsroot/common/netio/platform/symbian
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv22560
Modified Files:
Tag: hxclient_2_2_3_cayennes
hxsymbianresolver.cpp
Log Message:
Modified by: sanath.rao@sonyericsson.com
Date: <08:27:09>
Project:
Bug Number: 9452
Bug URL: https://bugs.helixcommunity.org/show_bug.cgi?id=9452
Synopsis: 9452 - Helix passing a stack based descriptor into an asynchronous IPC call.
Overview: Bug Description in above links contains, detail description of the problem and the reason why fixes were done.
Files Added:
None
Files Modified:
\helix\source\common\netio\platform\symbian\hxsymbianresolver.cpp
Image Size and Heap Use impact (Client -Only):
N/A
Platforms and Profiles Affected:
BIF branch (hxclient_2_2_3_cayennes)
Target(s) (symbianMmf_wm)
Profile (helix-client-s60-50-mmf-mdf-dsp)
Platform (S60 5.0/ARMV5)
Distribution Libraries Affected:
netiolib.lib
Distribution library impact and planned action:
N/A
Platforms and Profiles Build Verified:
BIF branch (hxclient_2_2_3_cayennes)
Target(s) (symbianMmf_wm)
Profile (helix-client-s60-50-mmf-mdf-dsp)
Platform (S60 5.0/ARMV5)
Platforms and Profiles Functionality verified:
BIF branch (hxclient_2_2_3_cayennes)(hxclient_2_1_0_cayennes)(HEAD)
Target(s) (symbianMmf_wm)
Profile (helix-client-s60-50-mmf-mdf-dsp)
Platform (S60 5.0/ARMV5)
Branch: hxclient_2_2_3_cayennes
Copyright assignment:
3. My company (Sony Ericsson Mobile Communication) submits this code under the terms
of a commercial contribution agreement with RealNetworks,
and I am authorized to contribute this code under said agreement.
QA Instructions:
N/A
Index: hxsymbianresolver.cpp
===================================================================
RCS file: /cvsroot/common/netio/platform/symbian/hxsymbianresolver.cpp,v
retrieving revision 1.1
retrieving revision 1.1.14.1
diff -u -d -r1.1 -r1.1.14.1
--- hxsymbianresolver.cpp 29 Sep 2005 21:02:47 -0000 1.1
+++ hxsymbianresolver.cpp 1 Sep 2009 08:42:33 -0000 1.1.14.1
@@ -1,7 +1,7 @@
/* ***** BEGIN LICENSE BLOCK *****
- *
+ *
* Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.
- *
+ *
* The contents of this file, and the files included with this file,
* are subject to the current version of the RealNetworks Public
* Source License (the "RPSL") available at
@@ -15,7 +15,7 @@
* to this file, the RCSL. Please see the applicable RPSL or RCSL for
* the rights, obligations and limitations governing use of the
* contents of the file.
- *
+ *
* Alternatively, the contents of this file may be used under the
* terms of the GNU General Public License Version 2 or later (the
* "GPL") in which case the provisions of the GPL are applicable
@@ -27,23 +27,23 @@
* the GPL. If you do not delete the provisions above, a recipient may
* use your version of this file under the terms of any one of the
* RPSL, the RCSL or the GPL.
- *
+ *
* This file is part of the Helix DNA Technology. RealNetworks is the
* developer of the Original Code and owns the copyrights in the
* portions it created.
- *
+ *
* This file, and the files included with this file, is distributed
* and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY
* KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS
* ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET
* ENJOYMENT OR NON-INFRINGEMENT.
- *
+ *
* Technology Compatibility Kit Test Suite(s) Location:
* http://www.helixcommunity.org/content/tck
- *
+ *
* Contributor(s):
- *
+ *
* ***** END LICENSE BLOCK ***** */
#include "hxcom.h"
@@ -197,7 +197,7 @@
else
{
m_pRequest->m_pNode = node;
- m_pRequest->m_uPort = port;
+ m_pRequest->m_uPort = port;
}
m_type = EResolvingByName;
@@ -257,8 +257,8 @@
// XXXAG better to include in com i/f
if(m_resolver.Open( ((HXSymbianAccessPointManager*)m_pAPManager)->
GetRSocketServ(),
- KAfInet,
- KProtocolInetUdp,
+ KAfInet,
+ KProtocolInetUdp,
((HXSymbianAccessPointManager*)m_pAPManager)->
GetRConnection()) == KErrNone)
{
@@ -315,10 +315,10 @@
}
else
{
- status = hxr;
+ status = hxr;
}
}
- m_pResponse->GetAddrInfoDone(status, 1, &addr);
+ m_pResponse->GetAddrInfoDone(status, 1, &addr);
HX_RELEASE(addr);
HX_DELETE(m_pRequest);
}
@@ -342,9 +342,9 @@
status = HXR_OUTOFMEMORY;
}
}
- m_pResponse->GetNameInfoDone(status,
- (const char *)hostStr,
- (const char *)portStr);
+ m_pResponse->GetNameInfoDone(status,
+ (const char *)hostStr,
+ (const char *)portStr);
delete hostName;
HX_DELETE(m_pRequest);
}
@@ -382,12 +382,12 @@
// do nothing
}
-void
+void
CHXResolver::StartResolve()
{
if(m_type == EResolvingByName)
{
- m_resolver.GetByName(m_pRequest->m_pNode->Des(), m_nameEntry, iStatus);
+ m_resolver.GetByName(*(m_pRequest->m_pNode), m_nameEntry, iStatus);
}
else if(m_type == EResolvingByAddress)
{
From raosanath at helixcommunity.org Tue Sep 1 06:53:07 2009
From: raosanath at helixcommunity.org (raosanath@helixcommunity.org)
Date: Tue Sep 1 15:58:33 2009
Subject: [Common-cvs] netio/platform/symbian hxsymbianresolver.cpp, 1.1,
1.1.2.1
Message-ID:
Update of /cvsroot/common/netio/platform/symbian
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv7589
Modified Files:
Tag: hxclient_2_1_0_cayennes
hxsymbianresolver.cpp
Log Message:
Modified by: sanath.rao@sonyericsson.com
Date: <08:27:09>
Project:
Bug Number: 9452
Bug URL: https://bugs.helixcommunity.org/show_bug.cgi?id=9452
Synopsis: 9452 - Helix passing a stack based descriptor into an asynchronous IPC call.
Overview: Bug Description in above links contains, detail description of the problem and the reason why fixes were done.
Files Added:
None
Files Modified:
\helix\source\common\netio\platform\symbian\hxsymbianresolver.cpp
Image Size and Heap Use impact (Client -Only):
N/A
Platforms and Profiles Affected:
BIF branch (hxclient_2_2_3_cayennes)
Target(s) (symbianMmf_wm)
Profile (helix-client-s60-50-mmf-mdf-dsp)
Platform (S60 5.0/ARMV5)
Distribution Libraries Affected:
netiolib.lib
Distribution library impact and planned action:
N/A
Platforms and Profiles Build Verified:
BIF branch (hxclient_2_2_3_cayennes)
Target(s) (symbianMmf_wm)
Profile (helix-client-s60-50-mmf-mdf-dsp)
Platform (S60 5.0/ARMV5)
Platforms and Profiles Functionality verified:
BIF branch (hxclient_2_2_3_cayennes)(hxclient_2_1_0_cayennes)(HEAD)
Target(s) (symbianMmf_wm)
Profile (helix-client-s60-50-mmf-mdf-dsp)
Platform (S60 5.0/ARMV5)
Branch: hxclient_2_2_3_cayennes
Copyright assignment:
3. My company (Sony Ericsson Mobile Communication) submits this code under the terms
of a commercial contribution agreement with RealNetworks,
and I am authorized to contribute this code under said agreement.
QA Instructions:
N/A
Index: hxsymbianresolver.cpp
===================================================================
RCS file: /cvsroot/common/netio/platform/symbian/hxsymbianresolver.cpp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- hxsymbianresolver.cpp 29 Sep 2005 21:02:47 -0000 1.1
+++ hxsymbianresolver.cpp 1 Sep 2009 14:53:04 -0000 1.1.2.1
@@ -387,7 +387,7 @@
{
if(m_type == EResolvingByName)
{
- m_resolver.GetByName(m_pRequest->m_pNode->Des(), m_nameEntry, iStatus);
+ m_resolver.GetByName(*(m_pRequest->m_pNode), m_nameEntry, iStatus);
}
else if(m_type == EResolvingByAddress)
{
From raosanath at helixcommunity.org Tue Sep 1 06:53:07 2009
From: raosanath at helixcommunity.org (raosanath@helixcommunity.org)
Date: Tue Sep 1 15:58:34 2009
Subject: [Common-cvs] netio/platform/symbian hxsymbianresolver.cpp, 1.1,
1.1.2.1
Message-ID:
Update of /cvsroot/common/netio/platform/symbian
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv7589
Modified Files:
Tag: hxclient_2_1_0_cayennes
hxsymbianresolver.cpp
Log Message:
Modified by: sanath.rao@sonyericsson.com
Date: <08:27:09>
Project:
Bug Number: 9452
Bug URL: https://bugs.helixcommunity.org/show_bug.cgi?id=9452
Synopsis: 9452 - Helix passing a stack based descriptor into an asynchronous IPC call.
Overview: Bug Description in above links contains, detail description of the problem and the reason why fixes were done.
Files Added:
None
Files Modified:
\helix\source\common\netio\platform\symbian\hxsymbianresolver.cpp
Image Size and Heap Use impact (Client -Only):
N/A
Platforms and Profiles Affected:
BIF branch (hxclient_2_2_3_cayennes)
Target(s) (symbianMmf_wm)
Profile (helix-client-s60-50-mmf-mdf-dsp)
Platform (S60 5.0/ARMV5)
Distribution Libraries Affected:
netiolib.lib
Distribution library impact and planned action:
N/A
Platforms and Profiles Build Verified:
BIF branch (hxclient_2_2_3_cayennes)
Target(s) (symbianMmf_wm)
Profile (helix-client-s60-50-mmf-mdf-dsp)
Platform (S60 5.0/ARMV5)
Platforms and Profiles Functionality verified:
BIF branch (hxclient_2_2_3_cayennes)(hxclient_2_1_0_cayennes)(HEAD)
Target(s) (symbianMmf_wm)
Profile (helix-client-s60-50-mmf-mdf-dsp)
Platform (S60 5.0/ARMV5)
Branch: hxclient_2_2_3_cayennes
Copyright assignment:
3. My company (Sony Ericsson Mobile Communication) submits this code under the terms
of a commercial contribution agreement with RealNetworks,
and I am authorized to contribute this code under said agreement.
QA Instructions:
N/A
Index: hxsymbianresolver.cpp
===================================================================
RCS file: /cvsroot/common/netio/platform/symbian/hxsymbianresolver.cpp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- hxsymbianresolver.cpp 29 Sep 2005 21:02:47 -0000 1.1
+++ hxsymbianresolver.cpp 1 Sep 2009 14:53:04 -0000 1.1.2.1
@@ -387,7 +387,7 @@
{
if(m_type == EResolvingByName)
{
- m_resolver.GetByName(m_pRequest->m_pNode->Des(), m_nameEntry, iStatus);
+ m_resolver.GetByName(*(m_pRequest->m_pNode), m_nameEntry, iStatus);
}
else if(m_type == EResolvingByAddress)
{
From amsaleem at helixcommunity.org Tue Sep 1 12:09:00 2009
From: amsaleem at helixcommunity.org (amsaleem@helixcommunity.org)
Date: Tue Sep 1 21:14:21 2009
Subject: [Common-cvs] include hxcore.h,1.23,1.24 hxausvc.h,1.19,1.20
Message-ID:
Update of /cvsroot/common/include
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv30948
Modified Files:
hxcore.h hxausvc.h
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with Real Networks, and I am authorized to contribute this code under said agreement."
Modified by: saleem.adookkattil@nokia.com
Reviewed by:
Date: 08/26/2009
Project: phonon_backend
ErrorId: N/A
Synopsis: Helix HEAD - Added CLSIDs to create instance of classes that implements IHXPlayer, and IXVolume interfaces in Phonon backend appframework;
Overview: Phonon backend application framework uses class factory to create instance of classes that implements IHXPlayer and IXVolume interfaces. Helix uses the interface ids of the interfaces that represent a class as CLSID. As phonon backend application framework uses its own class factory to create instance of these classess, it won't conflit with helix class factory. Again it hides object instance information from phonon backend. Added class ids CLSID_IHXPlayer and CLIS_IHXVolme to identify phonon common appframework classes CHXPlayerProxy and CHXVolumeProxy.
Files modified: cvsroot\common\include\hxcore.h
cvsroot\common\include\hxausvc.h
Files added: None
Image Size and Heap Use impact: None.
Module Release testing (STIF) : N/A
Test case(s) Added : No
Memory leak check performed : N/A
Platforms and Profiles Build Verified: helix-client-s60-ng
Platforms and Profiles Functionality verified: armv5, winscw
Branch: HEAD
Index: hxcore.h
===================================================================
RCS file: /cvsroot/common/include/hxcore.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- hxcore.h 6 Jul 2007 20:43:41 -0000 1.23
+++ hxcore.h 1 Sep 2009 20:08:57 -0000 1.24
@@ -507,7 +507,7 @@
#undef INTERFACE
#define INTERFACE IHXPlayer
-
+#define CLSID_IHXPlayer IID_IHXPlayer
DECLARE_INTERFACE_(IHXPlayer, IUnknown)
{
/*
Index: hxausvc.h
===================================================================
RCS file: /cvsroot/common/include/hxausvc.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- hxausvc.h 6 Jul 2007 20:43:41 -0000 1.19
+++ hxausvc.h 1 Sep 2009 20:08:57 -0000 1.20
@@ -1021,6 +1021,8 @@
DEFINE_GUID(IID_IHXVolume, 0x00000707, 0x901, 0x11d1, 0x8b, 0x6, 0x0,
0xa0, 0x24, 0x40, 0x6d, 0x59);
+#define CLSID_IHXVolume IID_IHXVolume
+
#undef INTERFACE
#define INTERFACE IHXVolume
From amsaleem at helixcommunity.org Tue Sep 1 12:09:00 2009
From: amsaleem at helixcommunity.org (amsaleem@helixcommunity.org)
Date: Tue Sep 1 21:14:22 2009
Subject: [Common-cvs] include hxcore.h,1.23,1.24 hxausvc.h,1.19,1.20
Message-ID:
Update of /cvsroot/common/include
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv30948
Modified Files:
hxcore.h hxausvc.h
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with Real Networks, and I am authorized to contribute this code under said agreement."
Modified by: saleem.adookkattil@nokia.com
Reviewed by:
Date: 08/26/2009
Project: phonon_backend
ErrorId: N/A
Synopsis: Helix HEAD - Added CLSIDs to create instance of classes that implements IHXPlayer, and IXVolume interfaces in Phonon backend appframework;
Overview: Phonon backend application framework uses class factory to create instance of classes that implements IHXPlayer and IXVolume interfaces. Helix uses the interface ids of the interfaces that represent a class as CLSID. As phonon backend application framework uses its own class factory to create instance of these classess, it won't conflit with helix class factory. Again it hides object instance information from phonon backend. Added class ids CLSID_IHXPlayer and CLIS_IHXVolme to identify phonon common appframework classes CHXPlayerProxy and CHXVolumeProxy.
Files modified: cvsroot\common\include\hxcore.h
cvsroot\common\include\hxausvc.h
Files added: None
Image Size and Heap Use impact: None.
Module Release testing (STIF) : N/A
Test case(s) Added : No
Memory leak check performed : N/A
Platforms and Profiles Build Verified: helix-client-s60-ng
Platforms and Profiles Functionality verified: armv5, winscw
Branch: HEAD
Index: hxcore.h
===================================================================
RCS file: /cvsroot/common/include/hxcore.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- hxcore.h 6 Jul 2007 20:43:41 -0000 1.23
+++ hxcore.h 1 Sep 2009 20:08:57 -0000 1.24
@@ -507,7 +507,7 @@
#undef INTERFACE
#define INTERFACE IHXPlayer
-
+#define CLSID_IHXPlayer IID_IHXPlayer
DECLARE_INTERFACE_(IHXPlayer, IUnknown)
{
/*
Index: hxausvc.h
===================================================================
RCS file: /cvsroot/common/include/hxausvc.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- hxausvc.h 6 Jul 2007 20:43:41 -0000 1.19
+++ hxausvc.h 1 Sep 2009 20:08:57 -0000 1.20
@@ -1021,6 +1021,8 @@
DEFINE_GUID(IID_IHXVolume, 0x00000707, 0x901, 0x11d1, 0x8b, 0x6, 0x0,
0xa0, 0x24, 0x40, 0x6d, 0x59);
+#define CLSID_IHXVolume IID_IHXVolume
+
#undef INTERFACE
#define INTERFACE IHXVolume
From amsaleem at helixcommunity.org Tue Sep 1 13:02:05 2009
From: amsaleem at helixcommunity.org (amsaleem@helixcommunity.org)
Date: Tue Sep 1 22:07:25 2009
Subject: [Common-cvs] system/platform/symbian CHXSymbianServer.cpp,1.2,1.3
Message-ID:
Update of /cvsroot/common/system/platform/symbian
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv3428
Modified Files:
CHXSymbianServer.cpp
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with Real Networks, and I am authorized to contribute this code under said agreement."
Modified by: saleem.adookkattil@nokia.com
Reviewed by:
Date: 08/26/2009
Project: symbianMmf_wm
ErrorId: N/A
Synopsis: Changes made to helix client source to use LIBC.DLL instead of ESTLIB.DLL on Symbian.
Overview: Helix build system configuration flag HELIX_CONFIG_SYMBIAN_USE_STDAPIS enables usage of LIBC.DLL instead of ESTLIB.DLL on Symbian. Made the following changes to source to link with LIBC.DLL.
1) There is no need to call CloseSTDLIB() when using LIBC.DLL and removed this function call from the following files when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
2) LIBC.DLL has supports for wide character implementation and removed implementation specific to this from the following file when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
3) LIBC.DLL provides implementation for some standard functions/variables those were not available in estlib.dll and made changes to the following files to use those functions instead of the one provided in helix.
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
4) Removed estlib.lib, euser.lib and hal.lib from the following files as these files get added by default for symbian platform
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
5) offsetof marco implementation provided in stdapis\stddef.h, when it used inside existing helix template definition causing compilation failure. Libc\stddef.h has a different implementation from stdapis\stddef.h.
So added Libc\stddef.h offsetof macro definition to hlxclib/stddef.h to avoid this failure and use the one provided in Libc\stddef.h.
6) Made changes to the following files to use offsetof macro definition in hlxclib/stddef.h
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
7) estlib.lib, euser.lib and hal.lib files get added by default for symbian platform. So there is no need to add these files and removed them from the following symbian.pcf files
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files modified:
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
cvsroot/common/runtime/pub/hlxclib/stddef.h
Files removed:
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files added: None
Image Size and Heap Use impact: N/A
Module Release testing (STIF) : N/A
Test case(s) Added : N/A
Memory leak check performed : N/A
Platforms and Profiles Build Verified: helix-client-s60-52-ng
Platforms and Profiles verified: armv5, winscw
Branch: HEAD
From amsaleem at helixcommunity.org Tue Sep 1 13:02:03 2009
From: amsaleem at helixcommunity.org (amsaleem@helixcommunity.org)
Date: Tue Sep 1 22:07:54 2009
Subject: [Common-cvs] system/platform/symbian CHXSymbianServer.cpp,1.2,1.3
Message-ID:
Update of /cvsroot/common/system/platform/symbian
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv3428
Modified Files:
CHXSymbianServer.cpp
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with Real Networks, and I am authorized to contribute this code under said agreement."
Modified by: saleem.adookkattil@nokia.com
Reviewed by:
Date: 08/26/2009
Project: symbianMmf_wm
ErrorId: N/A
Synopsis: Changes made to helix client source to use LIBC.DLL instead of ESTLIB.DLL on Symbian.
Overview: Helix build system configuration flag HELIX_CONFIG_SYMBIAN_USE_STDAPIS enables usage of LIBC.DLL instead of ESTLIB.DLL on Symbian. Made the following changes to source to link with LIBC.DLL.
1) There is no need to call CloseSTDLIB() when using LIBC.DLL and removed this function call from the following files when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
2) LIBC.DLL has supports for wide character implementation and removed implementation specific to this from the following file when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
3) LIBC.DLL provides implementation for some standard functions/variables those were not available in estlib.dll and made changes to the following files to use those functions instead of the one provided in helix.
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
4) Removed estlib.lib, euser.lib and hal.lib from the following files as these files get added by default for symbian platform
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
5) offsetof marco implementation provided in stdapis\stddef.h, when it used inside existing helix template definition causing compilation failure. Libc\stddef.h has a different implementation from stdapis\stddef.h.
So added Libc\stddef.h offsetof macro definition to hlxclib/stddef.h to avoid this failure and use the one provided in Libc\stddef.h.
6) Made changes to the following files to use offsetof macro definition in hlxclib/stddef.h
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
7) estlib.lib, euser.lib and hal.lib files get added by default for symbian platform. So there is no need to add these files and removed them from the following symbian.pcf files
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files modified:
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
cvsroot/common/runtime/pub/hlxclib/stddef.h
Files removed:
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files added: None
Image Size and Heap Use impact: N/A
Module Release testing (STIF) : N/A
Test case(s) Added : N/A
Memory leak check performed : N/A
Platforms and Profiles Build Verified: helix-client-s60-52-ng
Platforms and Profiles verified: armv5, winscw
Branch: HEAD
Index: CHXSymbianServer.cpp
===================================================================
RCS file: /cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CHXSymbianServer.cpp 25 Jan 2008 22:07:14 -0000 1.2
+++ CHXSymbianServer.cpp 1 Sep 2009 21:02:00 -0000 1.3
@@ -254,9 +254,11 @@
REComSession::FinalClose();
// clean up memory allocated by stdlib functions
+#if !defined(HELIX_CONFIG_SYMBIAN_USE_STDAPIS)
CloseSTDLIB();
-
- SERVER_LOG( (_L("CHXSymbianServerCtx[%x]::ThreadEntry --> Thread Death"), obj) );
+#endif
+
+ SERVER_LOG( (_L("CHXSymbianServerCtx[%x]::ThreadEntry --> Thread Death"), obj) );
return KErrNone;
}
From amsaleem at helixcommunity.org Tue Sep 1 13:09:09 2009
From: amsaleem at helixcommunity.org (amsaleem@helixcommunity.org)
Date: Tue Sep 1 22:14:29 2009
Subject: [Common-cvs] runtime symbian.pcf,1.6,1.7
Message-ID:
Update of /cvsroot/common/runtime
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv3731
Modified Files:
symbian.pcf
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with Real Networks, and I am authorized to contribute this code under said agreement."
Modified by: saleem.adookkattil@nokia.com
Reviewed by:
Date: 08/26/2009
Project: symbianMmf_wm
ErrorId: N/A
Synopsis: Changes made to helix client source to use LIBC.DLL instead of ESTLIB.DLL on Symbian.
Overview: Helix build system configuration flag HELIX_CONFIG_SYMBIAN_USE_STDAPIS enables usage of LIBC.DLL instead of ESTLIB.DLL on Symbian. Made the following changes to source to link with LIBC.DLL.
1) There is no need to call CloseSTDLIB() when using LIBC.DLL and removed this function call from the following files when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
2) LIBC.DLL has supports for wide character implementation and removed implementation specific to this from the following file when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
3) LIBC.DLL provides implementation for some standard functions/variables those were not available in estlib.dll and made changes to the following files to use those functions instead of the one provided in helix.
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
4) Removed estlib.lib, euser.lib and hal.lib from the following files as these files get added by default for symbian platform
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
5) offsetof marco implementation provided in stdapis\stddef.h, when it used inside existing helix template definition causing compilation failure. Libc\stddef.h has a different implementation from stdapis\stddef.h.
So added Libc\stddef.h offsetof macro definition to hlxclib/stddef.h to avoid this failure and use the one provided in Libc\stddef.h.
6) Made changes to the following files to use offsetof macro definition in hlxclib/stddef.h
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
7) estlib.lib, euser.lib and hal.lib files get added by default for symbian platform. So there is no need to add these files and removed them from the following symbian.pcf files
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files modified:
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
cvsroot/common/runtime/pub/hlxclib/stddef.h
Files removed:
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files added: None
Image Size and Heap Use impact: N/A
Module Release testing (STIF) : N/A
Test case(s) Added : N/A
Memory leak check performed : N/A
Platforms and Profiles Build Verified: helix-client-s60-52-ng
Platforms and Profiles verified: armv5, winscw
Branch: HEAD
From amsaleem at helixcommunity.org Tue Sep 1 13:09:07 2009
From: amsaleem at helixcommunity.org (amsaleem@helixcommunity.org)
Date: Tue Sep 1 22:14:58 2009
Subject: [Common-cvs] runtime symbian.pcf,1.6,1.7
Message-ID:
Update of /cvsroot/common/runtime
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv3731
Modified Files:
symbian.pcf
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with Real Networks, and I am authorized to contribute this code under said agreement."
Modified by: saleem.adookkattil@nokia.com
Reviewed by:
Date: 08/26/2009
Project: symbianMmf_wm
ErrorId: N/A
Synopsis: Changes made to helix client source to use LIBC.DLL instead of ESTLIB.DLL on Symbian.
Overview: Helix build system configuration flag HELIX_CONFIG_SYMBIAN_USE_STDAPIS enables usage of LIBC.DLL instead of ESTLIB.DLL on Symbian. Made the following changes to source to link with LIBC.DLL.
1) There is no need to call CloseSTDLIB() when using LIBC.DLL and removed this function call from the following files when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
2) LIBC.DLL has supports for wide character implementation and removed implementation specific to this from the following file when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
3) LIBC.DLL provides implementation for some standard functions/variables those were not available in estlib.dll and made changes to the following files to use those functions instead of the one provided in helix.
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
4) Removed estlib.lib, euser.lib and hal.lib from the following files as these files get added by default for symbian platform
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
5) offsetof marco implementation provided in stdapis\stddef.h, when it used inside existing helix template definition causing compilation failure. Libc\stddef.h has a different implementation from stdapis\stddef.h.
So added Libc\stddef.h offsetof macro definition to hlxclib/stddef.h to avoid this failure and use the one provided in Libc\stddef.h.
6) Made changes to the following files to use offsetof macro definition in hlxclib/stddef.h
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
7) estlib.lib, euser.lib and hal.lib files get added by default for symbian platform. So there is no need to add these files and removed them from the following symbian.pcf files
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files modified:
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
cvsroot/common/runtime/pub/hlxclib/stddef.h
Files removed:
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files added: None
Image Size and Heap Use impact: N/A
Module Release testing (STIF) : N/A
Test case(s) Added : N/A
Memory leak check performed : N/A
Platforms and Profiles Build Verified: helix-client-s60-52-ng
Platforms and Profiles verified: armv5, winscw
Branch: HEAD
Index: symbian.pcf
===================================================================
RCS file: /cvsroot/common/runtime/symbian.pcf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- symbian.pcf 17 Oct 2007 23:04:07 -0000 1.6
+++ symbian.pcf 1 Sep 2009 21:09:04 -0000 1.7
@@ -49,5 +49,6 @@
# ***** END LICENSE BLOCK *****
#
-project.AddSources("platform/symbian/process_events.cpp")
-project.AddSources("platform/symbian/symbian_wchar_functions.cpp")
+project.AddSources("platform/symbian/process_events.cpp")
+if not project.IsDefined('HELIX_CONFIG_SYMBIAN_USE_STDAPIS'):
+ project.AddSources("platform/symbian/symbian_wchar_functions.cpp")
From amsaleem at helixcommunity.org Tue Sep 1 13:21:22 2009
From: amsaleem at helixcommunity.org (amsaleem@helixcommunity.org)
Date: Tue Sep 1 22:26:42 2009
Subject: [Common-cvs] include hxtypes.h,1.45,1.46
Message-ID:
Update of /cvsroot/common/include
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv4109
Modified Files:
hxtypes.h
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with Real Networks, and I am authorized to contribute this code under said agreement."
Modified by: saleem.adookkattil@nokia.com
Reviewed by:
Date: 08/26/2009
Project: symbianMmf_wm
ErrorId: N/A
Synopsis: Changes made to helix client source to use LIBC.DLL instead of ESTLIB.DLL on Symbian.
Overview: Helix build system configuration flag HELIX_CONFIG_SYMBIAN_USE_STDAPIS enables usage of LIBC.DLL instead of ESTLIB.DLL on Symbian. Made the following changes to source to link with LIBC.DLL.
1) There is no need to call CloseSTDLIB() when using LIBC.DLL and removed this function call from the following files when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
2) LIBC.DLL has supports for wide character implementation and removed implementation specific to this from the following file when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
3) LIBC.DLL provides implementation for some standard functions/variables those were not available in estlib.dll and made changes to the following files to use those functions instead of the one provided in helix.
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
4) Removed estlib.lib, euser.lib and hal.lib from the following files as these files get added by default for symbian platform
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
5) offsetof marco implementation provided in stdapis\stddef.h, when it used inside existing helix template definition causing compilation failure. Libc\stddef.h has a different implementation from stdapis\stddef.h.
So added Libc\stddef.h offsetof macro definition to hlxclib/stddef.h to avoid this failure and use the one provided in Libc\stddef.h.
6) Made changes to the following files to use offsetof macro definition in hlxclib/stddef.h
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
7) estlib.lib, euser.lib and hal.lib files get added by default for symbian platform. So there is no need to add these files and removed them from the following symbian.pcf files
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files modified:
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
cvsroot/common/runtime/pub/hlxclib/stddef.h
Files removed:
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files added: None
Image Size and Heap Use impact: N/A
Module Release testing (STIF) : N/A
Test case(s) Added : N/A
Memory leak check performed : N/A
Platforms and Profiles Build Verified: helix-client-s60-52-ng
Platforms and Profiles verified: armv5, winscw
Branch: HEAD
From amsaleem at helixcommunity.org Tue Sep 1 13:21:19 2009
From: amsaleem at helixcommunity.org (amsaleem@helixcommunity.org)
Date: Tue Sep 1 22:27:10 2009
Subject: [Common-cvs] include hxtypes.h,1.45,1.46
Message-ID:
Update of /cvsroot/common/include
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv4109
Modified Files:
hxtypes.h
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with Real Networks, and I am authorized to contribute this code under said agreement."
Modified by: saleem.adookkattil@nokia.com
Reviewed by:
Date: 08/26/2009
Project: symbianMmf_wm
ErrorId: N/A
Synopsis: Changes made to helix client source to use LIBC.DLL instead of ESTLIB.DLL on Symbian.
Overview: Helix build system configuration flag HELIX_CONFIG_SYMBIAN_USE_STDAPIS enables usage of LIBC.DLL instead of ESTLIB.DLL on Symbian. Made the following changes to source to link with LIBC.DLL.
1) There is no need to call CloseSTDLIB() when using LIBC.DLL and removed this function call from the following files when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
2) LIBC.DLL has supports for wide character implementation and removed implementation specific to this from the following file when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
3) LIBC.DLL provides implementation for some standard functions/variables those were not available in estlib.dll and made changes to the following files to use those functions instead of the one provided in helix.
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
4) Removed estlib.lib, euser.lib and hal.lib from the following files as these files get added by default for symbian platform
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
5) offsetof marco implementation provided in stdapis\stddef.h, when it used inside existing helix template definition causing compilation failure. Libc\stddef.h has a different implementation from stdapis\stddef.h.
So added Libc\stddef.h offsetof macro definition to hlxclib/stddef.h to avoid this failure and use the one provided in Libc\stddef.h.
6) Made changes to the following files to use offsetof macro definition in hlxclib/stddef.h
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
7) estlib.lib, euser.lib and hal.lib files get added by default for symbian platform. So there is no need to add these files and removed them from the following symbian.pcf files
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files modified:
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
cvsroot/common/runtime/pub/hlxclib/stddef.h
Files removed:
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files added: None
Image Size and Heap Use impact: N/A
Module Release testing (STIF) : N/A
Test case(s) Added : N/A
Memory leak check performed : N/A
Platforms and Profiles Build Verified: helix-client-s60-52-ng
Platforms and Profiles verified: armv5, winscw
Branch: HEAD
Index: hxtypes.h
===================================================================
RCS file: /cvsroot/common/include/hxtypes.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- hxtypes.h 29 Jul 2009 16:19:15 -0000 1.45
+++ hxtypes.h 1 Sep 2009 21:21:17 -0000 1.46
@@ -221,8 +221,12 @@
#endif
#if defined(_SYMBIAN)
+#if defined(HELIX_CONFIG_SYMBIAN_USE_STDAPIS)
+#include
+#else
#define PATH_MAX KMaxPath
#endif
+#endif
#ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */
From amsaleem at helixcommunity.org Tue Sep 1 13:35:43 2009
From: amsaleem at helixcommunity.org (amsaleem@helixcommunity.org)
Date: Tue Sep 1 22:41:03 2009
Subject: [Common-cvs] netio/pub/platform/symbian nettypes.h,1.3,1.4
Message-ID:
Update of /cvsroot/common/netio/pub/platform/symbian
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv4927
Modified Files:
nettypes.h
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with Real Networks, and I am authorized to contribute this code under said agreement."
Modified by: saleem.adookkattil@nokia.com
Reviewed by:
Date: 08/26/2009
Project: symbianMmf_wm
ErrorId: N/A
Synopsis: Changes made to helix client source to use LIBC.DLL instead of ESTLIB.DLL on Symbian.
Overview: Helix build system configuration flag HELIX_CONFIG_SYMBIAN_USE_STDAPIS enables usage of LIBC.DLL instead of ESTLIB.DLL on Symbian. Made the following changes to source to link with LIBC.DLL.
1) There is no need to call CloseSTDLIB() when using LIBC.DLL and removed this function call from the following files when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
2) LIBC.DLL has supports for wide character implementation and removed implementation specific to this from the following file when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
3) LIBC.DLL provides implementation for some standard functions/variables those were not available in estlib.dll and made changes to the following files to use those functions instead of the one provided in helix.
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
4) Removed estlib.lib, euser.lib and hal.lib from the following files as these files get added by default for symbian platform
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
5) offsetof marco implementation provided in stdapis\stddef.h, when it used inside existing helix template definition causing compilation failure. Libc\stddef.h has a different implementation from stdapis\stddef.h.
So added Libc\stddef.h offsetof macro definition to hlxclib/stddef.h to avoid this failure and use the one provided in Libc\stddef.h.
6) Made changes to the following files to use offsetof macro definition in hlxclib/stddef.h
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
7) estlib.lib, euser.lib and hal.lib files get added by default for symbian platform. So there is no need to add these files and removed them from the following symbian.pcf files
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files modified:
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
cvsroot/common/runtime/pub/hlxclib/stddef.h
Files removed:
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files added: None
Image Size and Heap Use impact: N/A
Module Release testing (STIF) : N/A
Test case(s) Added : N/A
Memory leak check performed : N/A
Platforms and Profiles Build Verified: helix-client-s60-52-ng
Platforms and Profiles verified: armv5, winscw
Branch: HEAD
From amsaleem at helixcommunity.org Tue Sep 1 13:35:41 2009
From: amsaleem at helixcommunity.org (amsaleem@helixcommunity.org)
Date: Tue Sep 1 22:41:32 2009
Subject: [Common-cvs] netio/pub/platform/symbian nettypes.h,1.3,1.4
Message-ID:
Update of /cvsroot/common/netio/pub/platform/symbian
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv4927
Modified Files:
nettypes.h
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with Real Networks, and I am authorized to contribute this code under said agreement."
Modified by: saleem.adookkattil@nokia.com
Reviewed by:
Date: 08/26/2009
Project: symbianMmf_wm
ErrorId: N/A
Synopsis: Changes made to helix client source to use LIBC.DLL instead of ESTLIB.DLL on Symbian.
Overview: Helix build system configuration flag HELIX_CONFIG_SYMBIAN_USE_STDAPIS enables usage of LIBC.DLL instead of ESTLIB.DLL on Symbian. Made the following changes to source to link with LIBC.DLL.
1) There is no need to call CloseSTDLIB() when using LIBC.DLL and removed this function call from the following files when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
2) LIBC.DLL has supports for wide character implementation and removed implementation specific to this from the following file when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
3) LIBC.DLL provides implementation for some standard functions/variables those were not available in estlib.dll and made changes to the following files to use those functions instead of the one provided in helix.
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
4) Removed estlib.lib, euser.lib and hal.lib from the following files as these files get added by default for symbian platform
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
5) offsetof marco implementation provided in stdapis\stddef.h, when it used inside existing helix template definition causing compilation failure. Libc\stddef.h has a different implementation from stdapis\stddef.h.
So added Libc\stddef.h offsetof macro definition to hlxclib/stddef.h to avoid this failure and use the one provided in Libc\stddef.h.
6) Made changes to the following files to use offsetof macro definition in hlxclib/stddef.h
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
7) estlib.lib, euser.lib and hal.lib files get added by default for symbian platform. So there is no need to add these files and removed them from the following symbian.pcf files
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files modified:
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
cvsroot/common/runtime/pub/hlxclib/stddef.h
Files removed:
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files added: None
Image Size and Heap Use impact: N/A
Module Release testing (STIF) : N/A
Test case(s) Added : N/A
Memory leak check performed : N/A
Platforms and Profiles Build Verified: helix-client-s60-52-ng
Platforms and Profiles verified: armv5, winscw
Branch: HEAD
Index: nettypes.h
===================================================================
RCS file: /cvsroot/common/netio/pub/platform/symbian/nettypes.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- nettypes.h 6 Jul 2007 20:43:59 -0000 1.3
+++ nettypes.h 1 Sep 2009 21:35:38 -0000 1.4
@@ -49,14 +49,17 @@
#ifndef NETTYPES_H__
#define NETTYPES_H__
-
+#if defined(HELIX_CONFIG_SYMBIAN_USE_STDAPIS)
+#include
+#include
+#endif
#include
#include
#include
#include
#include // memcmp
#include "hxtypes.h"
-
+#if !defined(HELIX_CONFIG_SYMBIAN_USE_STDAPIS)
// Provides posix data structures missing from standard Symbian headers. Even though
// Symbian does not provide a posix socket API, these are useful for address representation
// in generic cross-platfrom code.
@@ -224,7 +227,5 @@
return ((a->sin6_family == AF_INET6) &&
IN6_IS_ADDR_LOOPBACK(&a->sin6_addr));
}
-
-
-
+#endif
#endif /* NETTYPES_H__ */
From amsaleem at helixcommunity.org Tue Sep 1 13:38:52 2009
From: amsaleem at helixcommunity.org (amsaleem@helixcommunity.org)
Date: Tue Sep 1 22:44:12 2009
Subject: [Common-cvs] runtime/pub/hlxclib stddef.h,1.4,1.5
Message-ID:
Update of /cvsroot/common/runtime/pub/hlxclib
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv5002
Modified Files:
stddef.h
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with Real Networks, and I am authorized to contribute this code under said agreement."
Modified by: saleem.adookkattil@nokia.com
Reviewed by:
Date: 08/26/2009
Project: symbianMmf_wm
ErrorId: N/A
Synopsis: Changes made to helix client source to use LIBC.DLL instead of ESTLIB.DLL on Symbian.
Overview: Helix build system configuration flag HELIX_CONFIG_SYMBIAN_USE_STDAPIS enables usage of LIBC.DLL instead of ESTLIB.DLL on Symbian. Made the following changes to source to link with LIBC.DLL.
1) There is no need to call CloseSTDLIB() when using LIBC.DLL and removed this function call from the following files when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
2) LIBC.DLL has supports for wide character implementation and removed implementation specific to this from the following file when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
3) LIBC.DLL provides implementation for some standard functions/variables those were not available in estlib.dll and made changes to the following files to use those functions instead of the one provided in helix.
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
4) Removed estlib.lib, euser.lib and hal.lib from the following files as these files get added by default for symbian platform
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
5) offsetof marco implementation provided in stdapis\stddef.h, when it used inside existing helix template definition causing compilation failure. Libc\stddef.h has a different implementation from stdapis\stddef.h.
So added Libc\stddef.h offsetof macro definition to hlxclib/stddef.h to avoid this failure and use the one provided in Libc\stddef.h.
6) Made changes to the following files to use offsetof macro definition in hlxclib/stddef.h
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
7) estlib.lib, euser.lib and hal.lib files get added by default for symbian platform. So there is no need to add these files and removed them from the following symbian.pcf files
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files modified:
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
cvsroot/common/runtime/pub/hlxclib/stddef.h
Files removed:
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files added: None
Image Size and Heap Use impact: N/A
Module Release testing (STIF) : N/A
Test case(s) Added : N/A
Memory leak check performed : N/A
Platforms and Profiles Build Verified: helix-client-s60-52-ng
Platforms and Profiles verified: armv5, winscw
Branch: HEAD
From amsaleem at helixcommunity.org Tue Sep 1 13:38:50 2009
From: amsaleem at helixcommunity.org (amsaleem@helixcommunity.org)
Date: Tue Sep 1 22:44:40 2009
Subject: [Common-cvs] runtime/pub/hlxclib stddef.h,1.4,1.5
Message-ID:
Update of /cvsroot/common/runtime/pub/hlxclib
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv5002
Modified Files:
stddef.h
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with Real Networks, and I am authorized to contribute this code under said agreement."
Modified by: saleem.adookkattil@nokia.com
Reviewed by:
Date: 08/26/2009
Project: symbianMmf_wm
ErrorId: N/A
Synopsis: Changes made to helix client source to use LIBC.DLL instead of ESTLIB.DLL on Symbian.
Overview: Helix build system configuration flag HELIX_CONFIG_SYMBIAN_USE_STDAPIS enables usage of LIBC.DLL instead of ESTLIB.DLL on Symbian. Made the following changes to source to link with LIBC.DLL.
1) There is no need to call CloseSTDLIB() when using LIBC.DLL and removed this function call from the following files when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
2) LIBC.DLL has supports for wide character implementation and removed implementation specific to this from the following file when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
3) LIBC.DLL provides implementation for some standard functions/variables those were not available in estlib.dll and made changes to the following files to use those functions instead of the one provided in helix.
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
4) Removed estlib.lib, euser.lib and hal.lib from the following files as these files get added by default for symbian platform
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
5) offsetof marco implementation provided in stdapis\stddef.h, when it used inside existing helix template definition causing compilation failure. Libc\stddef.h has a different implementation from stdapis\stddef.h.
So added Libc\stddef.h offsetof macro definition to hlxclib/stddef.h to avoid this failure and use the one provided in Libc\stddef.h.
6) Made changes to the following files to use offsetof macro definition in hlxclib/stddef.h
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
7) estlib.lib, euser.lib and hal.lib files get added by default for symbian platform. So there is no need to add these files and removed them from the following symbian.pcf files
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files modified:
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
cvsroot/common/runtime/pub/hlxclib/stddef.h
Files removed:
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files added: None
Image Size and Heap Use impact: N/A
Module Release testing (STIF) : N/A
Test case(s) Added : N/A
Memory leak check performed : N/A
Platforms and Profiles Build Verified: helix-client-s60-52-ng
Platforms and Profiles verified: armv5, winscw
Branch: HEAD
Index: stddef.h
===================================================================
RCS file: /cvsroot/common/runtime/pub/hlxclib/stddef.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- stddef.h 6 Jul 2007 20:44:04 -0000 1.4
+++ stddef.h 1 Sep 2009 21:38:48 -0000 1.5
@@ -59,6 +59,10 @@
#include
+#if defined(HELIX_CONFIG_SYMBIAN_USE_STDAPIS)
+#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#endif
+
#ifdef LIMITS_UNDEF_WIN32
#undef _WIN32
#undef LIMITS_UNDEF_WIN32
From amsaleem at helixcommunity.org Tue Sep 1 13:40:30 2009
From: amsaleem at helixcommunity.org (amsaleem@helixcommunity.org)
Date: Tue Sep 1 22:45:50 2009
Subject: [Common-cvs] runtime/pub/hlxclib stdio.h,1.11,1.12
Message-ID:
Update of /cvsroot/common/runtime/pub/hlxclib
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv5055
Modified Files:
stdio.h
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with Real Networks, and I am authorized to contribute this code under said agreement."
Modified by: saleem.adookkattil@nokia.com
Reviewed by:
Date: 08/26/2009
Project: symbianMmf_wm
ErrorId: N/A
Synopsis: Changes made to helix client source to use LIBC.DLL instead of ESTLIB.DLL on Symbian.
Overview: Helix build system configuration flag HELIX_CONFIG_SYMBIAN_USE_STDAPIS enables usage of LIBC.DLL instead of ESTLIB.DLL on Symbian. Made the following changes to source to link with LIBC.DLL.
1) There is no need to call CloseSTDLIB() when using LIBC.DLL and removed this function call from the following files when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
2) LIBC.DLL has supports for wide character implementation and removed implementation specific to this from the following file when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
3) LIBC.DLL provides implementation for some standard functions/variables those were not available in estlib.dll and made changes to the following files to use those functions instead of the one provided in helix.
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
4) Removed estlib.lib, euser.lib and hal.lib from the following files as these files get added by default for symbian platform
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
5) offsetof marco implementation provided in stdapis\stddef.h, when it used inside existing helix template definition causing compilation failure. Libc\stddef.h has a different implementation from stdapis\stddef.h.
So added Libc\stddef.h offsetof macro definition to hlxclib/stddef.h to avoid this failure and use the one provided in Libc\stddef.h.
6) Made changes to the following files to use offsetof macro definition in hlxclib/stddef.h
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
7) estlib.lib, euser.lib and hal.lib files get added by default for symbian platform. So there is no need to add these files and removed them from the following symbian.pcf files
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files modified:
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
cvsroot/common/runtime/pub/hlxclib/stddef.h
Files removed:
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files added: None
Image Size and Heap Use impact: N/A
Module Release testing (STIF) : N/A
Test case(s) Added : N/A
Memory leak check performed : N/A
Platforms and Profiles Build Verified: helix-client-s60-52-ng
Platforms and Profiles verified: armv5, winscw
Branch: HEAD
From amsaleem at helixcommunity.org Tue Sep 1 13:40:28 2009
From: amsaleem at helixcommunity.org (amsaleem@helixcommunity.org)
Date: Tue Sep 1 22:46:18 2009
Subject: [Common-cvs] runtime/pub/hlxclib stdio.h,1.11,1.12
Message-ID:
Update of /cvsroot/common/runtime/pub/hlxclib
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv5055
Modified Files:
stdio.h
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with Real Networks, and I am authorized to contribute this code under said agreement."
Modified by: saleem.adookkattil@nokia.com
Reviewed by:
Date: 08/26/2009
Project: symbianMmf_wm
ErrorId: N/A
Synopsis: Changes made to helix client source to use LIBC.DLL instead of ESTLIB.DLL on Symbian.
Overview: Helix build system configuration flag HELIX_CONFIG_SYMBIAN_USE_STDAPIS enables usage of LIBC.DLL instead of ESTLIB.DLL on Symbian. Made the following changes to source to link with LIBC.DLL.
1) There is no need to call CloseSTDLIB() when using LIBC.DLL and removed this function call from the following files when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
2) LIBC.DLL has supports for wide character implementation and removed implementation specific to this from the following file when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
3) LIBC.DLL provides implementation for some standard functions/variables those were not available in estlib.dll and made changes to the following files to use those functions instead of the one provided in helix.
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
4) Removed estlib.lib, euser.lib and hal.lib from the following files as these files get added by default for symbian platform
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
5) offsetof marco implementation provided in stdapis\stddef.h, when it used inside existing helix template definition causing compilation failure. Libc\stddef.h has a different implementation from stdapis\stddef.h.
So added Libc\stddef.h offsetof macro definition to hlxclib/stddef.h to avoid this failure and use the one provided in Libc\stddef.h.
6) Made changes to the following files to use offsetof macro definition in hlxclib/stddef.h
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
7) estlib.lib, euser.lib and hal.lib files get added by default for symbian platform. So there is no need to add these files and removed them from the following symbian.pcf files
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files modified:
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
cvsroot/common/runtime/pub/hlxclib/stddef.h
Files removed:
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files added: None
Image Size and Heap Use impact: N/A
Module Release testing (STIF) : N/A
Test case(s) Added : N/A
Memory leak check performed : N/A
Platforms and Profiles Build Verified: helix-client-s60-52-ng
Platforms and Profiles verified: armv5, winscw
Branch: HEAD
Index: stdio.h
===================================================================
RCS file: /cvsroot/common/runtime/pub/hlxclib/stdio.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- stdio.h 18 Jan 2008 09:17:27 -0000 1.11
+++ stdio.h 1 Sep 2009 21:40:25 -0000 1.12
@@ -245,9 +245,11 @@
#define vsnprintf _vsnprintf
#elif defined(_SYMBIAN) || defined(_WINCE) || defined(_IRIX)
+#if !defined(HELIX_CONFIG_SYMBIAN_USE_STDAPIS)
#define snprintf __helix_snprintf
#define vsnprintf __helix_vsnprintf
#endif
+#endif
#if __cplusplus
}
From amsaleem at helixcommunity.org Tue Sep 1 13:42:31 2009
From: amsaleem at helixcommunity.org (amsaleem@helixcommunity.org)
Date: Tue Sep 1 22:47:50 2009
Subject: [Common-cvs] runtime/pub/hlxclib wchar.h,1.8,1.9
Message-ID:
Update of /cvsroot/common/runtime/pub/hlxclib
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv5101
Modified Files:
wchar.h
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with Real Networks, and I am authorized to contribute this code under said agreement."
Modified by: saleem.adookkattil@nokia.com
Reviewed by:
Date: 08/26/2009
Project: symbianMmf_wm
ErrorId: N/A
Synopsis: Changes made to helix client source to use LIBC.DLL instead of ESTLIB.DLL on Symbian.
Overview: Helix build system configuration flag HELIX_CONFIG_SYMBIAN_USE_STDAPIS enables usage of LIBC.DLL instead of ESTLIB.DLL on Symbian. Made the following changes to source to link with LIBC.DLL.
1) There is no need to call CloseSTDLIB() when using LIBC.DLL and removed this function call from the following files when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
2) LIBC.DLL has supports for wide character implementation and removed implementation specific to this from the following file when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
3) LIBC.DLL provides implementation for some standard functions/variables those were not available in estlib.dll and made changes to the following files to use those functions instead of the one provided in helix.
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
4) Removed estlib.lib, euser.lib and hal.lib from the following files as these files get added by default for symbian platform
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
5) offsetof marco implementation provided in stdapis\stddef.h, when it used inside existing helix template definition causing compilation failure. Libc\stddef.h has a different implementation from stdapis\stddef.h.
So added Libc\stddef.h offsetof macro definition to hlxclib/stddef.h to avoid this failure and use the one provided in Libc\stddef.h.
6) Made changes to the following files to use offsetof macro definition in hlxclib/stddef.h
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
7) estlib.lib, euser.lib and hal.lib files get added by default for symbian platform. So there is no need to add these files and removed them from the following symbian.pcf files
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files modified:
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
cvsroot/common/runtime/pub/hlxclib/stddef.h
Files removed:
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files added: None
Image Size and Heap Use impact: N/A
Module Release testing (STIF) : N/A
Test case(s) Added : N/A
Memory leak check performed : N/A
Platforms and Profiles Build Verified: helix-client-s60-52-ng
Platforms and Profiles verified: armv5, winscw
Branch: HEAD
From amsaleem at helixcommunity.org Tue Sep 1 13:42:29 2009
From: amsaleem at helixcommunity.org (amsaleem@helixcommunity.org)
Date: Tue Sep 1 22:48:19 2009
Subject: [Common-cvs] runtime/pub/hlxclib wchar.h,1.8,1.9
Message-ID:
Update of /cvsroot/common/runtime/pub/hlxclib
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv5101
Modified Files:
wchar.h
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with Real Networks, and I am authorized to contribute this code under said agreement."
Modified by: saleem.adookkattil@nokia.com
Reviewed by:
Date: 08/26/2009
Project: symbianMmf_wm
ErrorId: N/A
Synopsis: Changes made to helix client source to use LIBC.DLL instead of ESTLIB.DLL on Symbian.
Overview: Helix build system configuration flag HELIX_CONFIG_SYMBIAN_USE_STDAPIS enables usage of LIBC.DLL instead of ESTLIB.DLL on Symbian. Made the following changes to source to link with LIBC.DLL.
1) There is no need to call CloseSTDLIB() when using LIBC.DLL and removed this function call from the following files when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
2) LIBC.DLL has supports for wide character implementation and removed implementation specific to this from the following file when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
3) LIBC.DLL provides implementation for some standard functions/variables those were not available in estlib.dll and made changes to the following files to use those functions instead of the one provided in helix.
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
4) Removed estlib.lib, euser.lib and hal.lib from the following files as these files get added by default for symbian platform
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
5) offsetof marco implementation provided in stdapis\stddef.h, when it used inside existing helix template definition causing compilation failure. Libc\stddef.h has a different implementation from stdapis\stddef.h.
So added Libc\stddef.h offsetof macro definition to hlxclib/stddef.h to avoid this failure and use the one provided in Libc\stddef.h.
6) Made changes to the following files to use offsetof macro definition in hlxclib/stddef.h
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
7) estlib.lib, euser.lib and hal.lib files get added by default for symbian platform. So there is no need to add these files and removed them from the following symbian.pcf files
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files modified:
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
cvsroot/common/runtime/pub/hlxclib/stddef.h
Files removed:
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files added: None
Image Size and Heap Use impact: N/A
Module Release testing (STIF) : N/A
Test case(s) Added : N/A
Memory leak check performed : N/A
Platforms and Profiles Build Verified: helix-client-s60-52-ng
Platforms and Profiles verified: armv5, winscw
Branch: HEAD
Index: wchar.h
===================================================================
RCS file: /cvsroot/common/runtime/pub/hlxclib/wchar.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- wchar.h 9 Apr 2009 23:01:40 -0000 1.8
+++ wchar.h 1 Sep 2009 21:42:26 -0000 1.9
@@ -67,8 +67,12 @@
// the header has the inclusion for the wchar string operations
#ifdef _SYMBIAN
+#if defined(HELIX_CONFIG_SYMBIAN_USE_STDAPIS)
+ #include
+#else
#include "platform/symbian/symbian_wchar_functions.h"
#include
+#endif
#elif _BREW
#elif ANDROID
//Android has no wide-char support
From amsaleem at helixcommunity.org Tue Sep 1 13:50:33 2009
From: amsaleem at helixcommunity.org (amsaleem@helixcommunity.org)
Date: Tue Sep 1 22:55:53 2009
Subject: [Common-cvs] fileio/platform/symbian symbihxdataf.cpp,1.15,1.16
Message-ID:
Update of /cvsroot/common/fileio/platform/symbian
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv5317
Modified Files:
symbihxdataf.cpp
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with Real Networks, and I am authorized to contribute this code under said agreement."
Modified by: saleem.adookkattil@nokia.com
Reviewed by:
Date: 08/26/2009
Project: symbianMmf_wm
ErrorId: N/A
Synopsis: Changes made to helix client source to use LIBC.DLL instead of ESTLIB.DLL on Symbian.
Overview: Helix build system configuration flag HELIX_CONFIG_SYMBIAN_USE_STDAPIS enables usage of LIBC.DLL instead of ESTLIB.DLL on Symbian. Made the following changes to source to link with LIBC.DLL.
1) There is no need to call CloseSTDLIB() when using LIBC.DLL and removed this function call from the following files when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
2) LIBC.DLL has supports for wide character implementation and removed implementation specific to this from the following file when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
3) LIBC.DLL provides implementation for some standard functions/variables those were not available in estlib.dll and made changes to the following files to use those functions instead of the one provided in helix.
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
4) Removed estlib.lib, euser.lib and hal.lib from the following files as these files get added by default for symbian platform
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
5) offsetof marco implementation provided in stdapis\stddef.h, when it used inside existing helix template definition causing compilation failure. Libc\stddef.h has a different implementation from stdapis\stddef.h.
So added Libc\stddef.h offsetof macro definition to hlxclib/stddef.h to avoid this failure and use the one provided in Libc\stddef.h.
6) Made changes to the following files to use offsetof macro definition in hlxclib/stddef.h
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
7) estlib.lib, euser.lib and hal.lib files get added by default for symbian platform. So there is no need to add these files and removed them from the following symbian.pcf files
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files modified:
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
cvsroot/common/runtime/pub/hlxclib/stddef.h
Files removed:
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files added: None
Image Size and Heap Use impact: N/A
Module Release testing (STIF) : N/A
Test case(s) Added : N/A
Memory leak check performed : N/A
Platforms and Profiles Build Verified: helix-client-s60-52-ng
Platforms and Profiles verified: armv5, winscw
Branch: HEAD
From amsaleem at helixcommunity.org Tue Sep 1 13:50:31 2009
From: amsaleem at helixcommunity.org (amsaleem@helixcommunity.org)
Date: Tue Sep 1 22:56:22 2009
Subject: [Common-cvs] fileio/platform/symbian symbihxdataf.cpp,1.15,1.16
Message-ID:
Update of /cvsroot/common/fileio/platform/symbian
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv5317
Modified Files:
symbihxdataf.cpp
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with Real Networks, and I am authorized to contribute this code under said agreement."
Modified by: saleem.adookkattil@nokia.com
Reviewed by:
Date: 08/26/2009
Project: symbianMmf_wm
ErrorId: N/A
Synopsis: Changes made to helix client source to use LIBC.DLL instead of ESTLIB.DLL on Symbian.
Overview: Helix build system configuration flag HELIX_CONFIG_SYMBIAN_USE_STDAPIS enables usage of LIBC.DLL instead of ESTLIB.DLL on Symbian. Made the following changes to source to link with LIBC.DLL.
1) There is no need to call CloseSTDLIB() when using LIBC.DLL and removed this function call from the following files when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
2) LIBC.DLL has supports for wide character implementation and removed implementation specific to this from the following file when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
3) LIBC.DLL provides implementation for some standard functions/variables those were not available in estlib.dll and made changes to the following files to use those functions instead of the one provided in helix.
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
4) Removed estlib.lib, euser.lib and hal.lib from the following files as these files get added by default for symbian platform
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
5) offsetof marco implementation provided in stdapis\stddef.h, when it used inside existing helix template definition causing compilation failure. Libc\stddef.h has a different implementation from stdapis\stddef.h.
So added Libc\stddef.h offsetof macro definition to hlxclib/stddef.h to avoid this failure and use the one provided in Libc\stddef.h.
6) Made changes to the following files to use offsetof macro definition in hlxclib/stddef.h
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
7) estlib.lib, euser.lib and hal.lib files get added by default for symbian platform. So there is no need to add these files and removed them from the following symbian.pcf files
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files modified:
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
cvsroot/common/runtime/pub/hlxclib/stddef.h
Files removed:
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files added: None
Image Size and Heap Use impact: N/A
Module Release testing (STIF) : N/A
Test case(s) Added : N/A
Memory leak check performed : N/A
Platforms and Profiles Build Verified: helix-client-s60-52-ng
Platforms and Profiles verified: armv5, winscw
Branch: HEAD
Index: symbihxdataf.cpp
===================================================================
RCS file: /cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- symbihxdataf.cpp 6 Jul 2007 20:35:15 -0000 1.15
+++ symbihxdataf.cpp 1 Sep 2009 21:50:29 -0000 1.16
@@ -50,6 +50,9 @@
/****************************************************************************
* Includes
*/
+#if defined(HELIX_CONFIG_SYMBIAN_USE_STDAPIS)
+#include "hlxclib/sys/stat.h"
+#endif
#include "hlxclib/string.h"
#include "hlxclib/fcntl.h"
From amsaleem at helixcommunity.org Tue Sep 1 13:55:39 2009
From: amsaleem at helixcommunity.org (amsaleem@helixcommunity.org)
Date: Tue Sep 1 23:00:58 2009
Subject: [Common-cvs] import/expat/xmlparse xmlparse.c,1.8,1.9
Message-ID:
Update of /cvsroot/common/import/expat/xmlparse
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv5711
Modified Files:
xmlparse.c
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with Real Networks, and I am authorized to contribute this code under said agreement."
Modified by: saleem.adookkattil@nokia.com
Reviewed by:
Date: 08/26/2009
Project: symbianMmf_wm
ErrorId: N/A
Synopsis: Changes made to helix client source to use LIBC.DLL instead of ESTLIB.DLL on Symbian.
Overview: Helix build system configuration flag HELIX_CONFIG_SYMBIAN_USE_STDAPIS enables usage of LIBC.DLL instead of ESTLIB.DLL on Symbian. Made the following changes to source to link with LIBC.DLL.
1) There is no need to call CloseSTDLIB() when using LIBC.DLL and removed this function call from the following files when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
2) LIBC.DLL has supports for wide character implementation and removed implementation specific to this from the following file when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
3) LIBC.DLL provides implementation for some standard functions/variables those were not available in estlib.dll and made changes to the following files to use those functions instead of the one provided in helix.
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
4) Removed estlib.lib, euser.lib and hal.lib from the following files as these files get added by default for symbian platform
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
5) offsetof marco implementation provided in stdapis\stddef.h, when it used inside existing helix template definition causing compilation failure. Libc\stddef.h has a different implementation from stdapis\stddef.h.
So added Libc\stddef.h offsetof macro definition to hlxclib/stddef.h to avoid this failure and use the one provided in Libc\stddef.h.
6) Made changes to the following files to use offsetof macro definition in hlxclib/stddef.h
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
7) estlib.lib, euser.lib and hal.lib files get added by default for symbian platform. So there is no need to add these files and removed them from the following symbian.pcf files
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files modified:
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
cvsroot/common/runtime/pub/hlxclib/stddef.h
Files removed:
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files added: None
Image Size and Heap Use impact: N/A
Module Release testing (STIF) : N/A
Test case(s) Added : N/A
Memory leak check performed : N/A
Platforms and Profiles Build Verified: helix-client-s60-52-ng
Platforms and Profiles verified: armv5, winscw
Branch: HEAD
From amsaleem at helixcommunity.org Tue Sep 1 13:55:37 2009
From: amsaleem at helixcommunity.org (amsaleem@helixcommunity.org)
Date: Tue Sep 1 23:01:27 2009
Subject: [Common-cvs] import/expat/xmlparse xmlparse.c,1.8,1.9
Message-ID:
Update of /cvsroot/common/import/expat/xmlparse
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv5711
Modified Files:
xmlparse.c
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with Real Networks, and I am authorized to contribute this code under said agreement."
Modified by: saleem.adookkattil@nokia.com
Reviewed by:
Date: 08/26/2009
Project: symbianMmf_wm
ErrorId: N/A
Synopsis: Changes made to helix client source to use LIBC.DLL instead of ESTLIB.DLL on Symbian.
Overview: Helix build system configuration flag HELIX_CONFIG_SYMBIAN_USE_STDAPIS enables usage of LIBC.DLL instead of ESTLIB.DLL on Symbian. Made the following changes to source to link with LIBC.DLL.
1) There is no need to call CloseSTDLIB() when using LIBC.DLL and removed this function call from the following files when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
2) LIBC.DLL has supports for wide character implementation and removed implementation specific to this from the following file when HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
3) LIBC.DLL provides implementation for some standard functions/variables those were not available in estlib.dll and made changes to the following files to use those functions instead of the one provided in helix.
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
4) Removed estlib.lib, euser.lib and hal.lib from the following files as these files get added by default for symbian platform
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
5) offsetof marco implementation provided in stdapis\stddef.h, when it used inside existing helix template definition causing compilation failure. Libc\stddef.h has a different implementation from stdapis\stddef.h.
So added Libc\stddef.h offsetof macro definition to hlxclib/stddef.h to avoid this failure and use the one provided in Libc\stddef.h.
6) Made changes to the following files to use offsetof macro definition in hlxclib/stddef.h
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
7) estlib.lib, euser.lib and hal.lib files get added by default for symbian platform. So there is no need to add these files and removed them from the following symbian.pcf files
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files modified:
cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
cvsroot/common/runtime/symbian.pcf
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/helix/helix_win32_functions.h
cvsroot/common/runtime/pub/hlxclib/wchar.h
cvsroot/common/include/hxtypes.h
cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
cvsroot/common/netio/pub/platform/symbian/nettypes.h
cvsroot/common/runtime/pub/hlxclib/stdio.h
cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
cvsroot/common/import/expat/xmlparse/xmlparse.c
cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/client/common/netbuffer.h
cvsroot/common/runtime/pub/hlxclib/stddef.h
Files removed:
cvsroot/datatype/mp3/fileformat/symbian.pcf
cvsroot/datatype/mp3/renderer/symbian.pcf
Files added: None
Image Size and Heap Use impact: N/A
Module Release testing (STIF) : N/A
Test case(s) Added : N/A
Memory leak check performed : N/A
Platforms and Profiles Build Verified: helix-client-s60-52-ng
Platforms and Profiles verified: armv5, winscw
Branch: HEAD
Index: xmlparse.c
===================================================================
RCS file: /cvsroot/common/import/expat/xmlparse/xmlparse.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- xmlparse.c 24 Mar 2005 00:06:10 -0000 1.8
+++ xmlparse.c 1 Sep 2009 21:55:34 -0000 1.9
@@ -5,7 +5,7 @@
#include "xmldef.h"
#include "xmlparse.h"
-#include
+#include "hlxclib/stddef.h"
#ifdef _WINCE
#ifndef _ABORT_DEFINED
From ping at helixcommunity.org Fri Sep 4 08:21:46 2009
From: ping at helixcommunity.org (ping@helixcommunity.org)
Date: Fri Sep 4 17:25:44 2009
Subject: [Common-cvs] include hxdtdr.h,1.6,1.6.2.1
Message-ID:
Update of /cvsroot/common/include
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv7739
Modified Files:
Tag: hxclient_3_1_0_atlas
hxdtdr.h
Log Message:
Added new option for InProgressTimeout
Index: hxdtdr.h
===================================================================
RCS file: /cvsroot/common/include/hxdtdr.h,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- hxdtdr.h 6 Jul 2007 20:43:41 -0000 1.6
+++ hxdtdr.h 4 Sep 2009 16:21:44 -0000 1.6.2.1
@@ -84,11 +84,13 @@
#define DECRYPT_OPTION_NAME "DecryptSource"
#define DECODE_OPTION_NAME "DecodeSource"
#define BLOCK_OPTION_NAME "BlockFilter"
-#define MUX_OPTION_NAME "MuxAudioVideo"
+#define MUX_OPTION_NAME "MuxAudioVideo"
+#define INPROGRESS_TIMEOUT_OPTION_NAME "InProgressTimeout"
#define SUPPRESS_WRITER_OPTION "SuppressWriter"
#define OUTPUT_FILENAME_OPTION "OutputFileName"
+
#define TRANSFER_CERTIFICATE_OPTION "TransferCertificate"
//e1ec2c5f-7f0c-4348-b3b0c4af5eae9778
From ping at helixcommunity.org Fri Sep 4 08:21:46 2009
From: ping at helixcommunity.org (ping@helixcommunity.org)
Date: Fri Sep 4 17:25:45 2009
Subject: [Common-cvs] include hxdtdr.h,1.6,1.6.2.1
Message-ID:
Update of /cvsroot/common/include
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv7739
Modified Files:
Tag: hxclient_3_1_0_atlas
hxdtdr.h
Log Message:
Added new option for InProgressTimeout
Index: hxdtdr.h
===================================================================
RCS file: /cvsroot/common/include/hxdtdr.h,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- hxdtdr.h 6 Jul 2007 20:43:41 -0000 1.6
+++ hxdtdr.h 4 Sep 2009 16:21:44 -0000 1.6.2.1
@@ -84,11 +84,13 @@
#define DECRYPT_OPTION_NAME "DecryptSource"
#define DECODE_OPTION_NAME "DecodeSource"
#define BLOCK_OPTION_NAME "BlockFilter"
-#define MUX_OPTION_NAME "MuxAudioVideo"
+#define MUX_OPTION_NAME "MuxAudioVideo"
+#define INPROGRESS_TIMEOUT_OPTION_NAME "InProgressTimeout"
#define SUPPRESS_WRITER_OPTION "SuppressWriter"
#define OUTPUT_FILENAME_OPTION "OutputFileName"
+
#define TRANSFER_CERTIFICATE_OPTION "TransferCertificate"
//e1ec2c5f-7f0c-4348-b3b0c4af5eae9778
From ping at helixcommunity.org Fri Sep 4 08:23:13 2009
From: ping at helixcommunity.org (ping@helixcommunity.org)
Date: Fri Sep 4 17:27:11 2009
Subject: [Common-cvs] include hxdtdr.h,1.6,1.7
Message-ID:
Update of /cvsroot/common/include
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv7929
Modified Files:
hxdtdr.h
Log Message:
Added new option for InProgressTimeout
Index: hxdtdr.h
===================================================================
RCS file: /cvsroot/common/include/hxdtdr.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- hxdtdr.h 6 Jul 2007 20:43:41 -0000 1.6
+++ hxdtdr.h 4 Sep 2009 16:23:11 -0000 1.7
@@ -85,6 +85,7 @@
#define DECODE_OPTION_NAME "DecodeSource"
#define BLOCK_OPTION_NAME "BlockFilter"
#define MUX_OPTION_NAME "MuxAudioVideo"
+#define INPROGRESS_TIMEOUT_OPTION_NAME "InProgressTimeout"
#define SUPPRESS_WRITER_OPTION "SuppressWriter"
#define OUTPUT_FILENAME_OPTION "OutputFileName"
From ping at helixcommunity.org Fri Sep 4 08:23:13 2009
From: ping at helixcommunity.org (ping@helixcommunity.org)
Date: Fri Sep 4 17:27:11 2009
Subject: [Common-cvs] include hxdtdr.h,1.6,1.7
Message-ID:
Update of /cvsroot/common/include
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv7929
Modified Files:
hxdtdr.h
Log Message:
Added new option for InProgressTimeout
Index: hxdtdr.h
===================================================================
RCS file: /cvsroot/common/include/hxdtdr.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- hxdtdr.h 6 Jul 2007 20:43:41 -0000 1.6
+++ hxdtdr.h 4 Sep 2009 16:23:11 -0000 1.7
@@ -85,6 +85,7 @@
#define DECODE_OPTION_NAME "DecodeSource"
#define BLOCK_OPTION_NAME "BlockFilter"
#define MUX_OPTION_NAME "MuxAudioVideo"
+#define INPROGRESS_TIMEOUT_OPTION_NAME "InProgressTimeout"
#define SUPPRESS_WRITER_OPTION "SuppressWriter"
#define OUTPUT_FILENAME_OPTION "OutputFileName"
From ehyche at helixcommunity.org Fri Sep 4 08:51:03 2009
From: ehyche at helixcommunity.org (ehyche@helixcommunity.org)
Date: Fri Sep 4 17:55:01 2009
Subject: [Common-cvs] include hxiids.h,1.167,1.168
Message-ID:
Update of /cvsroot/common/include
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv11886
Modified Files:
hxiids.h
Log Message:
Add IID_IHXPreferences3 GUID.
Index: hxiids.h
===================================================================
RCS file: /cvsroot/common/include/hxiids.h,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -d -r1.167 -r1.168
--- hxiids.h 31 Aug 2009 23:53:10 -0000 1.167
+++ hxiids.h 4 Sep 2009 16:51:01 -0000 1.168
@@ -442,6 +442,8 @@
0xa0, 0x24, 0x40, 0x6d, 0x59)
DEFINE_GUID_ENUM(IID_IHXPreferenceEnumerator, 0x00000504, 0x901, 0x11d1, 0x8b, 0x6, 0x0,
0xa0, 0x24, 0x40, 0x6d, 0x59)
+DEFINE_GUID_ENUM(IID_IHXPreferences3, 0x00000505, 0x901, 0x11d1, 0x8b, 0x6, 0x0,
+ 0xa0, 0x24, 0x40, 0x6d, 0x59)
#endif
/*
From ehyche at helixcommunity.org Fri Sep 4 08:51:03 2009
From: ehyche at helixcommunity.org (ehyche@helixcommunity.org)
Date: Fri Sep 4 17:55:01 2009
Subject: [Common-cvs] include hxiids.h,1.167,1.168
Message-ID:
Update of /cvsroot/common/include
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv11886
Modified Files:
hxiids.h
Log Message:
Add IID_IHXPreferences3 GUID.
Index: hxiids.h
===================================================================
RCS file: /cvsroot/common/include/hxiids.h,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -d -r1.167 -r1.168
--- hxiids.h 31 Aug 2009 23:53:10 -0000 1.167
+++ hxiids.h 4 Sep 2009 16:51:01 -0000 1.168
@@ -442,6 +442,8 @@
0xa0, 0x24, 0x40, 0x6d, 0x59)
DEFINE_GUID_ENUM(IID_IHXPreferenceEnumerator, 0x00000504, 0x901, 0x11d1, 0x8b, 0x6, 0x0,
0xa0, 0x24, 0x40, 0x6d, 0x59)
+DEFINE_GUID_ENUM(IID_IHXPreferences3, 0x00000505, 0x901, 0x11d1, 0x8b, 0x6, 0x0,
+ 0xa0, 0x24, 0x40, 0x6d, 0x59)
#endif
/*
From ehyche at helixcommunity.org Fri Sep 4 08:51:39 2009
From: ehyche at helixcommunity.org (ehyche@helixcommunity.org)
Date: Fri Sep 4 17:55:37 2009
Subject: [Common-cvs] include hxiids.h,1.165,1.165.2.1
Message-ID:
Update of /cvsroot/common/include
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv12223
Modified Files:
Tag: PRODUCER_13_0_RN
hxiids.h
Log Message:
Merge to PRODUCER_13_0_RN. Add IID_IHXPreferences3 GUID.
Index: hxiids.h
===================================================================
RCS file: /cvsroot/common/include/hxiids.h,v
retrieving revision 1.165
retrieving revision 1.165.2.1
diff -u -d -r1.165 -r1.165.2.1
--- hxiids.h 5 May 2009 16:26:33 -0000 1.165
+++ hxiids.h 4 Sep 2009 16:51:36 -0000 1.165.2.1
@@ -442,6 +442,8 @@
0xa0, 0x24, 0x40, 0x6d, 0x59)
DEFINE_GUID_ENUM(IID_IHXPreferenceEnumerator, 0x00000504, 0x901, 0x11d1, 0x8b, 0x6, 0x0,
0xa0, 0x24, 0x40, 0x6d, 0x59)
+DEFINE_GUID_ENUM(IID_IHXPreferences3, 0x00000505, 0x901, 0x11d1, 0x8b, 0x6, 0x0,
+ 0xa0, 0x24, 0x40, 0x6d, 0x59)
#endif
/*
From ehyche at helixcommunity.org Fri Sep 4 08:51:39 2009
From: ehyche at helixcommunity.org (ehyche@helixcommunity.org)
Date: Fri Sep 4 17:55:38 2009
Subject: [Common-cvs] include hxiids.h,1.165,1.165.2.1
Message-ID:
Update of /cvsroot/common/include
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv12223
Modified Files:
Tag: PRODUCER_13_0_RN
hxiids.h
Log Message:
Merge to PRODUCER_13_0_RN. Add IID_IHXPreferences3 GUID.
Index: hxiids.h
===================================================================
RCS file: /cvsroot/common/include/hxiids.h,v
retrieving revision 1.165
retrieving revision 1.165.2.1
diff -u -d -r1.165 -r1.165.2.1
--- hxiids.h 5 May 2009 16:26:33 -0000 1.165
+++ hxiids.h 4 Sep 2009 16:51:36 -0000 1.165.2.1
@@ -442,6 +442,8 @@
0xa0, 0x24, 0x40, 0x6d, 0x59)
DEFINE_GUID_ENUM(IID_IHXPreferenceEnumerator, 0x00000504, 0x901, 0x11d1, 0x8b, 0x6, 0x0,
0xa0, 0x24, 0x40, 0x6d, 0x59)
+DEFINE_GUID_ENUM(IID_IHXPreferences3, 0x00000505, 0x901, 0x11d1, 0x8b, 0x6, 0x0,
+ 0xa0, 0x24, 0x40, 0x6d, 0x59)
#endif
/*
From ehyche at helixcommunity.org Fri Sep 4 10:57:34 2009
From: ehyche at helixcommunity.org (ehyche@helixcommunity.org)
Date: Fri Sep 4 20:01:31 2009
Subject: [Common-cvs] include hxpiids.h,1.71,1.72
Message-ID:
Update of /cvsroot/common/include
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv18924
Modified Files:
hxpiids.h
Log Message:
Remove IID_IHXPreferences3 from hxpiids.h since it is now in hxiids.h
Index: hxpiids.h
===================================================================
RCS file: /cvsroot/common/include/hxpiids.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- hxpiids.h 12 Aug 2009 17:35:11 -0000 1.71
+++ hxpiids.h 4 Sep 2009 18:57:30 -0000 1.72
@@ -167,19 +167,6 @@
DEFINE_GUID_ENUM(IID_IHXUpdateRendererResponse, 0x00000502, 0xb4c8, 0x11d0, 0x99, 0x95, 0x0, 0xa0, 0x24, 0x8d, 0xa5, 0xf0)
/*
- * File:
- * hxprefs.h
- * Description:
- * Interface for deleting prefernces
- * Interfaces:
- * IID_IHXPreferences3: {0x00000505-9011-11d1-8b60-a024406d59}
- */
-
-#if ( !defined(_HXPREFS_H_) || !defined(HELIX_FEATURE_FULLGUID) )
-DEFINE_GUID_ENUM(IID_IHXPreferences3, 0x00000505, 0x901, 0x11d1, 0x8b, 0x6, 0x0, 0xa0, 0x24, 0x40, 0x6d, 0x59)
-#endif
-
-/*
* File:
* hxpnets.h
* Description:
From ehyche at helixcommunity.org Fri Sep 4 10:57:34 2009
From: ehyche at helixcommunity.org (ehyche@helixcommunity.org)
Date: Fri Sep 4 20:01:31 2009
Subject: [Common-cvs] include hxpiids.h,1.71,1.72
Message-ID:
Update of /cvsroot/common/include
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv18924
Modified Files:
hxpiids.h
Log Message:
Remove IID_IHXPreferences3 from hxpiids.h since it is now in hxiids.h
Index: hxpiids.h
===================================================================
RCS file: /cvsroot/common/include/hxpiids.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- hxpiids.h 12 Aug 2009 17:35:11 -0000 1.71
+++ hxpiids.h 4 Sep 2009 18:57:30 -0000 1.72
@@ -167,19 +167,6 @@
DEFINE_GUID_ENUM(IID_IHXUpdateRendererResponse, 0x00000502, 0xb4c8, 0x11d0, 0x99, 0x95, 0x0, 0xa0, 0x24, 0x8d, 0xa5, 0xf0)
/*
- * File:
- * hxprefs.h
- * Description:
- * Interface for deleting prefernces
- * Interfaces:
- * IID_IHXPreferences3: {0x00000505-9011-11d1-8b60-a024406d59}
- */
-
-#if ( !defined(_HXPREFS_H_) || !defined(HELIX_FEATURE_FULLGUID) )
-DEFINE_GUID_ENUM(IID_IHXPreferences3, 0x00000505, 0x901, 0x11d1, 0x8b, 0x6, 0x0, 0xa0, 0x24, 0x40, 0x6d, 0x59)
-#endif
-
-/*
* File:
* hxpnets.h
* Description:
From ehyche at helixcommunity.org Fri Sep 4 10:58:15 2009
From: ehyche at helixcommunity.org (ehyche@helixcommunity.org)
Date: Fri Sep 4 20:02:11 2009
Subject: [Common-cvs] include hxpiids.h,1.69.2.1,1.69.2.2
Message-ID:
Update of /cvsroot/common/include
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv18973
Modified Files:
Tag: PRODUCER_13_0_RN
hxpiids.h
Log Message:
Merge to PRODUCER_13_0_RN. Remove IID_IHXPreferences3 from hxpiids.h since it is now in hxiids.h.
Index: hxpiids.h
===================================================================
RCS file: /cvsroot/common/include/hxpiids.h,v
retrieving revision 1.69.2.1
retrieving revision 1.69.2.2
diff -u -d -r1.69.2.1 -r1.69.2.2
--- hxpiids.h 10 Aug 2009 23:48:04 -0000 1.69.2.1
+++ hxpiids.h 4 Sep 2009 18:58:12 -0000 1.69.2.2
@@ -167,19 +167,6 @@
DEFINE_GUID_ENUM(IID_IHXUpdateRendererResponse, 0x00000502, 0xb4c8, 0x11d0, 0x99, 0x95, 0x0, 0xa0, 0x24, 0x8d, 0xa5, 0xf0)
/*
- * File:
- * hxprefs.h
- * Description:
- * Interface for deleting prefernces
- * Interfaces:
- * IID_IHXPreferences3: {0x00000505-9011-11d1-8b60-a024406d59}
- */
-
-#if ( !defined(_HXPREFS_H_) || !defined(HELIX_FEATURE_FULLGUID) )
-DEFINE_GUID_ENUM(IID_IHXPreferences3, 0x00000505, 0x901, 0x11d1, 0x8b, 0x6, 0x0, 0xa0, 0x24, 0x40, 0x6d, 0x59)
-#endif
-
-/*
* File:
* hxpnets.h
* Description:
From ehyche at helixcommunity.org Fri Sep 4 10:58:15 2009
From: ehyche at helixcommunity.org (ehyche@helixcommunity.org)
Date: Fri Sep 4 20:02:11 2009
Subject: [Common-cvs] include hxpiids.h,1.69.2.1,1.69.2.2
Message-ID:
Update of /cvsroot/common/include
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv18973
Modified Files:
Tag: PRODUCER_13_0_RN
hxpiids.h
Log Message:
Merge to PRODUCER_13_0_RN. Remove IID_IHXPreferences3 from hxpiids.h since it is now in hxiids.h.
Index: hxpiids.h
===================================================================
RCS file: /cvsroot/common/include/hxpiids.h,v
retrieving revision 1.69.2.1
retrieving revision 1.69.2.2
diff -u -d -r1.69.2.1 -r1.69.2.2
--- hxpiids.h 10 Aug 2009 23:48:04 -0000 1.69.2.1
+++ hxpiids.h 4 Sep 2009 18:58:12 -0000 1.69.2.2
@@ -167,19 +167,6 @@
DEFINE_GUID_ENUM(IID_IHXUpdateRendererResponse, 0x00000502, 0xb4c8, 0x11d0, 0x99, 0x95, 0x0, 0xa0, 0x24, 0x8d, 0xa5, 0xf0)
/*
- * File:
- * hxprefs.h
- * Description:
- * Interface for deleting prefernces
- * Interfaces:
- * IID_IHXPreferences3: {0x00000505-9011-11d1-8b60-a024406d59}
- */
-
-#if ( !defined(_HXPREFS_H_) || !defined(HELIX_FEATURE_FULLGUID) )
-DEFINE_GUID_ENUM(IID_IHXPreferences3, 0x00000505, 0x901, 0x11d1, 0x8b, 0x6, 0x0, 0xa0, 0x24, 0x40, 0x6d, 0x59)
-#endif
-
-/*
* File:
* hxpnets.h
* Description:
From mazimi at helixcommunity.org Fri Sep 4 13:47:39 2009
From: mazimi at helixcommunity.org (mazimi@helixcommunity.org)
Date: Fri Sep 4 22:51:35 2009
Subject: [Common-cvs] include hxsharedmmf.h,1.1.2.1,1.1.2.2
Message-ID:
Update of /cvsroot/common/include
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv8440/include
Modified Files:
Tag: PRODUCER_13_0_RN
hxsharedmmf.h
Log Message:
Synopsis
========
Fixed Bug 249757:CLI crashes when GUI is open
Branches: PRODUCER_13_0_RN and HEAD
Description
===========
1-Fixed a bug in SharedMMF implementation.
The memory mapped file object uses a MMFView, which is the header written at the beginning of each memory mapped file view. MMFView had a char * pData member which was initialized to point to the data buffer start. The culprit was to assume that shared MMview had the same mapped address on all processes, and so share the pData variable among all processes. this is not the case all the time. This is fixed now by moving out the pData from MMFView header structure and initialize it the local process address when the map is opened.
2- Replaced all uses of ULONG32 with UINT32
Files Affected
==============
Changed files:
common/fileio/platform/win/sharedmmf.cpp
common/fileio/platform/win/sharedmmf.h
common/include/hxsharedmmf.h
Testing Performed
=================
* tested in producer application using the license manager implementation of floating license.
Performance Tests:
- None
Platforms Tested: win32-i386-vc7
QA Hints
========
Index: hxsharedmmf.h
===================================================================
RCS file: /cvsroot/common/include/hxsharedmmf.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- hxsharedmmf.h 10 Aug 2009 23:48:04 -0000 1.1.2.1
+++ hxsharedmmf.h 4 Sep 2009 21:47:36 -0000 1.1.2.2
@@ -90,9 +90,9 @@
REFIID riid,
void** ppvObj) PURE;
- STDMETHOD_(ULONG32, AddRef) (THIS) PURE;
+ STDMETHOD_(UINT32, AddRef) (THIS) PURE;
- STDMETHOD_(ULONG32, Release) (THIS) PURE;
+ STDMETHOD_(UINT32, Release) (THIS) PURE;
/*
* IHXSharedMMFileFactory methods
@@ -137,32 +137,32 @@
*/
STDMETHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE;
- STDMETHOD_(ULONG32, AddRef) (THIS) PURE;
+ STDMETHOD_(UINT32, AddRef) (THIS) PURE;
- STDMETHOD_(ULONG32, Release) (THIS) PURE;
+ STDMETHOD_(UINT32, Release) (THIS) PURE;
/*
* IHXSharedMMFile methods
*/
/* */
- STDMETHOD(OpenMap) (THIS_ const char* pszSharedName, ULONG32 ulSize) PURE;
+ STDMETHOD(OpenMap) (THIS_ const char* pszSharedName, UINT32 ulSize) PURE;
/* */
STDMETHOD(CloseMap) (THIS) PURE;
/* */
- STDMETHOD(Read) (THIS_ REF(IHXBuffer*) pBuffer, ULONG32 count = 0) PURE;
+ STDMETHOD(Read) (THIS_ REF(IHXBuffer*) pBuffer, UINT32 count = 0) PURE;
/* */
STDMETHOD(Write) (THIS_ IHXBuffer* pBuffer) PURE;
/* */
- STDMETHOD(GetDataSize) (THIS_ REF(ULONG32) size) PURE;
+ STDMETHOD(GetDataSize) (THIS_ REF(UINT32) size) PURE;
/* */
- STDMETHOD(SetDataSize) (THIS_ ULONG32 size) PURE;
+ STDMETHOD(SetDataSize) (THIS_ UINT32 size) PURE;
/*
* IsOpen returns TRUE if file is open. Otherwise FALSE.
@@ -174,10 +174,10 @@
* fromWhere specifier returns current position of file or -1 on
* error.
*/
- STDMETHOD(Seek) (THIS_ ULONG32 ulOffset, ULONG32 ulFromWhere) PURE;
+ STDMETHOD(Seek) (THIS_ UINT32 ulOffset, UINT32 ulFromWhere) PURE;
/* Tell returns the current file position in the file */
- STDMETHOD_(ULONG32, Tell) (THIS) PURE;
+ STDMETHOD_(UINT32, Tell) (THIS) PURE;
/* */
STDMETHOD(LockMap) (THIS) PURE;
From mazimi at helixcommunity.org Fri Sep 4 13:47:39 2009
From: mazimi at helixcommunity.org (mazimi@helixcommunity.org)
Date: Fri Sep 4 22:51:36 2009
Subject: [Common-cvs] include hxsharedmmf.h,1.1.2.1,1.1.2.2
Message-ID:
Update of /cvsroot/common/include
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv8440/include
Modified Files:
Tag: PRODUCER_13_0_RN
hxsharedmmf.h
Log Message:
Synopsis
========
Fixed Bug 249757:CLI crashes when GUI is open
Branches: PRODUCER_13_0_RN and HEAD
Description
===========
1-Fixed a bug in SharedMMF implementation.
The memory mapped file object uses a MMFView, which is the header written at the beginning of each memory mapped file view. MMFView had a char * pData member which was initialized to point to the data buffer start. The culprit was to assume that shared MMview had the same mapped address on all processes, and so share the pData variable among all processes. this is not the case all the time. This is fixed now by moving out the pData from MMFView header structure and initialize it the local process address when the map is opened.
2- Replaced all uses of ULONG32 with UINT32
Files Affected
==============
Changed files:
common/fileio/platform/win/sharedmmf.cpp
common/fileio/platform/win/sharedmmf.h
common/include/hxsharedmmf.h
Testing Performed
=================
* tested in producer application using the license manager implementation of floating license.
Performance Tests:
- None
Platforms Tested: win32-i386-vc7
QA Hints
========
Index: hxsharedmmf.h
===================================================================
RCS file: /cvsroot/common/include/hxsharedmmf.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- hxsharedmmf.h 10 Aug 2009 23:48:04 -0000 1.1.2.1
+++ hxsharedmmf.h 4 Sep 2009 21:47:36 -0000 1.1.2.2
@@ -90,9 +90,9 @@
REFIID riid,
void** ppvObj) PURE;
- STDMETHOD_(ULONG32, AddRef) (THIS) PURE;
+ STDMETHOD_(UINT32, AddRef) (THIS) PURE;
- STDMETHOD_(ULONG32, Release) (THIS) PURE;
+ STDMETHOD_(UINT32, Release) (THIS) PURE;
/*
* IHXSharedMMFileFactory methods
@@ -137,32 +137,32 @@
*/
STDMETHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE;
- STDMETHOD_(ULONG32, AddRef) (THIS) PURE;
+ STDMETHOD_(UINT32, AddRef) (THIS) PURE;
- STDMETHOD_(ULONG32, Release) (THIS) PURE;
+ STDMETHOD_(UINT32, Release) (THIS) PURE;
/*
* IHXSharedMMFile methods
*/
/* */
- STDMETHOD(OpenMap) (THIS_ const char* pszSharedName, ULONG32 ulSize) PURE;
+ STDMETHOD(OpenMap) (THIS_ const char* pszSharedName, UINT32 ulSize) PURE;
/* */
STDMETHOD(CloseMap) (THIS) PURE;
/* */
- STDMETHOD(Read) (THIS_ REF(IHXBuffer*) pBuffer, ULONG32 count = 0) PURE;
+ STDMETHOD(Read) (THIS_ REF(IHXBuffer*) pBuffer, UINT32 count = 0) PURE;
/* */
STDMETHOD(Write) (THIS_ IHXBuffer* pBuffer) PURE;
/* */
- STDMETHOD(GetDataSize) (THIS_ REF(ULONG32) size) PURE;
+ STDMETHOD(GetDataSize) (THIS_ REF(UINT32) size) PURE;
/* */
- STDMETHOD(SetDataSize) (THIS_ ULONG32 size) PURE;
+ STDMETHOD(SetDataSize) (THIS_ UINT32 size) PURE;
/*
* IsOpen returns TRUE if file is open. Otherwise FALSE.
@@ -174,10 +174,10 @@
* fromWhere specifier returns current position of file or -1 on
* error.
*/
- STDMETHOD(Seek) (THIS_ ULONG32 ulOffset, ULONG32 ulFromWhere) PURE;
+ STDMETHOD(Seek) (THIS_ UINT32 ulOffset, UINT32 ulFromWhere) PURE;
/* Tell returns the current file position in the file */
- STDMETHOD_(ULONG32, Tell) (THIS) PURE;
+ STDMETHOD_(UINT32, Tell) (THIS) PURE;
/* */
STDMETHOD(LockMap) (THIS) PURE;
From mazimi at helixcommunity.org Fri Sep 4 13:47:39 2009
From: mazimi at helixcommunity.org (mazimi@helixcommunity.org)
Date: Fri Sep 4 22:51:36 2009
Subject: [Common-cvs] fileio/platform/win sharedmmf.cpp, 1.1.2.1,
1.1.2.2 sharedmmf.h, 1.1.2.1, 1.1.2.2
Message-ID:
Update of /cvsroot/common/fileio/platform/win
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv8440/fileio/platform/win
Modified Files:
Tag: PRODUCER_13_0_RN
sharedmmf.cpp sharedmmf.h
Log Message:
Synopsis
========
Fixed Bug 249757:CLI crashes when GUI is open
Branches: PRODUCER_13_0_RN and HEAD
Description
===========
1-Fixed a bug in SharedMMF implementation.
The memory mapped file object uses a MMFView, which is the header written at the beginning of each memory mapped file view. MMFView had a char * pData member which was initialized to point to the data buffer start. The culprit was to assume that shared MMview had the same mapped address on all processes, and so share the pData variable among all processes. this is not the case all the time. This is fixed now by moving out the pData from MMFView header structure and initialize it the local process address when the map is opened.
2- Replaced all uses of ULONG32 with UINT32
Files Affected
==============
Changed files:
common/fileio/platform/win/sharedmmf.cpp
common/fileio/platform/win/sharedmmf.h
common/include/hxsharedmmf.h
Testing Performed
=================
* tested in producer application using the license manager implementation of floating license.
Performance Tests:
- None
Platforms Tested: win32-i386-vc7
QA Hints
========
Index: sharedmmf.cpp
===================================================================
RCS file: /cvsroot/common/fileio/platform/win/sharedmmf.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- sharedmmf.cpp 10 Aug 2009 23:48:05 -0000 1.1.2.1
+++ sharedmmf.cpp 4 Sep 2009 21:47:37 -0000 1.1.2.2
@@ -62,9 +62,10 @@
, m_MMFSharedName("")
, m_SharedMutexName("")
, m_pViewRaw(NULL)
-, m_pMMView(NULL)
+, m_pMMViewHeader(NULL)
, m_bLock(FALSE)
, m_fp(0)
+, m_pData(NULL)
{
m_pContext = pContext;
@@ -107,14 +108,14 @@
}
-STDMETHODIMP_(ULONG32)
+STDMETHODIMP_(UINT32)
CHXWinSharedMMFile::AddRef()
{
return InterlockedIncrement(&m_lRefCount);
}
-STDMETHODIMP_(ULONG32)
+STDMETHODIMP_(UINT32)
CHXWinSharedMMFile::Release()
{
if (InterlockedDecrement(&m_lRefCount) > 0)
@@ -127,7 +128,7 @@
/* */
-STDMETHODIMP CHXWinSharedMMFile::OpenMap(const char* pszSharedName, ULONG32 ulSize)
+STDMETHODIMP CHXWinSharedMMFile::OpenMap(const char* pszSharedName, UINT32 ulSize)
{
HX_RESULT res = HXR_OK;
HXBOOL bMapExist = FALSE;
@@ -150,7 +151,7 @@
{
LockMap();
- newFileMap = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, ulSize+sizeof(MMView), OS_STRING(pszSharedName));
+ newFileMap = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, ulSize+sizeof(MMViewHeader), OS_STRING(pszSharedName));
if (newFileMap)
{
if (GetLastError() == ERROR_ALREADY_EXISTS)
@@ -180,24 +181,25 @@
m_pViewRaw = MapViewOfFile(newFileMap, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 0);
if (m_pViewRaw)
{
- m_pMMView = reinterpret_cast(m_pViewRaw);
+ m_pMMViewHeader = reinterpret_cast(m_pViewRaw);
if (!bMapExist)
{
// We just created this map, set it up
- m_pMMView->sMagicID[0] = 'H';
- m_pMMView->sMagicID[1] = 'M';
- m_pMMView->sMagicID[2] = 'M';
- m_pMMView->sMagicID[3] = 'F';
- m_pMMView->ulMapSize = ulSize;
- m_pMMView->ulDataSize = 0;
- m_pMMView->pData = reinterpret_cast(m_pMMView + 1);
+ m_pMMViewHeader->sMagicID[0] = 'H';
+ m_pMMViewHeader->sMagicID[1] = 'M';
+ m_pMMViewHeader->sMagicID[2] = 'M';
+ m_pMMViewHeader->sMagicID[3] = 'F';
+ m_pMMViewHeader->ulMapSize = ulSize;
+ m_pMMViewHeader->ulDataSize = 0;
+ m_pData = reinterpret_cast(m_pMMViewHeader + 1);
}
else
{
// Check if the view starts with a valid MMView signature
- HX_ASSERT((m_pMMView->sMagicID[0] == 'H') && (m_pMMView->sMagicID[1] == 'M') && (m_pMMView->sMagicID[2] == 'M') && (m_pMMView->sMagicID[3] == 'F'));
- HX_ASSERT(m_pMMView->ulMapSize == ulSize);
- HX_ASSERT(m_pMMView->ulDataSize <= m_pMMView->ulMapSize - sizeof(MMView));
+ HX_ASSERT((m_pMMViewHeader->sMagicID[0] == 'H') && (m_pMMViewHeader->sMagicID[1] == 'M') && (m_pMMViewHeader->sMagicID[2] == 'M') && (m_pMMViewHeader->sMagicID[3] == 'F'));
+ HX_ASSERT(m_pMMViewHeader->ulMapSize == ulSize);
+ HX_ASSERT(m_pMMViewHeader->ulDataSize <= m_pMMViewHeader->ulMapSize - sizeof(MMViewHeader));
+ m_pData = reinterpret_cast(m_pMMViewHeader + 1);
}
m_fp = 0;
@@ -276,26 +278,28 @@
/* */
-STDMETHODIMP CHXWinSharedMMFile::Read(REF(IHXBuffer*) pBuffer, ULONG32 count)
+STDMETHODIMP CHXWinSharedMMFile::Read(REF(IHXBuffer*) pBuffer, UINT32 count)
{
HX_RESULT res = HXR_OK;
if (count == 0)
- count = m_pMMView->ulDataSize - m_fp;
+ count = m_pMMViewHeader->ulDataSize - m_fp;
- if (!IsOpen() || (count > m_pMMView->ulDataSize - m_fp) || (HXR_OK != CreateBufferCCF(pBuffer, m_pContext)))
+ if (!IsOpen() || (count > m_pMMViewHeader->ulDataSize - m_fp) || (HXR_OK != CreateBufferCCF(pBuffer, m_pContext)))
{
res = HXR_FAILED;
}
else
{
+ HX_ASSERT(m_pData != NULL);
+ HX_ASSERT(m_pMMViewHeader);
pBuffer->SetSize(count);
- memcpy(pBuffer->GetBuffer(), m_pMMView->pData + m_fp , count);
+ memcpy(pBuffer->GetBuffer(), m_pData + m_fp , count);
m_fp += count;
}
- HX_ASSERT(m_fp <= m_pMMView->ulDataSize);
+ HX_ASSERT(m_fp <= m_pMMViewHeader->ulDataSize);
return res;
}
@@ -307,28 +311,30 @@
- if (!IsOpen() || (pBuffer->GetSize() > m_pMMView->ulMapSize - m_fp))
+ if (!IsOpen() || (pBuffer->GetSize() > m_pMMViewHeader->ulMapSize - m_fp))
{
res = HXR_FAILED;
}
else
{
- memcpy(m_pMMView->pData + m_fp, pBuffer->GetBuffer(), pBuffer->GetSize());
+ HX_ASSERT(m_pData != NULL);
+ HX_ASSERT(m_pMMViewHeader);
+ memcpy(m_pData + m_fp, pBuffer->GetBuffer(), pBuffer->GetSize());
m_fp += pBuffer->GetSize();
- if(m_pMMView->ulDataSize < m_fp)
+ if(m_pMMViewHeader->ulDataSize < m_fp)
{
// The view data size has expanded, set the new data size in header
- m_pMMView->ulDataSize = m_fp;
+ m_pMMViewHeader->ulDataSize = m_fp;
#ifdef _DEBUG
- memset(m_pMMView->pData+m_fp, 0xCD, m_pMMView->ulMapSize - m_pMMView->ulDataSize);
+ memset(m_pData+m_fp, 0xCD, m_pMMViewHeader->ulMapSize - m_pMMViewHeader->ulDataSize);
#endif
}
}
- HX_ASSERT(m_pMMView->ulDataSize <= m_pMMView->ulMapSize);
- HX_ASSERT(m_fp <= m_pMMView->ulDataSize);
+ HX_ASSERT(m_pMMViewHeader->ulDataSize <= m_pMMViewHeader->ulMapSize);
+ HX_ASSERT(m_fp <= m_pMMViewHeader->ulDataSize);
return res;
}
@@ -337,14 +343,14 @@
*/
STDMETHODIMP
-CHXWinSharedMMFile::GetDataSize(REF(ULONG32) size)
+CHXWinSharedMMFile::GetDataSize(REF(UINT32) size)
{
HX_RESULT res = HXR_FAILED;
if(IsOpen())
{
- HX_ASSERT(m_pMMView);
- size = m_pMMView->ulDataSize;
+ HX_ASSERT(m_pMMViewHeader);
+ size = m_pMMViewHeader->ulDataSize;
res = HXR_OK;
}
@@ -352,24 +358,24 @@
}
-STDMETHODIMP CHXWinSharedMMFile::SetDataSize(ULONG32 size)
+STDMETHODIMP CHXWinSharedMMFile::SetDataSize(UINT32 size)
{
HX_RESULT res = HXR_OK;
- if (!IsOpen() || (m_pMMView->ulMapSize < size))
+ if (!IsOpen() || (m_pMMViewHeader->ulMapSize < size))
{
res = HXR_FAILED;
}
else
{
- m_pMMView->ulDataSize = size;
+ m_pMMViewHeader->ulDataSize = size;
#ifdef _DEBUG
- memset(m_pMMView->pData+m_pMMView->ulDataSize, 0xEF, m_pMMView->ulMapSize - m_pMMView->ulDataSize);
+ memset(m_pData+m_pMMViewHeader->ulDataSize, 0xEF, m_pMMViewHeader->ulMapSize - m_pMMViewHeader->ulDataSize);
#endif
}
- HX_ASSERT(m_pMMView->ulDataSize <= m_pMMView->ulMapSize);
+ HX_ASSERT(m_pMMViewHeader->ulDataSize <= m_pMMViewHeader->ulMapSize);
return res;
}
@@ -389,7 +395,7 @@
* fromWhere specifier returns current position of file or -1 on
* error.
*/
-STDMETHODIMP CHXWinSharedMMFile::Seek(ULONG32 ulOffset, ULONG32 ulFromWhere)
+STDMETHODIMP CHXWinSharedMMFile::Seek(UINT32 ulOffset, UINT32 ulFromWhere)
{
HX_RESULT res = HXR_OK;
if(!IsOpen())
@@ -399,11 +405,11 @@
}
else
{
- HX_ASSERT(m_pMMView);
+ HX_ASSERT(m_pMMViewHeader);
if (ulFromWhere == SEEK_END)
{
- m_fp = m_pMMView->ulDataSize + ulOffset;
+ m_fp = m_pMMViewHeader->ulDataSize + ulOffset;
}
else if (ulFromWhere == SEEK_SET)
{
@@ -420,13 +426,13 @@
}
}
- HX_ASSERT(m_fp <= m_pMMView->ulMapSize);
+ HX_ASSERT(m_fp <= m_pMMViewHeader->ulMapSize);
return res;
}
/* Tell returns the current file position in the file */
-STDMETHODIMP_(ULONG32) CHXWinSharedMMFile::Tell()
+STDMETHODIMP_(UINT32) CHXWinSharedMMFile::Tell()
{
if(!IsOpen())
{
@@ -486,7 +492,8 @@
/* */
void CHXWinSharedMMFile::ZeroFillMap()
{
- HX_ASSERT(m_pMMView);
- memset(m_pMMView->pData, 0, m_pMMView->ulMapSize - sizeof (MMView));
+ HX_ASSERT(m_pMMViewHeader);
+ HX_ASSERT(m_pData != NULL);
+ memset(m_pData, 0, m_pMMViewHeader->ulMapSize - sizeof (MMViewHeader));
}
Index: sharedmmf.h
===================================================================
RCS file: /cvsroot/common/fileio/platform/win/sharedmmf.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- sharedmmf.h 10 Aug 2009 23:48:05 -0000 1.1.2.1
+++ sharedmmf.h 4 Sep 2009 21:47:37 -0000 1.1.2.2
@@ -69,9 +69,9 @@
REFIID riid,
void** ppvObj);
- STDMETHOD_(ULONG32, AddRef) (THIS);
+ STDMETHOD_(UINT32, AddRef) (THIS);
- STDMETHOD_(ULONG32, Release) (THIS);
+ STDMETHOD_(UINT32, Release) (THIS);
CHXWinSharedMMFile(IUnknown* pContext);
@@ -79,7 +79,7 @@
~CHXWinSharedMMFile();
STDMETHOD(OpenMap) (THIS_
- const char* pszSharedName, ULONG32 ulSize);
+ const char* pszSharedName, UINT32 ulSize);
/* */
STDMETHOD(CloseMap) (THIS);
@@ -87,7 +87,7 @@
/* */
STDMETHOD(Read) (THIS_
- REF(IHXBuffer*) pBuffer, ULONG32 count = 0);
+ REF(IHXBuffer*) pBuffer, UINT32 count = 0);
/* */
@@ -96,11 +96,11 @@
/* */
- STDMETHOD(GetDataSize) (THIS_ REF(ULONG32) size);
+ STDMETHOD(GetDataSize) (THIS_ REF(UINT32) size);
/* */
- STDMETHOD(SetDataSize) (THIS_ ULONG32 size);
+ STDMETHOD(SetDataSize) (THIS_ UINT32 size);
/*
@@ -114,10 +114,10 @@
* error.
*/
STDMETHOD(Seek) (THIS_
- ULONG32 ulOffset, ULONG32 ulFromWhere);
+ UINT32 ulOffset, UINT32 ulFromWhere);
/* Tell returns the current file position in the file */
- STDMETHOD_(ULONG32, Tell) (THIS);
+ STDMETHOD_(UINT32, Tell) (THIS);
/* */
STDMETHOD(LockMap) (THIS);
@@ -135,12 +135,11 @@
void ZeroFillMap();
- typedef struct MMView
+ typedef struct MMViewHeader
{
- char sMagicID[4];
- ULONG32 ulMapSize;
- ULONG32 ulDataSize;
- char *pData;
+ char sMagicID[4];
+ UINT32 ulMapSize;
+ UINT32 ulDataSize;
};
IUnknown* m_pContext;
@@ -150,9 +149,10 @@
CHXString m_MMFSharedName;
CHXString m_SharedMutexName;
void *m_pViewRaw;
- MMView *m_pMMView;
+ MMViewHeader *m_pMMViewHeader;
HXBOOL m_bLock;
- ULONG32 m_fp;
+ UINT32 m_fp;
+ char *m_pData;
};
From mazimi at helixcommunity.org Fri Sep 4 13:47:39 2009
From: mazimi at helixcommunity.org (mazimi@helixcommunity.org)
Date: Fri Sep 4 22:51:37 2009
Subject: [Common-cvs] fileio/platform/win sharedmmf.cpp, 1.1.2.1,
1.1.2.2 sharedmmf.h, 1.1.2.1, 1.1.2.2
Message-ID:
Update of /cvsroot/common/fileio/platform/win
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv8440/fileio/platform/win
Modified Files:
Tag: PRODUCER_13_0_RN
sharedmmf.cpp sharedmmf.h
Log Message:
Synopsis
========
Fixed Bug 249757:CLI crashes when GUI is open
Branches: PRODUCER_13_0_RN and HEAD
Description
===========
1-Fixed a bug in SharedMMF implementation.
The memory mapped file object uses a MMFView, which is the header written at the beginning of each memory mapped file view. MMFView had a char * pData member which was initialized to point to the data buffer start. The culprit was to assume that shared MMview had the same mapped address on all processes, and so share the pData variable among all processes. this is not the case all the time. This is fixed now by moving out the pData from MMFView header structure and initialize it the local process address when the map is opened.
2- Replaced all uses of ULONG32 with UINT32
Files Affected
==============
Changed files:
common/fileio/platform/win/sharedmmf.cpp
common/fileio/platform/win/sharedmmf.h
common/include/hxsharedmmf.h
Testing Performed
=================
* tested in producer application using the license manager implementation of floating license.
Performance Tests:
- None
Platforms Tested: win32-i386-vc7
QA Hints
========
Index: sharedmmf.cpp
===================================================================
RCS file: /cvsroot/common/fileio/platform/win/sharedmmf.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- sharedmmf.cpp 10 Aug 2009 23:48:05 -0000 1.1.2.1
+++ sharedmmf.cpp 4 Sep 2009 21:47:37 -0000 1.1.2.2
@@ -62,9 +62,10 @@
, m_MMFSharedName("")
, m_SharedMutexName("")
, m_pViewRaw(NULL)
-, m_pMMView(NULL)
+, m_pMMViewHeader(NULL)
, m_bLock(FALSE)
, m_fp(0)
+, m_pData(NULL)
{
m_pContext = pContext;
@@ -107,14 +108,14 @@
}
-STDMETHODIMP_(ULONG32)
+STDMETHODIMP_(UINT32)
CHXWinSharedMMFile::AddRef()
{
return InterlockedIncrement(&m_lRefCount);
}
-STDMETHODIMP_(ULONG32)
+STDMETHODIMP_(UINT32)
CHXWinSharedMMFile::Release()
{
if (InterlockedDecrement(&m_lRefCount) > 0)
@@ -127,7 +128,7 @@
/* */
-STDMETHODIMP CHXWinSharedMMFile::OpenMap(const char* pszSharedName, ULONG32 ulSize)
+STDMETHODIMP CHXWinSharedMMFile::OpenMap(const char* pszSharedName, UINT32 ulSize)
{
HX_RESULT res = HXR_OK;
HXBOOL bMapExist = FALSE;
@@ -150,7 +151,7 @@
{
LockMap();
- newFileMap = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, ulSize+sizeof(MMView), OS_STRING(pszSharedName));
+ newFileMap = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, ulSize+sizeof(MMViewHeader), OS_STRING(pszSharedName));
if (newFileMap)
{
if (GetLastError() == ERROR_ALREADY_EXISTS)
@@ -180,24 +181,25 @@
m_pViewRaw = MapViewOfFile(newFileMap, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 0);
if (m_pViewRaw)
{
- m_pMMView = reinterpret_cast(m_pViewRaw);
+ m_pMMViewHeader = reinterpret_cast(m_pViewRaw);
if (!bMapExist)
{
// We just created this map, set it up
- m_pMMView->sMagicID[0] = 'H';
- m_pMMView->sMagicID[1] = 'M';
- m_pMMView->sMagicID[2] = 'M';
- m_pMMView->sMagicID[3] = 'F';
- m_pMMView->ulMapSize = ulSize;
- m_pMMView->ulDataSize = 0;
- m_pMMView->pData = reinterpret_cast(m_pMMView + 1);
+ m_pMMViewHeader->sMagicID[0] = 'H';
+ m_pMMViewHeader->sMagicID[1] = 'M';
+ m_pMMViewHeader->sMagicID[2] = 'M';
+ m_pMMViewHeader->sMagicID[3] = 'F';
+ m_pMMViewHeader->ulMapSize = ulSize;
+ m_pMMViewHeader->ulDataSize = 0;
+ m_pData = reinterpret_cast(m_pMMViewHeader + 1);
}
else
{
// Check if the view starts with a valid MMView signature
- HX_ASSERT((m_pMMView->sMagicID[0] == 'H') && (m_pMMView->sMagicID[1] == 'M') && (m_pMMView->sMagicID[2] == 'M') && (m_pMMView->sMagicID[3] == 'F'));
- HX_ASSERT(m_pMMView->ulMapSize == ulSize);
- HX_ASSERT(m_pMMView->ulDataSize <= m_pMMView->ulMapSize - sizeof(MMView));
+ HX_ASSERT((m_pMMViewHeader->sMagicID[0] == 'H') && (m_pMMViewHeader->sMagicID[1] == 'M') && (m_pMMViewHeader->sMagicID[2] == 'M') && (m_pMMViewHeader->sMagicID[3] == 'F'));
+ HX_ASSERT(m_pMMViewHeader->ulMapSize == ulSize);
+ HX_ASSERT(m_pMMViewHeader->ulDataSize <= m_pMMViewHeader->ulMapSize - sizeof(MMViewHeader));
+ m_pData = reinterpret_cast(m_pMMViewHeader + 1);
}
m_fp = 0;
@@ -276,26 +278,28 @@
/* */
-STDMETHODIMP CHXWinSharedMMFile::Read(REF(IHXBuffer*) pBuffer, ULONG32 count)
+STDMETHODIMP CHXWinSharedMMFile::Read(REF(IHXBuffer*) pBuffer, UINT32 count)
{
HX_RESULT res = HXR_OK;
if (count == 0)
- count = m_pMMView->ulDataSize - m_fp;
+ count = m_pMMViewHeader->ulDataSize - m_fp;
- if (!IsOpen() || (count > m_pMMView->ulDataSize - m_fp) || (HXR_OK != CreateBufferCCF(pBuffer, m_pContext)))
+ if (!IsOpen() || (count > m_pMMViewHeader->ulDataSize - m_fp) || (HXR_OK != CreateBufferCCF(pBuffer, m_pContext)))
{
res = HXR_FAILED;
}
else
{
+ HX_ASSERT(m_pData != NULL);
+ HX_ASSERT(m_pMMViewHeader);
pBuffer->SetSize(count);
- memcpy(pBuffer->GetBuffer(), m_pMMView->pData + m_fp , count);
+ memcpy(pBuffer->GetBuffer(), m_pData + m_fp , count);
m_fp += count;
}
- HX_ASSERT(m_fp <= m_pMMView->ulDataSize);
+ HX_ASSERT(m_fp <= m_pMMViewHeader->ulDataSize);
return res;
}
@@ -307,28 +311,30 @@
- if (!IsOpen() || (pBuffer->GetSize() > m_pMMView->ulMapSize - m_fp))
+ if (!IsOpen() || (pBuffer->GetSize() > m_pMMViewHeader->ulMapSize - m_fp))
{
res = HXR_FAILED;
}
else
{
- memcpy(m_pMMView->pData + m_fp, pBuffer->GetBuffer(), pBuffer->GetSize());
+ HX_ASSERT(m_pData != NULL);
+ HX_ASSERT(m_pMMViewHeader);
+ memcpy(m_pData + m_fp, pBuffer->GetBuffer(), pBuffer->GetSize());
m_fp += pBuffer->GetSize();
- if(m_pMMView->ulDataSize < m_fp)
+ if(m_pMMViewHeader->ulDataSize < m_fp)
{
// The view data size has expanded, set the new data size in header
- m_pMMView->ulDataSize = m_fp;
+ m_pMMViewHeader->ulDataSize = m_fp;
#ifdef _DEBUG
- memset(m_pMMView->pData+m_fp, 0xCD, m_pMMView->ulMapSize - m_pMMView->ulDataSize);
+ memset(m_pData+m_fp, 0xCD, m_pMMViewHeader->ulMapSize - m_pMMViewHeader->ulDataSize);
#endif
}
}
- HX_ASSERT(m_pMMView->ulDataSize <= m_pMMView->ulMapSize);
- HX_ASSERT(m_fp <= m_pMMView->ulDataSize);
+ HX_ASSERT(m_pMMViewHeader->ulDataSize <= m_pMMViewHeader->ulMapSize);
+ HX_ASSERT(m_fp <= m_pMMViewHeader->ulDataSize);
return res;
}
@@ -337,14 +343,14 @@
*/
STDMETHODIMP
-CHXWinSharedMMFile::GetDataSize(REF(ULONG32) size)
+CHXWinSharedMMFile::GetDataSize(REF(UINT32) size)
{
HX_RESULT res = HXR_FAILED;
if(IsOpen())
{
- HX_ASSERT(m_pMMView);
- size = m_pMMView->ulDataSize;
+ HX_ASSERT(m_pMMViewHeader);
+ size = m_pMMViewHeader->ulDataSize;
res = HXR_OK;
}
@@ -352,24 +358,24 @@
}
-STDMETHODIMP CHXWinSharedMMFile::SetDataSize(ULONG32 size)
+STDMETHODIMP CHXWinSharedMMFile::SetDataSize(UINT32 size)
{
HX_RESULT res = HXR_OK;
- if (!IsOpen() || (m_pMMView->ulMapSize < size))
+ if (!IsOpen() || (m_pMMViewHeader->ulMapSize < size))
{
res = HXR_FAILED;
}
else
{
- m_pMMView->ulDataSize = size;
+ m_pMMViewHeader->ulDataSize = size;
#ifdef _DEBUG
- memset(m_pMMView->pData+m_pMMView->ulDataSize, 0xEF, m_pMMView->ulMapSize - m_pMMView->ulDataSize);
+ memset(m_pData+m_pMMViewHeader->ulDataSize, 0xEF, m_pMMViewHeader->ulMapSize - m_pMMViewHeader->ulDataSize);
#endif
}
- HX_ASSERT(m_pMMView->ulDataSize <= m_pMMView->ulMapSize);
+ HX_ASSERT(m_pMMViewHeader->ulDataSize <= m_pMMViewHeader->ulMapSize);
return res;
}
@@ -389,7 +395,7 @@
* fromWhere specifier returns current position of file or -1 on
* error.
*/
-STDMETHODIMP CHXWinSharedMMFile::Seek(ULONG32 ulOffset, ULONG32 ulFromWhere)
+STDMETHODIMP CHXWinSharedMMFile::Seek(UINT32 ulOffset, UINT32 ulFromWhere)
{
HX_RESULT res = HXR_OK;
if(!IsOpen())
@@ -399,11 +405,11 @@
}
else
{
- HX_ASSERT(m_pMMView);
+ HX_ASSERT(m_pMMViewHeader);
if (ulFromWhere == SEEK_END)
{
- m_fp = m_pMMView->ulDataSize + ulOffset;
+ m_fp = m_pMMViewHeader->ulDataSize + ulOffset;
}
else if (ulFromWhere == SEEK_SET)
{
@@ -420,13 +426,13 @@
}
}
- HX_ASSERT(m_fp <= m_pMMView->ulMapSize);
+ HX_ASSERT(m_fp <= m_pMMViewHeader->ulMapSize);
return res;
}
/* Tell returns the current file position in the file */
-STDMETHODIMP_(ULONG32) CHXWinSharedMMFile::Tell()
+STDMETHODIMP_(UINT32) CHXWinSharedMMFile::Tell()
{
if(!IsOpen())
{
@@ -486,7 +492,8 @@
/* */
void CHXWinSharedMMFile::ZeroFillMap()
{
- HX_ASSERT(m_pMMView);
- memset(m_pMMView->pData, 0, m_pMMView->ulMapSize - sizeof (MMView));
+ HX_ASSERT(m_pMMViewHeader);
+ HX_ASSERT(m_pData != NULL);
+ memset(m_pData, 0, m_pMMViewHeader->ulMapSize - sizeof (MMViewHeader));
}
Index: sharedmmf.h
===================================================================
RCS file: /cvsroot/common/fileio/platform/win/sharedmmf.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- sharedmmf.h 10 Aug 2009 23:48:05 -0000 1.1.2.1
+++ sharedmmf.h 4 Sep 2009 21:47:37 -0000 1.1.2.2
@@ -69,9 +69,9 @@
REFIID riid,
void** ppvObj);
- STDMETHOD_(ULONG32, AddRef) (THIS);
+ STDMETHOD_(UINT32, AddRef) (THIS);
- STDMETHOD_(ULONG32, Release) (THIS);
+ STDMETHOD_(UINT32, Release) (THIS);
CHXWinSharedMMFile(IUnknown* pContext);
@@ -79,7 +79,7 @@
~CHXWinSharedMMFile();
STDMETHOD(OpenMap) (THIS_
- const char* pszSharedName, ULONG32 ulSize);
+ const char* pszSharedName, UINT32 ulSize);
/* */
STDMETHOD(CloseMap) (THIS);
@@ -87,7 +87,7 @@
/* */
STDMETHOD(Read) (THIS_
- REF(IHXBuffer*) pBuffer, ULONG32 count = 0);
+ REF(IHXBuffer*) pBuffer, UINT32 count = 0);
/* */
@@ -96,11 +96,11 @@
/* */
- STDMETHOD(GetDataSize) (THIS_ REF(ULONG32) size);
+ STDMETHOD(GetDataSize) (THIS_ REF(UINT32) size);
/* */
- STDMETHOD(SetDataSize) (THIS_ ULONG32 size);
+ STDMETHOD(SetDataSize) (THIS_ UINT32 size);
/*
@@ -114,10 +114,10 @@
* error.
*/
STDMETHOD(Seek) (THIS_
- ULONG32 ulOffset, ULONG32 ulFromWhere);
+ UINT32 ulOffset, UINT32 ulFromWhere);
/* Tell returns the current file position in the file */
- STDMETHOD_(ULONG32, Tell) (THIS);
+ STDMETHOD_(UINT32, Tell) (THIS);
/* */
STDMETHOD(LockMap) (THIS);
@@ -135,12 +135,11 @@
void ZeroFillMap();
- typedef struct MMView
+ typedef struct MMViewHeader
{
- char sMagicID[4];
- ULONG32 ulMapSize;
- ULONG32 ulDataSize;
- char *pData;
+ char sMagicID[4];
+ UINT32 ulMapSize;
+ UINT32 ulDataSize;
};
IUnknown* m_pContext;
@@ -150,9 +149,10 @@
CHXString m_MMFSharedName;
CHXString m_SharedMutexName;
void *m_pViewRaw;
- MMView *m_pMMView;
+ MMViewHeader *m_pMMViewHeader;
HXBOOL m_bLock;
- ULONG32 m_fp;
+ UINT32 m_fp;
+ char *m_pData;
};
From mazimi at helixcommunity.org Fri Sep 4 13:50:25 2009
From: mazimi at helixcommunity.org (mazimi@helixcommunity.org)
Date: Fri Sep 4 22:54:21 2009
Subject: [Common-cvs] include hxsharedmmf.h,1.2,1.3
Message-ID:
Update of /cvsroot/common/include
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv8764/include
Modified Files:
hxsharedmmf.h
Log Message:
Synopsis
========
Fixed Bug 249757:CLI crashes when GUI is open
Branches: PRODUCER_13_0_RN and HEAD
Description
===========
1-Fixed a bug in SharedMMF implementation.
The memory mapped file object uses a MMFView, which is the header written at the beginning of each memory mapped file view. MMFView had a char * pData member which was initialized to point to the data buffer start. The culprit was to assume that shared MMview had the same mapped address on all processes, and so share the pData variable among all processes. this is not the case all the time. This is fixed now by moving out the pData from MMFView header structure and initialize it the local process address when the map is opened.
2- Replaced all uses of ULONG32 with UINT32
Files Affected
==============
Changed files:
common/fileio/platform/win/sharedmmf.cpp
common/fileio/platform/win/sharedmmf.h
common/include/hxsharedmmf.h
Testing Performed
=================
* tested in producer application using the license manager implementation of floating license.
Performance Tests:
- None
Platforms Tested: win32-i386-vc7
QA Hints
========
Index: hxsharedmmf.h
===================================================================
RCS file: /cvsroot/common/include/hxsharedmmf.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hxsharedmmf.h 12 Aug 2009 17:35:11 -0000 1.2
+++ hxsharedmmf.h 4 Sep 2009 21:50:23 -0000 1.3
@@ -90,9 +90,9 @@
REFIID riid,
void** ppvObj) PURE;
- STDMETHOD_(ULONG32, AddRef) (THIS) PURE;
+ STDMETHOD_(UINT32, AddRef) (THIS) PURE;
- STDMETHOD_(ULONG32, Release) (THIS) PURE;
+ STDMETHOD_(UINT32, Release) (THIS) PURE;
/*
* IHXSharedMMFileFactory methods
@@ -137,32 +137,32 @@
*/
STDMETHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE;
- STDMETHOD_(ULONG32, AddRef) (THIS) PURE;
+ STDMETHOD_(UINT32, AddRef) (THIS) PURE;
- STDMETHOD_(ULONG32, Release) (THIS) PURE;
+ STDMETHOD_(UINT32, Release) (THIS) PURE;
/*
* IHXSharedMMFile methods
*/
/* */
- STDMETHOD(OpenMap) (THIS_ const char* pszSharedName, ULONG32 ulSize) PURE;
+ STDMETHOD(OpenMap) (THIS_ const char* pszSharedName, UINT32 ulSize) PURE;
/* */
STDMETHOD(CloseMap) (THIS) PURE;
/* */
- STDMETHOD(Read) (THIS_ REF(IHXBuffer*) pBuffer, ULONG32 count = 0) PURE;
+ STDMETHOD(Read) (THIS_ REF(IHXBuffer*) pBuffer, UINT32 count = 0) PURE;
/* */
STDMETHOD(Write) (THIS_ IHXBuffer* pBuffer) PURE;
/* */
- STDMETHOD(GetDataSize) (THIS_ REF(ULONG32) size) PURE;
+ STDMETHOD(GetDataSize) (THIS_ REF(UINT32) size) PURE;
/* */
- STDMETHOD(SetDataSize) (THIS_ ULONG32 size) PURE;
+ STDMETHOD(SetDataSize) (THIS_ UINT32 size) PURE;
/*
* IsOpen returns TRUE if file is open. Otherwise FALSE.
@@ -174,10 +174,10 @@
* fromWhere specifier returns current position of file or -1 on
* error.
*/
- STDMETHOD(Seek) (THIS_ ULONG32 ulOffset, ULONG32 ulFromWhere) PURE;
+ STDMETHOD(Seek) (THIS_ UINT32 ulOffset, UINT32 ulFromWhere) PURE;
/* Tell returns the current file position in the file */
- STDMETHOD_(ULONG32, Tell) (THIS) PURE;
+ STDMETHOD_(UINT32, Tell) (THIS) PURE;
/* */
STDMETHOD(LockMap) (THIS) PURE;
From mazimi at helixcommunity.org Fri Sep 4 13:50:25 2009
From: mazimi at helixcommunity.org (mazimi@helixcommunity.org)
Date: Fri Sep 4 22:54:22 2009
Subject: [Common-cvs] include hxsharedmmf.h,1.2,1.3
Message-ID:
Update of /cvsroot/common/include
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv8764/include
Modified Files:
hxsharedmmf.h
Log Message:
Synopsis
========
Fixed Bug 249757:CLI crashes when GUI is open
Branches: PRODUCER_13_0_RN and HEAD
Description
===========
1-Fixed a bug in SharedMMF implementation.
The memory mapped file object uses a MMFView, which is the header written at the beginning of each memory mapped file view. MMFView had a char * pData member which was initialized to point to the data buffer start. The culprit was to assume that shared MMview had the same mapped address on all processes, and so share the pData variable among all processes. this is not the case all the time. This is fixed now by moving out the pData from MMFView header structure and initialize it the local process address when the map is opened.
2- Replaced all uses of ULONG32 with UINT32
Files Affected
==============
Changed files:
common/fileio/platform/win/sharedmmf.cpp
common/fileio/platform/win/sharedmmf.h
common/include/hxsharedmmf.h
Testing Performed
=================
* tested in producer application using the license manager implementation of floating license.
Performance Tests:
- None
Platforms Tested: win32-i386-vc7
QA Hints
========
Index: hxsharedmmf.h
===================================================================
RCS file: /cvsroot/common/include/hxsharedmmf.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hxsharedmmf.h 12 Aug 2009 17:35:11 -0000 1.2
+++ hxsharedmmf.h 4 Sep 2009 21:50:23 -0000 1.3
@@ -90,9 +90,9 @@
REFIID riid,
void** ppvObj) PURE;
- STDMETHOD_(ULONG32, AddRef) (THIS) PURE;
+ STDMETHOD_(UINT32, AddRef) (THIS) PURE;
- STDMETHOD_(ULONG32, Release) (THIS) PURE;
+ STDMETHOD_(UINT32, Release) (THIS) PURE;
/*
* IHXSharedMMFileFactory methods
@@ -137,32 +137,32 @@
*/
STDMETHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE;
- STDMETHOD_(ULONG32, AddRef) (THIS) PURE;
+ STDMETHOD_(UINT32, AddRef) (THIS) PURE;
- STDMETHOD_(ULONG32, Release) (THIS) PURE;
+ STDMETHOD_(UINT32, Release) (THIS) PURE;
/*
* IHXSharedMMFile methods
*/
/* */
- STDMETHOD(OpenMap) (THIS_ const char* pszSharedName, ULONG32 ulSize) PURE;
+ STDMETHOD(OpenMap) (THIS_ const char* pszSharedName, UINT32 ulSize) PURE;
/* */
STDMETHOD(CloseMap) (THIS) PURE;
/* */
- STDMETHOD(Read) (THIS_ REF(IHXBuffer*) pBuffer, ULONG32 count = 0) PURE;
+ STDMETHOD(Read) (THIS_ REF(IHXBuffer*) pBuffer, UINT32 count = 0) PURE;
/* */
STDMETHOD(Write) (THIS_ IHXBuffer* pBuffer) PURE;
/* */
- STDMETHOD(GetDataSize) (THIS_ REF(ULONG32) size) PURE;
+ STDMETHOD(GetDataSize) (THIS_ REF(UINT32) size) PURE;
/* */
- STDMETHOD(SetDataSize) (THIS_ ULONG32 size) PURE;
+ STDMETHOD(SetDataSize) (THIS_ UINT32 size) PURE;
/*
* IsOpen returns TRUE if file is open. Otherwise FALSE.
@@ -174,10 +174,10 @@
* fromWhere specifier returns current position of file or -1 on
* error.
*/
- STDMETHOD(Seek) (THIS_ ULONG32 ulOffset, ULONG32 ulFromWhere) PURE;
+ STDMETHOD(Seek) (THIS_ UINT32 ulOffset, UINT32 ulFromWhere) PURE;
/* Tell returns the current file position in the file */
- STDMETHOD_(ULONG32, Tell) (THIS) PURE;
+ STDMETHOD_(UINT32, Tell) (THIS) PURE;
/* */
STDMETHOD(LockMap) (THIS) PURE;
From mazimi at helixcommunity.org Fri Sep 4 13:50:26 2009
From: mazimi at helixcommunity.org (mazimi@helixcommunity.org)
Date: Fri Sep 4 22:54:23 2009
Subject: [Common-cvs]
fileio/platform/win sharedmmf.cpp, 1.2, 1.3 sharedmmf.h, 1.2, 1.3
Message-ID:
Update of /cvsroot/common/fileio/platform/win
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv8764/fileio/platform/win
Modified Files:
sharedmmf.cpp sharedmmf.h
Log Message:
Synopsis
========
Fixed Bug 249757:CLI crashes when GUI is open
Branches: PRODUCER_13_0_RN and HEAD
Description
===========
1-Fixed a bug in SharedMMF implementation.
The memory mapped file object uses a MMFView, which is the header written at the beginning of each memory mapped file view. MMFView had a char * pData member which was initialized to point to the data buffer start. The culprit was to assume that shared MMview had the same mapped address on all processes, and so share the pData variable among all processes. this is not the case all the time. This is fixed now by moving out the pData from MMFView header structure and initialize it the local process address when the map is opened.
2- Replaced all uses of ULONG32 with UINT32
Files Affected
==============
Changed files:
common/fileio/platform/win/sharedmmf.cpp
common/fileio/platform/win/sharedmmf.h
common/include/hxsharedmmf.h
Testing Performed
=================
* tested in producer application using the license manager implementation of floating license.
Performance Tests:
- None
Platforms Tested: win32-i386-vc7
QA Hints
========
Index: sharedmmf.cpp
===================================================================
RCS file: /cvsroot/common/fileio/platform/win/sharedmmf.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sharedmmf.cpp 12 Aug 2009 17:35:12 -0000 1.2
+++ sharedmmf.cpp 4 Sep 2009 21:50:23 -0000 1.3
@@ -62,9 +62,10 @@
, m_MMFSharedName("")
, m_SharedMutexName("")
, m_pViewRaw(NULL)
-, m_pMMView(NULL)
+, m_pMMViewHeader(NULL)
, m_bLock(FALSE)
, m_fp(0)
+, m_pData(NULL)
{
m_pContext = pContext;
@@ -107,14 +108,14 @@
}
-STDMETHODIMP_(ULONG32)
+STDMETHODIMP_(UINT32)
CHXWinSharedMMFile::AddRef()
{
return InterlockedIncrement(&m_lRefCount);
}
-STDMETHODIMP_(ULONG32)
+STDMETHODIMP_(UINT32)
CHXWinSharedMMFile::Release()
{
if (InterlockedDecrement(&m_lRefCount) > 0)
@@ -127,7 +128,7 @@
/* */
-STDMETHODIMP CHXWinSharedMMFile::OpenMap(const char* pszSharedName, ULONG32 ulSize)
+STDMETHODIMP CHXWinSharedMMFile::OpenMap(const char* pszSharedName, UINT32 ulSize)
{
HX_RESULT res = HXR_OK;
HXBOOL bMapExist = FALSE;
@@ -150,7 +151,7 @@
{
LockMap();
- newFileMap = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, ulSize+sizeof(MMView), OS_STRING(pszSharedName));
+ newFileMap = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, ulSize+sizeof(MMViewHeader), OS_STRING(pszSharedName));
if (newFileMap)
{
if (GetLastError() == ERROR_ALREADY_EXISTS)
@@ -180,24 +181,25 @@
m_pViewRaw = MapViewOfFile(newFileMap, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 0);
if (m_pViewRaw)
{
- m_pMMView = reinterpret_cast(m_pViewRaw);
+ m_pMMViewHeader = reinterpret_cast(m_pViewRaw);
if (!bMapExist)
{
// We just created this map, set it up
- m_pMMView->sMagicID[0] = 'H';
- m_pMMView->sMagicID[1] = 'M';
- m_pMMView->sMagicID[2] = 'M';
- m_pMMView->sMagicID[3] = 'F';
- m_pMMView->ulMapSize = ulSize;
- m_pMMView->ulDataSize = 0;
- m_pMMView->pData = reinterpret_cast(m_pMMView + 1);
+ m_pMMViewHeader->sMagicID[0] = 'H';
+ m_pMMViewHeader->sMagicID[1] = 'M';
+ m_pMMViewHeader->sMagicID[2] = 'M';
+ m_pMMViewHeader->sMagicID[3] = 'F';
+ m_pMMViewHeader->ulMapSize = ulSize;
+ m_pMMViewHeader->ulDataSize = 0;
+ m_pData = reinterpret_cast(m_pMMViewHeader + 1);
}
else
{
// Check if the view starts with a valid MMView signature
- HX_ASSERT((m_pMMView->sMagicID[0] == 'H') && (m_pMMView->sMagicID[1] == 'M') && (m_pMMView->sMagicID[2] == 'M') && (m_pMMView->sMagicID[3] == 'F'));
- HX_ASSERT(m_pMMView->ulMapSize == ulSize);
- HX_ASSERT(m_pMMView->ulDataSize <= m_pMMView->ulMapSize - sizeof(MMView));
+ HX_ASSERT((m_pMMViewHeader->sMagicID[0] == 'H') && (m_pMMViewHeader->sMagicID[1] == 'M') && (m_pMMViewHeader->sMagicID[2] == 'M') && (m_pMMViewHeader->sMagicID[3] == 'F'));
+ HX_ASSERT(m_pMMViewHeader->ulMapSize == ulSize);
+ HX_ASSERT(m_pMMViewHeader->ulDataSize <= m_pMMViewHeader->ulMapSize - sizeof(MMViewHeader));
+ m_pData = reinterpret_cast(m_pMMViewHeader + 1);
}
m_fp = 0;
@@ -276,26 +278,28 @@
/* */
-STDMETHODIMP CHXWinSharedMMFile::Read(REF(IHXBuffer*) pBuffer, ULONG32 count)
+STDMETHODIMP CHXWinSharedMMFile::Read(REF(IHXBuffer*) pBuffer, UINT32 count)
{
HX_RESULT res = HXR_OK;
if (count == 0)
- count = m_pMMView->ulDataSize - m_fp;
+ count = m_pMMViewHeader->ulDataSize - m_fp;
- if (!IsOpen() || (count > m_pMMView->ulDataSize - m_fp) || (HXR_OK != CreateBufferCCF(pBuffer, m_pContext)))
+ if (!IsOpen() || (count > m_pMMViewHeader->ulDataSize - m_fp) || (HXR_OK != CreateBufferCCF(pBuffer, m_pContext)))
{
res = HXR_FAILED;
}
else
{
+ HX_ASSERT(m_pData != NULL);
+ HX_ASSERT(m_pMMViewHeader);
pBuffer->SetSize(count);
- memcpy(pBuffer->GetBuffer(), m_pMMView->pData + m_fp , count);
+ memcpy(pBuffer->GetBuffer(), m_pData + m_fp , count);
m_fp += count;
}
- HX_ASSERT(m_fp <= m_pMMView->ulDataSize);
+ HX_ASSERT(m_fp <= m_pMMViewHeader->ulDataSize);
return res;
}
@@ -307,28 +311,30 @@
- if (!IsOpen() || (pBuffer->GetSize() > m_pMMView->ulMapSize - m_fp))
+ if (!IsOpen() || (pBuffer->GetSize() > m_pMMViewHeader->ulMapSize - m_fp))
{
res = HXR_FAILED;
}
else
{
- memcpy(m_pMMView->pData + m_fp, pBuffer->GetBuffer(), pBuffer->GetSize());
+ HX_ASSERT(m_pData != NULL);
+ HX_ASSERT(m_pMMViewHeader);
+ memcpy(m_pData + m_fp, pBuffer->GetBuffer(), pBuffer->GetSize());
m_fp += pBuffer->GetSize();
- if(m_pMMView->ulDataSize < m_fp)
+ if(m_pMMViewHeader->ulDataSize < m_fp)
{
// The view data size has expanded, set the new data size in header
- m_pMMView->ulDataSize = m_fp;
+ m_pMMViewHeader->ulDataSize = m_fp;
#ifdef _DEBUG
- memset(m_pMMView->pData+m_fp, 0xCD, m_pMMView->ulMapSize - m_pMMView->ulDataSize);
+ memset(m_pData+m_fp, 0xCD, m_pMMViewHeader->ulMapSize - m_pMMViewHeader->ulDataSize);
#endif
}
}
- HX_ASSERT(m_pMMView->ulDataSize <= m_pMMView->ulMapSize);
- HX_ASSERT(m_fp <= m_pMMView->ulDataSize);
+ HX_ASSERT(m_pMMViewHeader->ulDataSize <= m_pMMViewHeader->ulMapSize);
+ HX_ASSERT(m_fp <= m_pMMViewHeader->ulDataSize);
return res;
}
@@ -337,14 +343,14 @@
*/
STDMETHODIMP
-CHXWinSharedMMFile::GetDataSize(REF(ULONG32) size)
+CHXWinSharedMMFile::GetDataSize(REF(UINT32) size)
{
HX_RESULT res = HXR_FAILED;
if(IsOpen())
{
- HX_ASSERT(m_pMMView);
- size = m_pMMView->ulDataSize;
+ HX_ASSERT(m_pMMViewHeader);
+ size = m_pMMViewHeader->ulDataSize;
res = HXR_OK;
}
@@ -352,24 +358,24 @@
}
-STDMETHODIMP CHXWinSharedMMFile::SetDataSize(ULONG32 size)
+STDMETHODIMP CHXWinSharedMMFile::SetDataSize(UINT32 size)
{
HX_RESULT res = HXR_OK;
- if (!IsOpen() || (m_pMMView->ulMapSize < size))
+ if (!IsOpen() || (m_pMMViewHeader->ulMapSize < size))
{
res = HXR_FAILED;
}
else
{
- m_pMMView->ulDataSize = size;
+ m_pMMViewHeader->ulDataSize = size;
#ifdef _DEBUG
- memset(m_pMMView->pData+m_pMMView->ulDataSize, 0xEF, m_pMMView->ulMapSize - m_pMMView->ulDataSize);
+ memset(m_pData+m_pMMViewHeader->ulDataSize, 0xEF, m_pMMViewHeader->ulMapSize - m_pMMViewHeader->ulDataSize);
#endif
}
- HX_ASSERT(m_pMMView->ulDataSize <= m_pMMView->ulMapSize);
+ HX_ASSERT(m_pMMViewHeader->ulDataSize <= m_pMMViewHeader->ulMapSize);
return res;
}
@@ -389,7 +395,7 @@
* fromWhere specifier returns current position of file or -1 on
* error.
*/
-STDMETHODIMP CHXWinSharedMMFile::Seek(ULONG32 ulOffset, ULONG32 ulFromWhere)
+STDMETHODIMP CHXWinSharedMMFile::Seek(UINT32 ulOffset, UINT32 ulFromWhere)
{
HX_RESULT res = HXR_OK;
if(!IsOpen())
@@ -399,11 +405,11 @@
}
else
{
- HX_ASSERT(m_pMMView);
+ HX_ASSERT(m_pMMViewHeader);
if (ulFromWhere == SEEK_END)
{
- m_fp = m_pMMView->ulDataSize + ulOffset;
+ m_fp = m_pMMViewHeader->ulDataSize + ulOffset;
}
else if (ulFromWhere == SEEK_SET)
{
@@ -420,13 +426,13 @@
}
}
- HX_ASSERT(m_fp <= m_pMMView->ulMapSize);
+ HX_ASSERT(m_fp <= m_pMMViewHeader->ulMapSize);
return res;
}
/* Tell returns the current file position in the file */
-STDMETHODIMP_(ULONG32) CHXWinSharedMMFile::Tell()
+STDMETHODIMP_(UINT32) CHXWinSharedMMFile::Tell()
{
if(!IsOpen())
{
@@ -486,7 +492,8 @@
/* */
void CHXWinSharedMMFile::ZeroFillMap()
{
- HX_ASSERT(m_pMMView);
- memset(m_pMMView->pData, 0, m_pMMView->ulMapSize - sizeof (MMView));
+ HX_ASSERT(m_pMMViewHeader);
+ HX_ASSERT(m_pData != NULL);
+ memset(m_pData, 0, m_pMMViewHeader->ulMapSize - sizeof (MMViewHeader));
}
Index: sharedmmf.h
===================================================================
RCS file: /cvsroot/common/fileio/platform/win/sharedmmf.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sharedmmf.h 12 Aug 2009 17:35:12 -0000 1.2
+++ sharedmmf.h 4 Sep 2009 21:50:23 -0000 1.3
@@ -69,9 +69,9 @@
REFIID riid,
void** ppvObj);
- STDMETHOD_(ULONG32, AddRef) (THIS);
+ STDMETHOD_(UINT32, AddRef) (THIS);
- STDMETHOD_(ULONG32, Release) (THIS);
+ STDMETHOD_(UINT32, Release) (THIS);
CHXWinSharedMMFile(IUnknown* pContext);
@@ -79,7 +79,7 @@
~CHXWinSharedMMFile();
STDMETHOD(OpenMap) (THIS_
- const char* pszSharedName, ULONG32 ulSize);
+ const char* pszSharedName, UINT32 ulSize);
/* */
STDMETHOD(CloseMap) (THIS);
@@ -87,7 +87,7 @@
/* */
STDMETHOD(Read) (THIS_
- REF(IHXBuffer*) pBuffer, ULONG32 count = 0);
+ REF(IHXBuffer*) pBuffer, UINT32 count = 0);
/* */
@@ -96,11 +96,11 @@
/* */
- STDMETHOD(GetDataSize) (THIS_ REF(ULONG32) size);
+ STDMETHOD(GetDataSize) (THIS_ REF(UINT32) size);
/* */
- STDMETHOD(SetDataSize) (THIS_ ULONG32 size);
+ STDMETHOD(SetDataSize) (THIS_ UINT32 size);
/*
@@ -114,10 +114,10 @@
* error.
*/
STDMETHOD(Seek) (THIS_
- ULONG32 ulOffset, ULONG32 ulFromWhere);
+ UINT32 ulOffset, UINT32 ulFromWhere);
/* Tell returns the current file position in the file */
- STDMETHOD_(ULONG32, Tell) (THIS);
+ STDMETHOD_(UINT32, Tell) (THIS);
/* */
STDMETHOD(LockMap) (THIS);
@@ -135,12 +135,11 @@
void ZeroFillMap();
- typedef struct MMView
+ typedef struct MMViewHeader
{
- char sMagicID[4];
- ULONG32 ulMapSize;
- ULONG32 ulDataSize;
- char *pData;
+ char sMagicID[4];
+ UINT32 ulMapSize;
+ UINT32 ulDataSize;
};
IUnknown* m_pContext;
@@ -150,9 +149,10 @@
CHXString m_MMFSharedName;
CHXString m_SharedMutexName;
void *m_pViewRaw;
- MMView *m_pMMView;
+ MMViewHeader *m_pMMViewHeader;
HXBOOL m_bLock;
- ULONG32 m_fp;
+ UINT32 m_fp;
+ char *m_pData;
};
From mazimi at helixcommunity.org Fri Sep 4 13:50:26 2009
From: mazimi at helixcommunity.org (mazimi@helixcommunity.org)
Date: Fri Sep 4 22:54:23 2009
Subject: [Common-cvs]
fileio/platform/win sharedmmf.cpp, 1.2, 1.3 sharedmmf.h, 1.2, 1.3
Message-ID:
Update of /cvsroot/common/fileio/platform/win
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv8764/fileio/platform/win
Modified Files:
sharedmmf.cpp sharedmmf.h
Log Message:
Synopsis
========
Fixed Bug 249757:CLI crashes when GUI is open
Branches: PRODUCER_13_0_RN and HEAD
Description
===========
1-Fixed a bug in SharedMMF implementation.
The memory mapped file object uses a MMFView, which is the header written at the beginning of each memory mapped file view. MMFView had a char * pData member which was initialized to point to the data buffer start. The culprit was to assume that shared MMview had the same mapped address on all processes, and so share the pData variable among all processes. this is not the case all the time. This is fixed now by moving out the pData from MMFView header structure and initialize it the local process address when the map is opened.
2- Replaced all uses of ULONG32 with UINT32
Files Affected
==============
Changed files:
common/fileio/platform/win/sharedmmf.cpp
common/fileio/platform/win/sharedmmf.h
common/include/hxsharedmmf.h
Testing Performed
=================
* tested in producer application using the license manager implementation of floating license.
Performance Tests:
- None
Platforms Tested: win32-i386-vc7
QA Hints
========
Index: sharedmmf.cpp
===================================================================
RCS file: /cvsroot/common/fileio/platform/win/sharedmmf.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sharedmmf.cpp 12 Aug 2009 17:35:12 -0000 1.2
+++ sharedmmf.cpp 4 Sep 2009 21:50:23 -0000 1.3
@@ -62,9 +62,10 @@
, m_MMFSharedName("")
, m_SharedMutexName("")
, m_pViewRaw(NULL)
-, m_pMMView(NULL)
+, m_pMMViewHeader(NULL)
, m_bLock(FALSE)
, m_fp(0)
+, m_pData(NULL)
{
m_pContext = pContext;
@@ -107,14 +108,14 @@
}
-STDMETHODIMP_(ULONG32)
+STDMETHODIMP_(UINT32)
CHXWinSharedMMFile::AddRef()
{
return InterlockedIncrement(&m_lRefCount);
}
-STDMETHODIMP_(ULONG32)
+STDMETHODIMP_(UINT32)
CHXWinSharedMMFile::Release()
{
if (InterlockedDecrement(&m_lRefCount) > 0)
@@ -127,7 +128,7 @@
/* */
-STDMETHODIMP CHXWinSharedMMFile::OpenMap(const char* pszSharedName, ULONG32 ulSize)
+STDMETHODIMP CHXWinSharedMMFile::OpenMap(const char* pszSharedName, UINT32 ulSize)
{
HX_RESULT res = HXR_OK;
HXBOOL bMapExist = FALSE;
@@ -150,7 +151,7 @@
{
LockMap();
- newFileMap = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, ulSize+sizeof(MMView), OS_STRING(pszSharedName));
+ newFileMap = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, ulSize+sizeof(MMViewHeader), OS_STRING(pszSharedName));
if (newFileMap)
{
if (GetLastError() == ERROR_ALREADY_EXISTS)
@@ -180,24 +181,25 @@
m_pViewRaw = MapViewOfFile(newFileMap, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 0);
if (m_pViewRaw)
{
- m_pMMView = reinterpret_cast(m_pViewRaw);
+ m_pMMViewHeader = reinterpret_cast(m_pViewRaw);
if (!bMapExist)
{
// We just created this map, set it up
- m_pMMView->sMagicID[0] = 'H';
- m_pMMView->sMagicID[1] = 'M';
- m_pMMView->sMagicID[2] = 'M';
- m_pMMView->sMagicID[3] = 'F';
- m_pMMView->ulMapSize = ulSize;
- m_pMMView->ulDataSize = 0;
- m_pMMView->pData = reinterpret_cast(m_pMMView + 1);
+ m_pMMViewHeader->sMagicID[0] = 'H';
+ m_pMMViewHeader->sMagicID[1] = 'M';
+ m_pMMViewHeader->sMagicID[2] = 'M';
+ m_pMMViewHeader->sMagicID[3] = 'F';
+ m_pMMViewHeader->ulMapSize = ulSize;
+ m_pMMViewHeader->ulDataSize = 0;
+ m_pData = reinterpret_cast(m_pMMViewHeader + 1);
}
else
{
// Check if the view starts with a valid MMView signature
- HX_ASSERT((m_pMMView->sMagicID[0] == 'H') && (m_pMMView->sMagicID[1] == 'M') && (m_pMMView->sMagicID[2] == 'M') && (m_pMMView->sMagicID[3] == 'F'));
- HX_ASSERT(m_pMMView->ulMapSize == ulSize);
- HX_ASSERT(m_pMMView->ulDataSize <= m_pMMView->ulMapSize - sizeof(MMView));
+ HX_ASSERT((m_pMMViewHeader->sMagicID[0] == 'H') && (m_pMMViewHeader->sMagicID[1] == 'M') && (m_pMMViewHeader->sMagicID[2] == 'M') && (m_pMMViewHeader->sMagicID[3] == 'F'));
+ HX_ASSERT(m_pMMViewHeader->ulMapSize == ulSize);
+ HX_ASSERT(m_pMMViewHeader->ulDataSize <= m_pMMViewHeader->ulMapSize - sizeof(MMViewHeader));
+ m_pData = reinterpret_cast(m_pMMViewHeader + 1);
}
m_fp = 0;
@@ -276,26 +278,28 @@
/* */
-STDMETHODIMP CHXWinSharedMMFile::Read(REF(IHXBuffer*) pBuffer, ULONG32 count)
+STDMETHODIMP CHXWinSharedMMFile::Read(REF(IHXBuffer*) pBuffer, UINT32 count)
{
HX_RESULT res = HXR_OK;
if (count == 0)
- count = m_pMMView->ulDataSize - m_fp;
+ count = m_pMMViewHeader->ulDataSize - m_fp;
- if (!IsOpen() || (count > m_pMMView->ulDataSize - m_fp) || (HXR_OK != CreateBufferCCF(pBuffer, m_pContext)))
+ if (!IsOpen() || (count > m_pMMViewHeader->ulDataSize - m_fp) || (HXR_OK != CreateBufferCCF(pBuffer, m_pContext)))
{
res = HXR_FAILED;
}
else
{
+ HX_ASSERT(m_pData != NULL);
+ HX_ASSERT(m_pMMViewHeader);
pBuffer->SetSize(count);
- memcpy(pBuffer->GetBuffer(), m_pMMView->pData + m_fp , count);
+ memcpy(pBuffer->GetBuffer(), m_pData + m_fp , count);
m_fp += count;
}
- HX_ASSERT(m_fp <= m_pMMView->ulDataSize);
+ HX_ASSERT(m_fp <= m_pMMViewHeader->ulDataSize);
return res;
}
@@ -307,28 +311,30 @@
- if (!IsOpen() || (pBuffer->GetSize() > m_pMMView->ulMapSize - m_fp))
+ if (!IsOpen() || (pBuffer->GetSize() > m_pMMViewHeader->ulMapSize - m_fp))
{
res = HXR_FAILED;
}
else
{
- memcpy(m_pMMView->pData + m_fp, pBuffer->GetBuffer(), pBuffer->GetSize());
+ HX_ASSERT(m_pData != NULL);
+ HX_ASSERT(m_pMMViewHeader);
+ memcpy(m_pData + m_fp, pBuffer->GetBuffer(), pBuffer->GetSize());
m_fp += pBuffer->GetSize();
- if(m_pMMView->ulDataSize < m_fp)
+ if(m_pMMViewHeader->ulDataSize < m_fp)
{
// The view data size has expanded, set the new data size in header
- m_pMMView->ulDataSize = m_fp;
+ m_pMMViewHeader->ulDataSize = m_fp;
#ifdef _DEBUG
- memset(m_pMMView->pData+m_fp, 0xCD, m_pMMView->ulMapSize - m_pMMView->ulDataSize);
+ memset(m_pData+m_fp, 0xCD, m_pMMViewHeader->ulMapSize - m_pMMViewHeader->ulDataSize);
#endif
}
}
- HX_ASSERT(m_pMMView->ulDataSize <= m_pMMView->ulMapSize);
- HX_ASSERT(m_fp <= m_pMMView->ulDataSize);
+ HX_ASSERT(m_pMMViewHeader->ulDataSize <= m_pMMViewHeader->ulMapSize);
+ HX_ASSERT(m_fp <= m_pMMViewHeader->ulDataSize);
return res;
}
@@ -337,14 +343,14 @@
*/
STDMETHODIMP
-CHXWinSharedMMFile::GetDataSize(REF(ULONG32) size)
+CHXWinSharedMMFile::GetDataSize(REF(UINT32) size)
{
HX_RESULT res = HXR_FAILED;
if(IsOpen())
{
- HX_ASSERT(m_pMMView);
- size = m_pMMView->ulDataSize;
+ HX_ASSERT(m_pMMViewHeader);
+ size = m_pMMViewHeader->ulDataSize;
res = HXR_OK;
}
@@ -352,24 +358,24 @@
}
-STDMETHODIMP CHXWinSharedMMFile::SetDataSize(ULONG32 size)
+STDMETHODIMP CHXWinSharedMMFile::SetDataSize(UINT32 size)
{
HX_RESULT res = HXR_OK;
- if (!IsOpen() || (m_pMMView->ulMapSize < size))
+ if (!IsOpen() || (m_pMMViewHeader->ulMapSize < size))
{
res = HXR_FAILED;
}
else
{
- m_pMMView->ulDataSize = size;
+ m_pMMViewHeader->ulDataSize = size;
#ifdef _DEBUG
- memset(m_pMMView->pData+m_pMMView->ulDataSize, 0xEF, m_pMMView->ulMapSize - m_pMMView->ulDataSize);
+ memset(m_pData+m_pMMViewHeader->ulDataSize, 0xEF, m_pMMViewHeader->ulMapSize - m_pMMViewHeader->ulDataSize);
#endif
}
- HX_ASSERT(m_pMMView->ulDataSize <= m_pMMView->ulMapSize);
+ HX_ASSERT(m_pMMViewHeader->ulDataSize <= m_pMMViewHeader->ulMapSize);
return res;
}
@@ -389,7 +395,7 @@
* fromWhere specifier returns current position of file or -1 on
* error.
*/
-STDMETHODIMP CHXWinSharedMMFile::Seek(ULONG32 ulOffset, ULONG32 ulFromWhere)
+STDMETHODIMP CHXWinSharedMMFile::Seek(UINT32 ulOffset, UINT32 ulFromWhere)
{
HX_RESULT res = HXR_OK;
if(!IsOpen())
@@ -399,11 +405,11 @@
}
else
{
- HX_ASSERT(m_pMMView);
+ HX_ASSERT(m_pMMViewHeader);
if (ulFromWhere == SEEK_END)
{
- m_fp = m_pMMView->ulDataSize + ulOffset;
+ m_fp = m_pMMViewHeader->ulDataSize + ulOffset;
}
else if (ulFromWhere == SEEK_SET)
{
@@ -420,13 +426,13 @@
}
}
- HX_ASSERT(m_fp <= m_pMMView->ulMapSize);
+ HX_ASSERT(m_fp <= m_pMMViewHeader->ulMapSize);
return res;
}
/* Tell returns the current file position in the file */
-STDMETHODIMP_(ULONG32) CHXWinSharedMMFile::Tell()
+STDMETHODIMP_(UINT32) CHXWinSharedMMFile::Tell()
{
if(!IsOpen())
{
@@ -486,7 +492,8 @@
/* */
void CHXWinSharedMMFile::ZeroFillMap()
{
- HX_ASSERT(m_pMMView);
- memset(m_pMMView->pData, 0, m_pMMView->ulMapSize - sizeof (MMView));
+ HX_ASSERT(m_pMMViewHeader);
+ HX_ASSERT(m_pData != NULL);
+ memset(m_pData, 0, m_pMMViewHeader->ulMapSize - sizeof (MMViewHeader));
}
Index: sharedmmf.h
===================================================================
RCS file: /cvsroot/common/fileio/platform/win/sharedmmf.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sharedmmf.h 12 Aug 2009 17:35:12 -0000 1.2
+++ sharedmmf.h 4 Sep 2009 21:50:23 -0000 1.3
@@ -69,9 +69,9 @@
REFIID riid,
void** ppvObj);
- STDMETHOD_(ULONG32, AddRef) (THIS);
+ STDMETHOD_(UINT32, AddRef) (THIS);
- STDMETHOD_(ULONG32, Release) (THIS);
+ STDMETHOD_(UINT32, Release) (THIS);
CHXWinSharedMMFile(IUnknown* pContext);
@@ -79,7 +79,7 @@
~CHXWinSharedMMFile();
STDMETHOD(OpenMap) (THIS_
- const char* pszSharedName, ULONG32 ulSize);
+ const char* pszSharedName, UINT32 ulSize);
/* */
STDMETHOD(CloseMap) (THIS);
@@ -87,7 +87,7 @@
/* */
STDMETHOD(Read) (THIS_
- REF(IHXBuffer*) pBuffer, ULONG32 count = 0);
+ REF(IHXBuffer*) pBuffer, UINT32 count = 0);
/* */
@@ -96,11 +96,11 @@
/* */
- STDMETHOD(GetDataSize) (THIS_ REF(ULONG32) size);
+ STDMETHOD(GetDataSize) (THIS_ REF(UINT32) size);
/* */
- STDMETHOD(SetDataSize) (THIS_ ULONG32 size);
+ STDMETHOD(SetDataSize) (THIS_ UINT32 size);
/*
@@ -114,10 +114,10 @@
* error.
*/
STDMETHOD(Seek) (THIS_
- ULONG32 ulOffset, ULONG32 ulFromWhere);
+ UINT32 ulOffset, UINT32 ulFromWhere);
/* Tell returns the current file position in the file */
- STDMETHOD_(ULONG32, Tell) (THIS);
+ STDMETHOD_(UINT32, Tell) (THIS);
/* */
STDMETHOD(LockMap) (THIS);
@@ -135,12 +135,11 @@
void ZeroFillMap();
- typedef struct MMView
+ typedef struct MMViewHeader
{
- char sMagicID[4];
- ULONG32 ulMapSize;
- ULONG32 ulDataSize;
- char *pData;
+ char sMagicID[4];
+ UINT32 ulMapSize;
+ UINT32 ulDataSize;
};
IUnknown* m_pContext;
@@ -150,9 +149,10 @@
CHXString m_MMFSharedName;
CHXString m_SharedMutexName;
void *m_pViewRaw;
- MMView *m_pMMView;
+ MMViewHeader *m_pMMViewHeader;
HXBOOL m_bLock;
- ULONG32 m_fp;
+ UINT32 m_fp;
+ char *m_pData;
};
From jain_1982s at helixcommunity.org Sun Sep 6 19:15:25 2009
From: jain_1982s at helixcommunity.org (jain_1982s@helixcommunity.org)
Date: Mon Sep 7 04:18:53 2009
Subject: [Common-cvs] build/BIF helix.bif,1.758,1.759
Message-ID:
Update of /cvsroot/common/build/BIF
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv1144
Modified Files:
helix.bif
Log Message:
Fix for build buster on HEAD
Index: helix.bif
===================================================================
RCS file: /cvsroot/common/build/BIF/helix.bif,v
retrieving revision 1.758
retrieving revision 1.759
diff -u -d -r1.758 -r1.759
--- helix.bif 21 Aug 2009 19:04:18 -0000 1.758
+++ helix.bif 7 Sep 2009 03:15:23 -0000 1.759
@@ -14222,6 +14222,7 @@
common_fileio
common_log_logcommon
common_log_logutil
+ common_log_logobserverfile
common_runtime
common_system
common_util
From jain_1982s at helixcommunity.org Sun Sep 6 19:15:25 2009
From: jain_1982s at helixcommunity.org (jain_1982s@helixcommunity.org)
Date: Mon Sep 7 04:18:54 2009
Subject: [Common-cvs] build/BIF helix.bif,1.758,1.759
Message-ID:
Update of /cvsroot/common/build/BIF
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv1144
Modified Files:
helix.bif
Log Message:
Fix for build buster on HEAD
Index: helix.bif
===================================================================
RCS file: /cvsroot/common/build/BIF/helix.bif,v
retrieving revision 1.758
retrieving revision 1.759
diff -u -d -r1.758 -r1.759
--- helix.bif 21 Aug 2009 19:04:18 -0000 1.758
+++ helix.bif 7 Sep 2009 03:15:23 -0000 1.759
@@ -14222,6 +14222,7 @@
common_fileio
common_log_logcommon
common_log_logutil
+ common_log_logobserverfile
common_runtime
common_system
common_util
From ebala at helixcommunity.org Thu Sep 10 11:31:37 2009
From: ebala at helixcommunity.org (ebala@helixcommunity.org)
Date: Thu Sep 10 20:34:21 2009
Subject: [Common-cvs]
import/xalan/platform/win32/rel32 Xalan-C_1_10.dll, 1.1,
1.2 XalanMessages_1_10.dll, 1.1, 1.2 Xalan-C_1.lib, 1.1, 1.2
Message-ID:
Update of /cvsroot/common/import/xalan/platform/win32/rel32
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv26871
Added Files:
Xalan-C_1_10.dll XalanMessages_1_10.dll Xalan-C_1.lib
Log Message:
Import of Xalan 1.10
--- NEW FILE: Xalan-C_1.lib ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: Xalan-C_1_10.dll ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: XalanMessages_1_10.dll ---
(This appears to be a binary file; contents omitted.)
From ebala at helixcommunity.org Thu Sep 10 11:31:37 2009
From: ebala at helixcommunity.org (ebala@helixcommunity.org)
Date: Thu Sep 10 20:34:22 2009
Subject: [Common-cvs]
import/xalan/platform/win32/rel32 Xalan-C_1_10.dll, 1.1,
1.2 XalanMessages_1_10.dll, 1.1, 1.2 Xalan-C_1.lib, 1.1, 1.2
Message-ID:
Update of /cvsroot/common/import/xalan/platform/win32/rel32
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv26871
Added Files:
Xalan-C_1_10.dll XalanMessages_1_10.dll Xalan-C_1.lib
Log Message:
Import of Xalan 1.10
--- NEW FILE: Xalan-C_1.lib ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: Xalan-C_1_10.dll ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: XalanMessages_1_10.dll ---
(This appears to be a binary file; contents omitted.)
From ebala at helixcommunity.org Thu Sep 10 11:34:11 2009
From: ebala at helixcommunity.org (ebala@helixcommunity.org)
Date: Thu Sep 10 20:36:58 2009
Subject: [Common-cvs] import/imagemagick/Magick++/demo Makefile.am, 1.1,
1.2 analyze.cpp, 1.1, 1.2 button.cpp, 1.1, 1.2 demo.cpp, 1.1,
1.2 detrans.cpp, 1.1, 1.2 flip.cpp, 1.1, 1.2 gravity.cpp, 1.1,
1.2 piddle.cpp, 1.1, 1.2 shapes.cpp, 1.1, 1.2 zoom.cpp, 1.1,
1.2 model.miff, 1.1, 1.2 smile.miff, 1.1, 1.2 smile_anim.miff,
1.1, 1.2 tile.miff, 1.1, 1.2 analyze.sh, 1.1, 1.2 button.sh,
1.1, 1.2 demo.sh, 1.1, 1.2 detrans.sh, 1.1, 1.2 flip.sh, 1.1,
1.2 gravity.sh, 1.1, 1.2 piddle.sh, 1.1, 1.2 shapes.sh, 1.1,
1.2 zoom_bessel.sh, 1.1, 1.2 zoom_blackman.sh, 1.1,
1.2 zoom_box.sh, 1.1, 1.2 zoom_catrom.sh, 1.1,
1.2 zoom_cubic.sh, 1.1, 1.2 zoom_gaussian.sh, 1.1,
1.2 zoom_hamming.sh, 1.1, 1.2 zoom_hanning.sh, 1.1,
1.2 zoom_hermite.sh, 1.1, 1.2 zoom_lanczos.sh, 1.1,
1.2 zoom_mitchell.sh, 1.1, 1.2 zoom_point.sh, 1.1,
1.2 zoom_quadratic.sh, 1.1, 1.2 zoom_sample.sh, 1.1,
1.2 zoom_scale.sh, 1.1, 1.2 zoom_sinc.sh, 1.1,
1.2 zoom_triangle.sh, 1.1, 1.2 .gdbinit, 1.1, 1.2
Message-ID:
Update of /cvsroot/common/import/imagemagick/Magick++/demo
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv27219
Added Files:
Makefile.am analyze.cpp button.cpp demo.cpp detrans.cpp
flip.cpp gravity.cpp piddle.cpp shapes.cpp zoom.cpp model.miff
smile.miff smile_anim.miff tile.miff analyze.sh button.sh
demo.sh detrans.sh flip.sh gravity.sh piddle.sh shapes.sh
zoom_bessel.sh zoom_blackman.sh zoom_box.sh zoom_catrom.sh
zoom_cubic.sh zoom_gaussian.sh zoom_hamming.sh zoom_hanning.sh
zoom_hermite.sh zoom_lanczos.sh zoom_mitchell.sh zoom_point.sh
zoom_quadratic.sh zoom_sample.sh zoom_scale.sh zoom_sinc.sh
zoom_triangle.sh .gdbinit
Log Message:
Import of Imagemagick
--- NEW FILE: zoom_catrom.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: zoom_sinc.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: Makefile.am ---
#
# Makefile for Magick++ demo programs
#
# Copyright Bob Friesenhahn, 1999, 2000, 2001, 2002, 2003
#
AUTOMAKE_OPTIONS = 1.8 foreign nostdinc
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/Magick++/lib -I$(top_srcdir)
check_PROGRAMS = analyze button demo detrans flip gravity piddle shapes zoom
LDADD = ../lib/libMagick++.la
analyze_SOURCES = analyze.cpp
button_SOURCES = button.cpp
demo_SOURCES = demo.cpp
detrans_SOURCES = detrans.cpp
flip_SOURCES = flip.cpp
gravity_SOURCES = gravity.cpp
piddle_SOURCES = piddle.cpp
shapes_SOURCES = shapes.cpp
zoom_SOURCES = zoom.cpp
EXTRA_DIST = model.miff smile.miff smile_anim.miff tile.miff
CLEANFILES = *_out.* ir.out # SunWS_cache
ZOOM_FILTERS = bessel blackman box catrom cubic gaussian hamming hanning hermite \
lanczos mitchell point quadratic sample scale sinc triangle
ZOOM_GEOMETRY = 600x600
if WIN32_NATIVE_BUILD
SRCDIR='$(shell @WinPathScript@ $(srcdir)/)'
else
SRCDIR='$(srcdir)/'
endif
MAGICK_ENV = $(SHELL) $(top_builddir)/magick.sh
# FIXME: MinGW needs Windows path form of srcdir here (or pass as command argument)
check:
@$(MAGICK_ENV) SRCDIR=$(SRCDIR) $(MEMCHECK) ./analyze '$(srcdir)/model.miff'
@$(MAGICK_ENV) SRCDIR=$(SRCDIR) $(MEMCHECK) ./button
@$(MAGICK_ENV) SRCDIR=$(SRCDIR) $(MEMCHECK) ./demo
@$(MAGICK_ENV) SRCDIR=$(SRCDIR) $(MEMCHECK) ./flip
@$(MAGICK_ENV) SRCDIR=$(SRCDIR) $(MEMCHECK) ./gravity
@$(MAGICK_ENV) SRCDIR=$(SRCDIR) $(MEMCHECK) ./piddle
@$(MAGICK_ENV) SRCDIR=$(SRCDIR) $(MEMCHECK) ./shapes
for filter in $(ZOOM_FILTERS) ; do \
echo "$$filter ..." ; \
$(MAGICK_ENV) SRCDIR=$(SRCDIR) $(MEMCHECK) ./zoom -filter $$filter -geometry $(ZOOM_GEOMETRY) '$(srcdir)/model.miff' zoom_$${filter}_out.miff ; \
done
--- NEW FILE: flip.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
outfile="test_${executable}.out"
rm -f $outfile
${MEMCHECK} "./${executable}" 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: analyze.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
outfile="test_${executable}.out"
rm -f $outfile
${MEMCHECK} ./analyze "$SRCDIR/model.miff" 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: zoom_gaussian.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: piddle.cpp ---
// This may look like C code, but it is really -*- C++ -*-
//
// Copyright Bob Friesenhahn, 1999, 2000, 2002, 2003
//
// PerlMagick "piddle" demo re-implemented using Magick++ methods.
// The PerlMagick "piddle" demo is written by John Cristy
//
#include
#include
#include
using namespace std;
using namespace Magick;
int main( int /*argc*/, char ** argv)
{
// Initialize ImageMagick install location for Windows
InitializeMagick(*argv);
try {
string srcdir("");
if(getenv("SRCDIR") != 0)
srcdir = getenv("SRCDIR");
//
// Create a 300x300 white canvas.
//
Image image( "300x300", "white" );
// Drawing list
std::list drawList;
// Start drawing by pushing a drawing context with specified
// viewbox size
drawList.push_back(DrawablePushGraphicContext());
drawList.push_back(DrawableViewbox(0,0,image.columns(),image.rows()));
//
// Draw blue grid
//
drawList.push_back(DrawableStrokeColor("#ccf"));
for ( int i=0; i < 300; i += 10 )
{
drawList.push_back(DrawableLine(i,0, i,300));
drawList.push_back(DrawableLine(0,i, 300,i));
}
//
// Draw rounded rectangle.
//
drawList.push_back(DrawableFillColor("blue"));
drawList.push_back(DrawableStrokeColor("red"));
drawList.push_back(DrawableRoundRectangle(15,15, 70,70, 10,10));
drawList.push_back(DrawableFillColor("blue"));
drawList.push_back(DrawableStrokeColor("maroon"));
drawList.push_back(DrawableStrokeWidth(4));
drawList.push_back(DrawableRoundRectangle(15,15, 70,70, 10,10));
//
// Draw curve.
//
{
drawList.push_back(DrawableStrokeColor("black"));
drawList.push_back(DrawableStrokeWidth(4));
drawList.push_back(DrawableFillColor(Color()));
std::list points;
points.push_back(Coordinate(20,20));
points.push_back(Coordinate(100,50));
points.push_back(Coordinate(50,100));
points.push_back(Coordinate(160,160));
drawList.push_back(DrawableBezier(points));
}
//
// Draw line
//
drawList.push_back(DrawableStrokeColor("red"));
drawList.push_back(DrawableStrokeWidth(1));
drawList.push_back(DrawableLine(10,200, 20,190));
//
// Draw arc within a circle.
//
drawList.push_back(DrawableStrokeColor("black"));
drawList.push_back(DrawableFillColor("yellow"));
drawList.push_back(DrawableStrokeWidth(4));
drawList.push_back(DrawableCircle(160,70, 200,70));
drawList.push_back(DrawableStrokeColor("black"));
drawList.push_back(DrawableFillColor("blue"));
drawList.push_back(DrawableStrokeWidth(4));
{
std::list path;
path.push_back(PathMovetoAbs(Coordinate(160,70)));
path.push_back(PathLinetoVerticalRel(-40));
path.push_back(PathArcRel(PathArcArgs(40,40, 0, 0, 0, -40,40)));
path.push_back(PathClosePath());
drawList.push_back(DrawablePath(path));
}
//
// Draw pentogram.
//
{
drawList.push_back(DrawableStrokeColor("red"));
drawList.push_back(DrawableFillColor("LimeGreen"));
drawList.push_back(DrawableStrokeWidth(3));
std::list points;
points.push_back(Coordinate(160,120));
points.push_back(Coordinate(130,190));
points.push_back(Coordinate(210,145));
points.push_back(Coordinate(110,145));
points.push_back(Coordinate(190,190));
points.push_back(Coordinate(160,120));
drawList.push_back(DrawablePolygon(points));
}
//
// Draw rectangle.
//
drawList.push_back(DrawableStrokeWidth(5));
drawList.push_back(DrawableFillColor(Color())); // No fill
drawList.push_back(DrawableStrokeColor("yellow"));
drawList.push_back(DrawableLine(200,260, 200,200));
drawList.push_back(DrawableLine(200,200, 260,200));
drawList.push_back(DrawableStrokeColor("red"));
drawList.push_back(DrawableLine(260,200, 260,260));
drawList.push_back(DrawableStrokeColor("green"));
drawList.push_back(DrawableLine(200,260, 260,260));
//
// Draw text.
//
drawList.push_back(DrawableFillColor("green"));
drawList.push_back(DrawableStrokeColor(Color())); // unset color
drawList.push_back(DrawablePointSize(24));
drawList.push_back(DrawableTranslation(30,140));
drawList.push_back(DrawableRotation(45.0));
drawList.push_back(DrawableText(0,0,"This is a test!"));
// Finish drawing by popping back to base context.
drawList.push_back(DrawablePopGraphicContext());
// Draw everything using completed drawing list
// image.debug(true);
image.draw(drawList);
// image.write( "piddle.mvg" );
cout << "Writing image \"piddle_out.miff\" ..." << endl;
image.compressType( RLECompression );
image.write( "piddle_out.miff" );
cout << "Writing MVG metafile \"piddle_out.mvg\" ..." << endl;
image.write( "piddle_out.mvg" );
// cout << "Display image..." << endl;
// image.display( );
}
catch( exception &error_ )
{
cout << "Caught exception: " << error_.what() << endl;
return 1;
}
return 0;
}
--- NEW FILE: .gdbinit ---
dir $cwd
dir $cdir
dir ../../coders
dir ../../magick
dir ../lib/Magick++
dir ../lib
--- NEW FILE: zoom_hermite.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: gravity.cpp ---
// This may look like C code, but it is really -*- C++ -*-
//
// Copyright Bob Friesenhahn, 2000, 2001, 2003
//
// Demo of text annotation with gravity. Produces an animation showing
// the effect of rotated text along with various gravity specifications.
//
// After running demo program, run 'animate gravity_out.miff' if you
// are using X-Windows to see an animated result.
//
// Concept and algorithms lifted from PerlMagick demo script written
// by John Christy.
//
#include
#include
#include
#include
using namespace std;
using namespace Magick;
int main( int /*argc*/, char ** argv)
{
// Initialize ImageMagick install location for Windows
InitializeMagick(*argv);
try {
string srcdir("");
if(getenv("SRCDIR") != 0)
srcdir = getenv("SRCDIR");
int x = 100;
int y = 100;
list animation;
Image base( Geometry(600,600), Color("white") );
base.strokeColor("#600");
base.fillColor(Color());
base.draw( DrawableLine( 300,100, 300,500 ) );
base.draw( DrawableLine( 100,300, 500,300 ) );
base.draw( DrawableRectangle( 100,100, 500,500 ) );
base.density( Geometry(72,72) );
base.strokeColor(Color());
base.fillColor("#600");
base.fontPointsize( 30 );
base.boxColor( "red" );
base.animationDelay( 20 );
base.compressType( RLECompression );
for ( int angle = 0; angle < 360; angle += 30 )
{
cout << "angle " << angle << endl;
Image pic = base;
pic.annotate( "NorthWest", Geometry(0,0,x,y), NorthWestGravity, angle );
pic.annotate( "North", Geometry(0,0,0,y), NorthGravity, angle );
pic.annotate( "NorthEast", Geometry(0,0,x,y), NorthEastGravity, angle );
pic.annotate( "East", Geometry(0,0,x,0), EastGravity, angle );
pic.annotate( "Center", Geometry(0,0,0,0), CenterGravity, angle );
pic.annotate( "SouthEast", Geometry(0,0,x,y), SouthEastGravity, angle );
pic.annotate( "South", Geometry(0,0,0,y), SouthGravity, angle );
pic.annotate( "SouthWest", Geometry(0,0,x,y), SouthWestGravity, angle );
pic.annotate( "West", Geometry(0,0,x,0), WestGravity, angle );
animation.push_back( pic );
}
cout << "Writing image \"gravity_out.miff\" ..." << endl;
writeImages( animation.begin(), animation.end(), "gravity_out.miff" );
// system( "animate gravity_out.miff" );
}
catch( exception &error_ )
{
cout << "Caught exception: " << error_.what() << endl;
return 1;
}
return 0;
}
--- NEW FILE: zoom_bessel.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: model.miff ---
Id=ImageMagick
Class=PseudoClass Colors=256 Matte=False
Columns=128 Rows=192 Depth=8
Page=128x192+0+0
Background-color=gray100 Border-color=#dfdfdf Matte-color=gray74
Signature=8ef00fddd9f2a02ba722de756c81cb42
:
--- NEW FILE: detrans.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
outfile="test_${executable}.out"
rm -f $outfile
${MEMCHECK} "./${executable}" 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: gravity.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
outfile="test_${executable}.out"
rm -f $outfile
${MEMCHECK} "./${executable}" 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: tile.miff ---
Id=ImageMagick
Class=PseudoClass Colors=256 Matte=False
Columns=71 Rows=71 Depth=8
Page=71x71+0+0
Background-color=#cecece Border-color=#dfdfdf Matte-color=gray74
Signature=55c5554a36b25d1aa8280855398872e0
:
--- NEW FILE: demo.cpp ---
// This may look like C code, but it is really -*- C++ -*-
//
// Copyright Bob Friesenhahn, 1999, 2000, 2001, 2002, 2003
//
// Simple demo program for Magick++
//
// Concept and algorithms lifted from PerlMagick demo script written
// by John Christy.
//
// Max run-time size 60MB (as compared with 95MB for PerlMagick) under SPARC Solaris
//
#include
#include
#include
#include
using namespace std;
using namespace Magick;
int main( int /*argc*/, char ** argv)
{
// Initialize ImageMagick install location for Windows
InitializeMagick(*argv);
try {
string srcdir("");
if(getenv("SRCDIR") != 0)
srcdir = getenv("SRCDIR");
// Common font to use.
string font = "Helvetica";
list montage;
{
//
// Read model & smile image.
//
cout << "Read images ..." << endl;
Image model( srcdir + "model.miff" );
model.label( "Magick++" );
model.borderColor( "black" );
model.backgroundColor( "black" );
Image smile( srcdir + "smile.miff" );
smile.label( "Smile" );
smile.borderColor( "black" );
//
// Create image stack.
//
cout << "Creating thumbnails..." << endl;
// Construct initial list containing seven copies of a null image
Image null;
null.size( Geometry(70,70) );
null.read( "NULL:black" );
list images( 7, null );
Image example = model;
// Each of the following follow the pattern
// 1. obtain reference to (own copy of) image
// 2. apply label to image
// 3. apply operation to image
// 4. append image to container
cout << " add noise ..." << endl;
example.label( "Add Noise" );
example.addNoise( LaplacianNoise );
images.push_back( example );
cout << " add noise (blue) ..." << endl;
example.label( "Add Noise\n(Blue Channel)" );
example.addNoiseChannel( BlueChannel, PoissonNoise );
images.push_back( example );
cout << " annotate ..." << endl;
example = model;
example.label( "Annotate" );
example.density( "72x72" );
example.fontPointsize( 18 );
example.font( font );
example.strokeColor( Color() );
example.fillColor( "gold" );
example.annotate( "Magick++", "+0+20", NorthGravity );
images.push_back( example );
cout << " blur ..." << endl;
example = model;
example.label( "Blur" );
example.blur( 0, 1.5 );
images.push_back( example );
cout << " blur red channel ..." << endl;
example = model;
example.label( "Blur Channel\n(Red Channel)" );
example.blurChannel( RedChannel, 0, 3.0 );
images.push_back( example );
cout << " border ..." << endl;
example = model;
example.label( "Border" );
example.borderColor( "gold" );
example.border( Geometry(6,6) );
images.push_back( example );
cout << " channel ..." << endl;
example = model;
example.label( "Channel\n(Red Channel)" );
example.channel( RedChannel );
images.push_back( example );
cout << " charcoal ..." << endl;
example = model;
example.label( "Charcoal" );
example.charcoal( );
images.push_back( example );
cout << " composite ..." << endl;
example = model;
example.label( "Composite" );
example.composite( smile, "+35+65", OverCompositeOp);
images.push_back( example );
cout << " contrast ..." << endl;
example = model;
example.label( "Contrast" );
example.contrast( false );
images.push_back( example );
cout << " convolve ..." << endl;
example = model;
example.label( "Convolve" );
{
// 3x3 matrix
const double kernel[] = { 1, 1, 1, 1, 4, 1, 1, 1, 1 };
example.convolve( 3, kernel );
}
images.push_back( example );
cout << " crop ..." << endl;
example = model;
example.label( "Crop" );
example.crop( "80x80+25+50" );
images.push_back( example );
cout << " despeckle ..." << endl;
example = model;
example.label( "Despeckle" );
example.despeckle( );
images.push_back( example );
cout << " draw ..." << endl;
example = model;
example.label( "Draw" );
example.fillColor(Color());
example.strokeColor( "gold" );
example.strokeWidth( 2 );
example.draw( DrawableCircle( 60,90, 60,120 ) );
images.push_back( example );
cout << " edge ..." << endl;
example = model;
example.label( "Detect Edges" );
example.edge( );
images.push_back( example );
cout << " emboss ..." << endl;
example = model;
example.label( "Emboss" );
example.emboss( );
images.push_back( example );
cout << " equalize ..." << endl;
example = model;
example.label( "Equalize" );
example.equalize( );
images.push_back( example );
cout << " explode ..." << endl;
example = model;
example.label( "Explode" );
example.backgroundColor( "#000000FF" );
example.implode( -1 );
images.push_back( example );
cout << " flip ..." << endl;
example = model;
example.label( "Flip" );
example.flip( );
images.push_back( example );
cout << " flop ..." << endl;
example = model;
example.label( "Flop" );
example.flop();
images.push_back( example );
cout << " frame ..." << endl;
example = model;
example.label( "Frame" );
example.frame( );
images.push_back( example );
cout << " gamma ..." << endl;
example = model;
example.label( "Gamma" );
example.gamma( 1.6 );
images.push_back( example );
cout << " gaussian blur ..." << endl;
example = model;
example.label( "Gaussian Blur" );
example.gaussianBlur( 0.0, 1.5 );
images.push_back( example );
cout << " gaussian blur channel ..." << endl;
example = model;
example.label( "Gaussian Blur\n(Green Channel)" );
example.gaussianBlurChannel( GreenChannel, 0.0, 1.5 );
images.push_back( example );
cout << " gradient ..." << endl;
Image gradient;
gradient.size( "130x194" );
gradient.read( "gradient:#20a0ff-#ffff00" );
gradient.label( "Gradient" );
images.push_back( gradient );
cout << " grayscale ..." << endl;
example = model;
example.label( "Grayscale" );
example.quantizeColorSpace( GRAYColorspace );
example.quantize( );
images.push_back( example );
cout << " implode ..." << endl;
example = model;
example.label( "Implode" );
example.implode( 0.5 );
images.push_back( example );
cout << " level ..." << endl;
example = model;
example.label( "Level" );
example.level( 0.20*QuantumRange, 0.90*QuantumRange, 1.20 );
images.push_back( example );
cout << " level red channel ..." << endl;
example = model;
example.label( "Level Channel\n(Red Channel)" );
example.levelChannel( RedChannel, 0.20*QuantumRange, 0.90*QuantumRange, 1.20 );
images.push_back( example );
cout << " median filter ..." << endl;
example = model;
example.label( "Median Filter" );
example.medianFilter( );
images.push_back( example );
cout << " modulate ..." << endl;
example = model;
example.label( "Modulate" );
example.modulate( 110, 110, 110 );
images.push_back( example );
cout << " monochrome ..." << endl;
example = model;
example.label( "Monochrome" );
example.quantizeColorSpace( GRAYColorspace );
example.quantizeColors( 2 );
example.quantizeDither( false );
example.quantize( );
images.push_back( example );
cout << " motion blur ..." << endl;
example = model;
example.label( "Motion Blur" );
example.motionBlur( 0.0, 7.0,45 );
images.push_back( example );
cout << " negate ..." << endl;
example = model;
example.label( "Negate" );
example.negate( );
images.push_back( example );
cout << " normalize ..." << endl;
example = model;
example.label( "Normalize" );
example.normalize( );
images.push_back( example );
cout << " oil paint ..." << endl;
example = model;
example.label( "Oil Paint" );
example.oilPaint( );
images.push_back( example );
cout << " ordered dither 2x2 ..." << endl;
example = model;
example.label( "Ordered Dither\n(2x2)" );
example.randomThreshold( Geometry(2,2) );
images.push_back( example );
cout << " ordered dither 3x3..." << endl;
example = model;
example.label( "Ordered Dither\n(3x3)" );
example.randomThreshold( Geometry(3,3) );
images.push_back( example );
cout << " ordered dither 4x4..." << endl;
example = model;
example.label( "Ordered Dither\n(4x4)" );
example.randomThreshold( Geometry(4,4) );
images.push_back( example );
cout << " ordered dither red 4x4..." << endl;
example = model;
example.label( "Ordered Dither\n(Red 4x4)" );
example.randomThresholdChannel( Geometry(4,4), RedChannel);
images.push_back( example );
cout << " plasma ..." << endl;
Image plasma;
plasma.size( "130x194" );
plasma.read( "plasma:fractal" );
plasma.label( "Plasma" );
images.push_back( plasma );
cout << " quantize ..." << endl;
example = model;
example.label( "Quantize" );
example.quantize( );
images.push_back( example );
cout << " quantum operator ..." << endl;
example = model;
example.label( "Quantum Operator\nRed * 0.4" );
example.quantumOperator( RedChannel,MultiplyEvaluateOperator,0.40 );
images.push_back( example );
cout << " raise ..." << endl;
example = model;
example.label( "Raise" );
example.raise( );
images.push_back( example );
cout << " reduce noise ..." << endl;
example = model;
example.label( "Reduce Noise" );
example.reduceNoise( 1.0 );
images.push_back( example );
cout << " resize ..." << endl;
example = model;
example.label( "Resize" );
example.zoom( "50%" );
images.push_back( example );
cout << " roll ..." << endl;
example = model;
example.label( "Roll" );
example.roll( "+20+10" );
images.push_back( example );
cout << " rotate ..." << endl;
example = model;
example.label( "Rotate" );
example.rotate( 45 );
example.transparent( "black" );
images.push_back( example );
cout << " scale ..." << endl;
example = model;
example.label( "Scale" );
example.scale( "60%" );
images.push_back( example );
cout << " segment ..." << endl;
example = model;
example.label( "Segment" );
example.segment( 0.5, 0.25 );
images.push_back( example );
cout << " shade ..." << endl;
example = model;
example.label( "Shade" );
example.shade( 30, 30, false );
images.push_back( example );
cout << " sharpen ..." << endl;
example = model;
example.label("Sharpen");
example.sharpen( 0.0, 1.0 );
images.push_back( example );
cout << " shave ..." << endl;
example = model;
example.label("Shave");
example.shave( Geometry( 10, 10) );
images.push_back( example );
cout << " shear ..." << endl;
example = model;
example.label( "Shear" );
example.shear( 45, 45 );
example.transparent( "black" );
images.push_back( example );
cout << " spread ..." << endl;
example = model;
example.label( "Spread" );
example.spread( 3 );
images.push_back( example );
cout << " solarize ..." << endl;
example = model;
example.label( "Solarize" );
example.solarize( );
images.push_back( example );
cout << " swirl ..." << endl;
example = model;
example.backgroundColor( "#000000FF" );
example.label( "Swirl" );
example.swirl( 90 );
images.push_back( example );
cout << " threshold ..." << endl;
example = model;
example.label( "Threshold" );
example.threshold( QuantumRange/2.0 );
images.push_back( example );
cout << " threshold random ..." << endl;
example = model;
example.label( "Random\nThreshold" );
example.randomThreshold( Geometry((unsigned int) (0.3*QuantumRange),
(unsigned int) (0.85*QuantumRange)) );
images.push_back( example );
cout << " unsharp mask ..." << endl;
example = model;
example.label( "Unsharp Mask" );
// radius_, sigma_, amount_, threshold_
example.unsharpmask( 0.0, 1.0, 1.0, 0.05);
images.push_back( example );
cout << " wave ..." << endl;
example = model;
example.label( "Wave" );
example.matte( true );
example.backgroundColor( "#000000FF" );
example.wave( 25, 150 );
images.push_back( example );
//
// Create image montage.
//
cout << "Montage images..." << endl;
for_each( images.begin(), images.end(), fontImage( font ) );
for_each( images.begin(), images.end(), strokeColorImage( Color("#600") ) );
MontageFramed montageOpts;
montageOpts.geometry( "130x194+10+5>" );
montageOpts.gravity( CenterGravity );
montageOpts.borderColor( "green" );
montageOpts.borderWidth( 1 );
montageOpts.tile( "7x4" );
montageOpts.compose( OverCompositeOp );
montageOpts.backgroundColor( "#ffffff" );
montageOpts.font( font );
montageOpts.pointSize( 18 );
montageOpts.fillColor( "#600" );
montageOpts.strokeColor( Color() );
montageOpts.compose(OverCompositeOp);
montageOpts.fileName( "Magick++ Demo" );
montageImages( &montage, images.begin(), images.end(), montageOpts );
}
Image& montage_image = montage.front();
{
// Create logo image
cout << "Adding logo image ..." << endl;
Image logo( "logo:" );
logo.zoom( "45%" );
// Composite logo into montage image
Geometry placement(0,0,(montage_image.columns()/2)-(logo.columns()/2),0);
montage_image.composite( logo, placement, OverCompositeOp );
}
cout << "Writing image \"demo_out.miff\" ..." << endl;
montage_image.matte( false );
montage_image.compressType( RLECompression );
writeImages(montage.begin(),montage.end(),"demo_out.miff");
// Uncomment following lines to display image to screen
// cout << "Display image..." << endl;
// montage_image.display();
}
catch( exception &error_ )
{
cout << "Caught exception: " << error_.what() << endl;
return 1;
}
return 0;
}
--- NEW FILE: zoom_blackman.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: smile_anim.miff ---
Id=ImageMagick
Class=PseudoClass Colors=2 Matte=False
Columns=48 Rows=48 Depth=8
Page=48x48+0+0
Background-color=gray100 Border-color=#dfdfdf Matte-color=gray74
Scene=0 Iterations=0 Delay=10 Dispose=3
Comment={GifBuilder 0.2 by Yves Piguet}
Signature=7b72ce35b443b218e81337ad355496ad
:
--- NEW FILE: zoom_quadratic.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: smile.miff ---
id=ImageMagick
class=PseudoClass colors=3 matte=True
columns=48 rows=48 depth=8
Resolution=89x89 units=undefined
page=1x1+0+0
delay=10
dispose=3
Signature=e479e50a6b2fd2ede083d65cfe4f844d
:
--- NEW FILE: zoom_sample.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: zoom_triangle.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: detrans.cpp ---
//
// Replace transparency in an image with a solid color using Magick++
//
// Useful to see how a transparent image looks on a particular
// background color, or to create a similar looking effect without
// transparency.
//
// Copyright Bob Friesenhahn, 2000
//
// Usage: detrans color file...
//
#include
#include
using namespace std;
using namespace Magick;
int main(int argc,char **argv)
{
if ( argc < 3 )
{
cout << "Usage: " << argv[0] << " background_color file..." << endl;
exit( 1 );
}
// Initialize ImageMagick install location for Windows
InitializeMagick(*argv);
{
Color color;
try {
color = Color(argv[1]);
}
catch ( Exception error_ )
{
cout << error_.what() << endl;
cout.flush();
exit(1);
}
char **arg = &argv[2];
while ( *arg )
{
string fname(*arg);
try {
Image overlay( fname );
Image base( overlay.size(), color );
base.composite( overlay, 0, 0, OverCompositeOp );
base.matte( false );
base.write( fname );
}
catch( Exception &error_ )
{
cout << error_.what() << endl;
}
++arg;
}
}
return 0;
}
--- NEW FILE: button.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
outfile="test_${executable}.out"
rm -f $outfile
${MEMCHECK} "./${executable}" 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: piddle.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
outfile="test_${executable}.out"
rm -f $outfile
${MEMCHECK} "./${executable}" 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: zoom_hamming.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: zoom_cubic.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: zoom_scale.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: zoom_hanning.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: shapes.cpp ---
// This may look like C code, but it is really -*- C++ -*-
//
// Copyright Bob Friesenhahn, 1999, 2000, 2002, 2003
//
// GD/PerlMagick example using Magick++ methods.
//
// Concept and algorithms lifted from PerlMagick demo script
//
#include
#include
#include
using namespace std;
using namespace Magick;
int main( int /*argc*/, char ** argv)
{
// Initialize ImageMagick install location for Windows
InitializeMagick(*argv);
try {
string srcdir("");
if(getenv("SRCDIR") != 0)
srcdir = getenv("SRCDIR");
//
// Create a 300x300 white canvas.
//
Image image( "300x300", "white" );
//
// Draw texture-filled polygon
//
// Polygon list
std::list poly_coord;
poly_coord.push_back( Coordinate(30,30) );
poly_coord.push_back( Coordinate(100,10) );
poly_coord.push_back( Coordinate(190,290) );
poly_coord.push_back( Coordinate(30,290) );
Image texture( srcdir + "tile.miff" );
image.penTexture( texture );
image.draw( DrawablePolygon( poly_coord ) );
texture.isValid( false );
image.penTexture( texture ); // Unset texture
//
// Draw filled ellipse with black border, and red fill color
//
image.strokeColor( "black" );
image.fillColor( "red" );
image.strokeWidth( 5 );
image.draw( DrawableEllipse( 100,100, 50,75, 0,360 ) );
image.fillColor( Color() ); // Clear out fill color
//
// Draw ellipse, and polygon, with black stroke, strokeWidth of 5
//
image.strokeColor( "black" );
image.strokeWidth( 5 );
list drawlist;
// Add polygon to list
poly_coord.clear();
poly_coord.push_back( Coordinate(30,30) );
poly_coord.push_back( Coordinate(100,10) );
poly_coord.push_back( Coordinate(190,290) );
poly_coord.push_back( Coordinate(30,290) );
drawlist.push_back( DrawablePolygon( poly_coord ) );
image.draw( drawlist );
//
// Floodfill object with blue
//
image.colorFuzz( 80 );
image.floodFillColor( "+132+62", "blue" );
//
// Draw text
//
image.strokeColor(Color());
image.fillColor( "red" );
image.fontPointsize( 18 );
image.annotate( "Hello world!", "+150+20" );
image.fillColor( "blue" );
image.fontPointsize( 14 );
image.annotate( "Goodbye cruel world!", "+150+38" );
image.fillColor( "black" );
image.fontPointsize( 14 );
image.annotate( "I'm climbing the wall!", "+280+120",
NorthWestGravity, 90.0 );
//image.display();
//
// Write image.
//
cout << "Writing image \"shapes_out.miff\" ..." << endl;
image.compressType( RLECompression );
image.write( "shapes_out.miff" );
// cout << "Display image..." << endl;
// image.display( );
}
catch( exception &error_ )
{
cout << "Caught exception: " << error_.what() << endl;
return 1;
}
return 0;
}
--- NEW FILE: demo.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
outfile="test_${executable}.out"
rm -f $outfile
${MEMCHECK} "./${executable}" 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: button.cpp ---
//
// Magick++ demo to generate a simple text button
//
// Copyright Bob Friesenhahn, 1999, 2000, 2001, 2003
//
#include
#include
#include
using namespace std;
using namespace Magick;
int main( int /*argc*/, char ** argv)
{
// Initialize ImageMagick install location for Windows
InitializeMagick(*argv);
try {
string srcdir("");
if(getenv("SRCDIR") != 0)
srcdir = getenv("SRCDIR");
//
// Options
//
string backGround = "xc:#CCCCCC"; // A solid color
// Color to use for decorative border
Color border = "#D4DCF3";
// Button size
string buttonSize = "120x20";
// Button background texture
string buttonTexture = "granite:";
// Button text
string text = "Button Text";
// Button text color
string textColor = "red";
// Font point size
int fontPointSize = 16;
//
// Magick++ operations
//
Image button;
// Set button size
button.size( buttonSize );
// Read background image
button.read( backGround );
// Set background to buttonTexture
Image backgroundTexture( buttonTexture );
button.texture( backgroundTexture );
// Add some text
button.fillColor( textColor );
button.fontPointsize( fontPointSize );
button.annotate( text, CenterGravity );
// Add a decorative frame
button.borderColor( border );
button.frame( "6x6+3+3" );
// Quantize to desired colors
// button.quantizeTreeDepth(8);
button.quantizeDither(false);
button.quantizeColors(64);
button.quantize();
// Save to file
cout << "Writing to \"button_out.miff\" ..." << endl;
button.compressType( RLECompression );
button.write("button_out.miff");
// Display on screen
// button.display();
}
catch( exception &error_ )
{
cout << "Caught exception: " << error_.what() << endl;
return 1;
}
return 0;
}
--- NEW FILE: flip.cpp ---
// This may look like C code, but it is really -*- C++ -*-
//
// Copyright Bob Friesenhahn, 1999, 2003
//
// Demonstration of unary function-object based operations
//
// Reads the multi-frame file "smile_anim.miff" and writes a
// flipped and morphed version to "flip_out.miff".
//
#include
#include
#include
#include
#include
using namespace std;
using namespace Magick;
int main( int /*argc*/, char ** argv)
{
// Initialize ImageMagick install location for Windows
InitializeMagick(*argv);
try {
string srcdir("");
if(getenv("SRCDIR") != 0)
srcdir = getenv("SRCDIR");
// Read images into STL list
list imageList;
readImages( &imageList, srcdir + "smile_anim.miff" );
// cout << "Total scenes: " << imageList.size() << endl;
// Flip images
for_each( imageList.begin(), imageList.end(), flipImage() );
// Create a morphed version, adding three frames between each
// existing frame.
list morphed;
morphImages( &morphed, imageList.begin(), imageList.end(), 3 );
// Write out images
cout << "Writing image \"flip_out.miff\" ..." << endl;
writeImages( morphed.begin(), morphed.end(), "flip_out.miff" );
}
catch( exception &error_ )
{
cout << "Caught exception: " << error_.what() << endl;
return 1;
}
return 0;
}
--- NEW FILE: shapes.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
outfile="test_${executable}.out"
rm -f $outfile
${MEMCHECK} "./${executable}" 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: zoom_lanczos.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: analyze.cpp ---
//
// Demonstrate using the 'analyze' process module to compute
// image statistics.
//
// Copyright Bob Friesenhahn, 2003, 2004
//
// Usage: analyze file...
//
#include
#include
#include
#include
using namespace std;
using namespace Magick;
int main(int argc,char **argv)
{
if ( argc < 2 )
{
cout << "Usage: " << argv[0] << " file..." << endl;
exit( 1 );
}
// Initialize ImageMagick install location for Windows
InitializeMagick(*argv);
{
std::list attributes;
attributes.push_back("TopLeftColor");
attributes.push_back("TopRightColor");
attributes.push_back("BottomLeftColor");
attributes.push_back("BottomRightColor");
attributes.push_back("filter:brightness:mean");
attributes.push_back("filter:brightness:standard-deviation");
attributes.push_back("filter:brightness:kurtosis");
attributes.push_back("filter:brightness:skewness");
attributes.push_back("filter:saturation:mean");
attributes.push_back("filter:saturation:standard-deviation");
attributes.push_back("filter:saturation:kurtosis");
attributes.push_back("filter:saturation:skewness");
char **arg = &argv[1];
while ( *arg )
{
string fname(*arg);
try {
cout << "File: " << fname << endl;
Image image( fname );
/* Analyze module does not require an argument list */
image.process("analyze",0,0);
list::iterator pos = attributes.begin();
while(pos != attributes.end())
{
cout << " " << setw(16) << setfill(' ') << setiosflags(ios::left)
<< *pos << " = " << image.attribute(*pos) << endl;
pos++;
}
}
catch( Exception &error_ )
{
cout << error_.what() << endl;
}
++arg;
}
}
return 0;
}
--- NEW FILE: zoom_point.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: zoom_mitchell.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: zoom.cpp ---
// This may look like C code, but it is really -*- C++ -*-
//
// Copyright Bob Friesenhahn, 2001, 2002, 2003
//
// Resize image using specified resize algorithm with Magick++ API
//
// Usage: zoom [-density resolution] [-filter algorithm] [-geometry geometry]
// [-resample resolution] input_file output_file
//
#include
#include
#include
using namespace std;
using namespace Magick;
static void Usage ( char **argv )
{
cout << "Usage: " << argv[0]
<< " [-density resolution] [-filter algorithm] [-geometry geometry]"
<< " [-resample resolution] input_file output_file" << endl
<< " algorithm - bessel blackman box catrom cubic gaussian hamming hanning" << endl
<< " hermite lanczos mitchell point quadratic sample scale sinc triangle" << endl;
exit(1);
}
static void ParseError (int position, char **argv)
{
cout << "Argument \"" << argv[position] << "\" at position" << position
<< "incorrect" << endl;
Usage(argv);
}
int main(int argc,char **argv)
{
// Initialize ImageMagick install location for Windows
InitializeMagick(*argv);
if ( argc < 2 )
Usage(argv);
enum ResizeAlgorithm
{
Zoom,
Scale,
Sample
};
{
Geometry density;
Geometry geometry;
Geometry resample;
Magick::FilterTypes filter(LanczosFilter);
ResizeAlgorithm resize_algorithm=Zoom;
int argv_index=1;
while ((argv_index < argc - 2) && (*argv[argv_index] == '-'))
{
std::string command(argv[argv_index]);
if (command.compare("-density") == 0)
{
argv_index++;
try {
density=Geometry(argv[argv_index]);
}
catch( exception &/* error_ */)
{
ParseError(argv_index,argv);
}
argv_index++;
continue;
}
else if (command.compare("-filter") == 0)
{
argv_index++;
std::string algorithm(argv[argv_index]);
if (algorithm.compare("point") == 0)
filter=PointFilter;
else if (algorithm.compare("box") == 0)
filter=BoxFilter;
else if (algorithm.compare("triangle") == 0)
filter=TriangleFilter;
else if (algorithm.compare("hermite") == 0)
filter=HermiteFilter;
else if (algorithm.compare("hanning") == 0)
filter=HanningFilter;
else if (algorithm.compare("hamming") == 0)
filter=HammingFilter;
else if (algorithm.compare("blackman") == 0)
filter=BlackmanFilter;
else if (algorithm.compare("gaussian") == 0)
filter=GaussianFilter;
else if (algorithm.compare("quadratic") == 0)
filter=QuadraticFilter;
else if (algorithm.compare("cubic") == 0)
filter=CubicFilter;
else if (algorithm.compare("catrom") == 0)
filter=CatromFilter;
else if (algorithm.compare("mitchell") == 0)
filter=MitchellFilter;
else if (algorithm.compare("lanczos") == 0)
filter=LanczosFilter;
else if (algorithm.compare("bessel") == 0)
filter=BesselFilter;
else if (algorithm.compare("sinc") == 0)
filter=SincFilter;
else if (algorithm.compare("sample") == 0)
resize_algorithm=Sample;
else if (algorithm.compare("scale") == 0)
resize_algorithm=Scale;
else
ParseError(argv_index,argv);
argv_index++;
continue;
}
else if (command.compare("-geometry") == 0)
{
argv_index++;
try {
geometry=Geometry(argv[argv_index]);
}
catch( exception &/* error_ */)
{
ParseError(argv_index,argv);
}
argv_index++;
continue;
}
else if (command.compare("-resample") == 0)
{
argv_index++;
try {
resample=Geometry(argv[argv_index]);
}
catch( exception &/* error_ */)
{
ParseError(argv_index,argv);
}
argv_index++;
continue;
}
ParseError(argv_index,argv);
}
if (argv_index>argc-1)
ParseError(argv_index,argv);
std::string input_file(argv[argv_index]);
argv_index++;
if (argv_index>argc)
ParseError(argv_index,argv);
std::string output_file(argv[argv_index]);
try {
Image image(input_file);
if (density.isValid())
image.density(density);
density=image.density();
if (resample.isValid())
{
geometry =
Geometry(static_cast
(image.columns()*((double)resample.width()/density.width())+0.5),
static_cast
(image.rows()*((double)resample.height()/density.height())+0.5));
image.density(resample);
}
switch (resize_algorithm)
{
case Sample:
image.sample(geometry);
break;
case Scale:
image.scale(geometry);
break;
case Zoom:
image.filterType(filter);
image.zoom(geometry);
break;
}
image.write(output_file);
}
catch( exception &error_ )
{
cout << "Caught exception: " << error_.what() << endl;
return 1;
}
}
return 0;
}
--- NEW FILE: zoom_box.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
From ebala at helixcommunity.org Thu Sep 10 11:34:11 2009
From: ebala at helixcommunity.org (ebala@helixcommunity.org)
Date: Thu Sep 10 20:36:59 2009
Subject: [Common-cvs] import/imagemagick/Magick++/demo Makefile.am, 1.1,
1.2 analyze.cpp, 1.1, 1.2 button.cpp, 1.1, 1.2 demo.cpp, 1.1,
1.2 detrans.cpp, 1.1, 1.2 flip.cpp, 1.1, 1.2 gravity.cpp, 1.1,
1.2 piddle.cpp, 1.1, 1.2 shapes.cpp, 1.1, 1.2 zoom.cpp, 1.1,
1.2 model.miff, 1.1, 1.2 smile.miff, 1.1, 1.2 smile_anim.miff,
1.1, 1.2 tile.miff, 1.1, 1.2 analyze.sh, 1.1, 1.2 button.sh,
1.1, 1.2 demo.sh, 1.1, 1.2 detrans.sh, 1.1, 1.2 flip.sh, 1.1,
1.2 gravity.sh, 1.1, 1.2 piddle.sh, 1.1, 1.2 shapes.sh, 1.1,
1.2 zoom_bessel.sh, 1.1, 1.2 zoom_blackman.sh, 1.1,
1.2 zoom_box.sh, 1.1, 1.2 zoom_catrom.sh, 1.1,
1.2 zoom_cubic.sh, 1.1, 1.2 zoom_gaussian.sh, 1.1,
1.2 zoom_hamming.sh, 1.1, 1.2 zoom_hanning.sh, 1.1,
1.2 zoom_hermite.sh, 1.1, 1.2 zoom_lanczos.sh, 1.1,
1.2 zoom_mitchell.sh, 1.1, 1.2 zoom_point.sh, 1.1,
1.2 zoom_quadratic.sh, 1.1, 1.2 zoom_sample.sh, 1.1,
1.2 zoom_scale.sh, 1.1, 1.2 zoom_sinc.sh, 1.1,
1.2 zoom_triangle.sh, 1.1, 1.2 .gdbinit, 1.1, 1.2
Message-ID:
Update of /cvsroot/common/import/imagemagick/Magick++/demo
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv27219
Added Files:
Makefile.am analyze.cpp button.cpp demo.cpp detrans.cpp
flip.cpp gravity.cpp piddle.cpp shapes.cpp zoom.cpp model.miff
smile.miff smile_anim.miff tile.miff analyze.sh button.sh
demo.sh detrans.sh flip.sh gravity.sh piddle.sh shapes.sh
zoom_bessel.sh zoom_blackman.sh zoom_box.sh zoom_catrom.sh
zoom_cubic.sh zoom_gaussian.sh zoom_hamming.sh zoom_hanning.sh
zoom_hermite.sh zoom_lanczos.sh zoom_mitchell.sh zoom_point.sh
zoom_quadratic.sh zoom_sample.sh zoom_scale.sh zoom_sinc.sh
zoom_triangle.sh .gdbinit
Log Message:
Import of Imagemagick
--- NEW FILE: zoom_catrom.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: zoom_sinc.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: Makefile.am ---
#
# Makefile for Magick++ demo programs
#
# Copyright Bob Friesenhahn, 1999, 2000, 2001, 2002, 2003
#
AUTOMAKE_OPTIONS = 1.8 foreign nostdinc
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/Magick++/lib -I$(top_srcdir)
check_PROGRAMS = analyze button demo detrans flip gravity piddle shapes zoom
LDADD = ../lib/libMagick++.la
analyze_SOURCES = analyze.cpp
button_SOURCES = button.cpp
demo_SOURCES = demo.cpp
detrans_SOURCES = detrans.cpp
flip_SOURCES = flip.cpp
gravity_SOURCES = gravity.cpp
piddle_SOURCES = piddle.cpp
shapes_SOURCES = shapes.cpp
zoom_SOURCES = zoom.cpp
EXTRA_DIST = model.miff smile.miff smile_anim.miff tile.miff
CLEANFILES = *_out.* ir.out # SunWS_cache
ZOOM_FILTERS = bessel blackman box catrom cubic gaussian hamming hanning hermite \
lanczos mitchell point quadratic sample scale sinc triangle
ZOOM_GEOMETRY = 600x600
if WIN32_NATIVE_BUILD
SRCDIR='$(shell @WinPathScript@ $(srcdir)/)'
else
SRCDIR='$(srcdir)/'
endif
MAGICK_ENV = $(SHELL) $(top_builddir)/magick.sh
# FIXME: MinGW needs Windows path form of srcdir here (or pass as command argument)
check:
@$(MAGICK_ENV) SRCDIR=$(SRCDIR) $(MEMCHECK) ./analyze '$(srcdir)/model.miff'
@$(MAGICK_ENV) SRCDIR=$(SRCDIR) $(MEMCHECK) ./button
@$(MAGICK_ENV) SRCDIR=$(SRCDIR) $(MEMCHECK) ./demo
@$(MAGICK_ENV) SRCDIR=$(SRCDIR) $(MEMCHECK) ./flip
@$(MAGICK_ENV) SRCDIR=$(SRCDIR) $(MEMCHECK) ./gravity
@$(MAGICK_ENV) SRCDIR=$(SRCDIR) $(MEMCHECK) ./piddle
@$(MAGICK_ENV) SRCDIR=$(SRCDIR) $(MEMCHECK) ./shapes
for filter in $(ZOOM_FILTERS) ; do \
echo "$$filter ..." ; \
$(MAGICK_ENV) SRCDIR=$(SRCDIR) $(MEMCHECK) ./zoom -filter $$filter -geometry $(ZOOM_GEOMETRY) '$(srcdir)/model.miff' zoom_$${filter}_out.miff ; \
done
--- NEW FILE: flip.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
outfile="test_${executable}.out"
rm -f $outfile
${MEMCHECK} "./${executable}" 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: analyze.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
outfile="test_${executable}.out"
rm -f $outfile
${MEMCHECK} ./analyze "$SRCDIR/model.miff" 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: zoom_gaussian.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: piddle.cpp ---
// This may look like C code, but it is really -*- C++ -*-
//
// Copyright Bob Friesenhahn, 1999, 2000, 2002, 2003
//
// PerlMagick "piddle" demo re-implemented using Magick++ methods.
// The PerlMagick "piddle" demo is written by John Cristy
//
#include
#include
#include
using namespace std;
using namespace Magick;
int main( int /*argc*/, char ** argv)
{
// Initialize ImageMagick install location for Windows
InitializeMagick(*argv);
try {
string srcdir("");
if(getenv("SRCDIR") != 0)
srcdir = getenv("SRCDIR");
//
// Create a 300x300 white canvas.
//
Image image( "300x300", "white" );
// Drawing list
std::list drawList;
// Start drawing by pushing a drawing context with specified
// viewbox size
drawList.push_back(DrawablePushGraphicContext());
drawList.push_back(DrawableViewbox(0,0,image.columns(),image.rows()));
//
// Draw blue grid
//
drawList.push_back(DrawableStrokeColor("#ccf"));
for ( int i=0; i < 300; i += 10 )
{
drawList.push_back(DrawableLine(i,0, i,300));
drawList.push_back(DrawableLine(0,i, 300,i));
}
//
// Draw rounded rectangle.
//
drawList.push_back(DrawableFillColor("blue"));
drawList.push_back(DrawableStrokeColor("red"));
drawList.push_back(DrawableRoundRectangle(15,15, 70,70, 10,10));
drawList.push_back(DrawableFillColor("blue"));
drawList.push_back(DrawableStrokeColor("maroon"));
drawList.push_back(DrawableStrokeWidth(4));
drawList.push_back(DrawableRoundRectangle(15,15, 70,70, 10,10));
//
// Draw curve.
//
{
drawList.push_back(DrawableStrokeColor("black"));
drawList.push_back(DrawableStrokeWidth(4));
drawList.push_back(DrawableFillColor(Color()));
std::list points;
points.push_back(Coordinate(20,20));
points.push_back(Coordinate(100,50));
points.push_back(Coordinate(50,100));
points.push_back(Coordinate(160,160));
drawList.push_back(DrawableBezier(points));
}
//
// Draw line
//
drawList.push_back(DrawableStrokeColor("red"));
drawList.push_back(DrawableStrokeWidth(1));
drawList.push_back(DrawableLine(10,200, 20,190));
//
// Draw arc within a circle.
//
drawList.push_back(DrawableStrokeColor("black"));
drawList.push_back(DrawableFillColor("yellow"));
drawList.push_back(DrawableStrokeWidth(4));
drawList.push_back(DrawableCircle(160,70, 200,70));
drawList.push_back(DrawableStrokeColor("black"));
drawList.push_back(DrawableFillColor("blue"));
drawList.push_back(DrawableStrokeWidth(4));
{
std::list path;
path.push_back(PathMovetoAbs(Coordinate(160,70)));
path.push_back(PathLinetoVerticalRel(-40));
path.push_back(PathArcRel(PathArcArgs(40,40, 0, 0, 0, -40,40)));
path.push_back(PathClosePath());
drawList.push_back(DrawablePath(path));
}
//
// Draw pentogram.
//
{
drawList.push_back(DrawableStrokeColor("red"));
drawList.push_back(DrawableFillColor("LimeGreen"));
drawList.push_back(DrawableStrokeWidth(3));
std::list points;
points.push_back(Coordinate(160,120));
points.push_back(Coordinate(130,190));
points.push_back(Coordinate(210,145));
points.push_back(Coordinate(110,145));
points.push_back(Coordinate(190,190));
points.push_back(Coordinate(160,120));
drawList.push_back(DrawablePolygon(points));
}
//
// Draw rectangle.
//
drawList.push_back(DrawableStrokeWidth(5));
drawList.push_back(DrawableFillColor(Color())); // No fill
drawList.push_back(DrawableStrokeColor("yellow"));
drawList.push_back(DrawableLine(200,260, 200,200));
drawList.push_back(DrawableLine(200,200, 260,200));
drawList.push_back(DrawableStrokeColor("red"));
drawList.push_back(DrawableLine(260,200, 260,260));
drawList.push_back(DrawableStrokeColor("green"));
drawList.push_back(DrawableLine(200,260, 260,260));
//
// Draw text.
//
drawList.push_back(DrawableFillColor("green"));
drawList.push_back(DrawableStrokeColor(Color())); // unset color
drawList.push_back(DrawablePointSize(24));
drawList.push_back(DrawableTranslation(30,140));
drawList.push_back(DrawableRotation(45.0));
drawList.push_back(DrawableText(0,0,"This is a test!"));
// Finish drawing by popping back to base context.
drawList.push_back(DrawablePopGraphicContext());
// Draw everything using completed drawing list
// image.debug(true);
image.draw(drawList);
// image.write( "piddle.mvg" );
cout << "Writing image \"piddle_out.miff\" ..." << endl;
image.compressType( RLECompression );
image.write( "piddle_out.miff" );
cout << "Writing MVG metafile \"piddle_out.mvg\" ..." << endl;
image.write( "piddle_out.mvg" );
// cout << "Display image..." << endl;
// image.display( );
}
catch( exception &error_ )
{
cout << "Caught exception: " << error_.what() << endl;
return 1;
}
return 0;
}
--- NEW FILE: .gdbinit ---
dir $cwd
dir $cdir
dir ../../coders
dir ../../magick
dir ../lib/Magick++
dir ../lib
--- NEW FILE: zoom_hermite.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: gravity.cpp ---
// This may look like C code, but it is really -*- C++ -*-
//
// Copyright Bob Friesenhahn, 2000, 2001, 2003
//
// Demo of text annotation with gravity. Produces an animation showing
// the effect of rotated text along with various gravity specifications.
//
// After running demo program, run 'animate gravity_out.miff' if you
// are using X-Windows to see an animated result.
//
// Concept and algorithms lifted from PerlMagick demo script written
// by John Christy.
//
#include
#include
#include
#include
using namespace std;
using namespace Magick;
int main( int /*argc*/, char ** argv)
{
// Initialize ImageMagick install location for Windows
InitializeMagick(*argv);
try {
string srcdir("");
if(getenv("SRCDIR") != 0)
srcdir = getenv("SRCDIR");
int x = 100;
int y = 100;
list animation;
Image base( Geometry(600,600), Color("white") );
base.strokeColor("#600");
base.fillColor(Color());
base.draw( DrawableLine( 300,100, 300,500 ) );
base.draw( DrawableLine( 100,300, 500,300 ) );
base.draw( DrawableRectangle( 100,100, 500,500 ) );
base.density( Geometry(72,72) );
base.strokeColor(Color());
base.fillColor("#600");
base.fontPointsize( 30 );
base.boxColor( "red" );
base.animationDelay( 20 );
base.compressType( RLECompression );
for ( int angle = 0; angle < 360; angle += 30 )
{
cout << "angle " << angle << endl;
Image pic = base;
pic.annotate( "NorthWest", Geometry(0,0,x,y), NorthWestGravity, angle );
pic.annotate( "North", Geometry(0,0,0,y), NorthGravity, angle );
pic.annotate( "NorthEast", Geometry(0,0,x,y), NorthEastGravity, angle );
pic.annotate( "East", Geometry(0,0,x,0), EastGravity, angle );
pic.annotate( "Center", Geometry(0,0,0,0), CenterGravity, angle );
pic.annotate( "SouthEast", Geometry(0,0,x,y), SouthEastGravity, angle );
pic.annotate( "South", Geometry(0,0,0,y), SouthGravity, angle );
pic.annotate( "SouthWest", Geometry(0,0,x,y), SouthWestGravity, angle );
pic.annotate( "West", Geometry(0,0,x,0), WestGravity, angle );
animation.push_back( pic );
}
cout << "Writing image \"gravity_out.miff\" ..." << endl;
writeImages( animation.begin(), animation.end(), "gravity_out.miff" );
// system( "animate gravity_out.miff" );
}
catch( exception &error_ )
{
cout << "Caught exception: " << error_.what() << endl;
return 1;
}
return 0;
}
--- NEW FILE: zoom_bessel.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: model.miff ---
Id=ImageMagick
Class=PseudoClass Colors=256 Matte=False
Columns=128 Rows=192 Depth=8
Page=128x192+0+0
Background-color=gray100 Border-color=#dfdfdf Matte-color=gray74
Signature=8ef00fddd9f2a02ba722de756c81cb42
:
--- NEW FILE: detrans.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
outfile="test_${executable}.out"
rm -f $outfile
${MEMCHECK} "./${executable}" 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: gravity.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
outfile="test_${executable}.out"
rm -f $outfile
${MEMCHECK} "./${executable}" 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: tile.miff ---
Id=ImageMagick
Class=PseudoClass Colors=256 Matte=False
Columns=71 Rows=71 Depth=8
Page=71x71+0+0
Background-color=#cecece Border-color=#dfdfdf Matte-color=gray74
Signature=55c5554a36b25d1aa8280855398872e0
:
--- NEW FILE: demo.cpp ---
// This may look like C code, but it is really -*- C++ -*-
//
// Copyright Bob Friesenhahn, 1999, 2000, 2001, 2002, 2003
//
// Simple demo program for Magick++
//
// Concept and algorithms lifted from PerlMagick demo script written
// by John Christy.
//
// Max run-time size 60MB (as compared with 95MB for PerlMagick) under SPARC Solaris
//
#include
#include
#include
#include
using namespace std;
using namespace Magick;
int main( int /*argc*/, char ** argv)
{
// Initialize ImageMagick install location for Windows
InitializeMagick(*argv);
try {
string srcdir("");
if(getenv("SRCDIR") != 0)
srcdir = getenv("SRCDIR");
// Common font to use.
string font = "Helvetica";
list montage;
{
//
// Read model & smile image.
//
cout << "Read images ..." << endl;
Image model( srcdir + "model.miff" );
model.label( "Magick++" );
model.borderColor( "black" );
model.backgroundColor( "black" );
Image smile( srcdir + "smile.miff" );
smile.label( "Smile" );
smile.borderColor( "black" );
//
// Create image stack.
//
cout << "Creating thumbnails..." << endl;
// Construct initial list containing seven copies of a null image
Image null;
null.size( Geometry(70,70) );
null.read( "NULL:black" );
list images( 7, null );
Image example = model;
// Each of the following follow the pattern
// 1. obtain reference to (own copy of) image
// 2. apply label to image
// 3. apply operation to image
// 4. append image to container
cout << " add noise ..." << endl;
example.label( "Add Noise" );
example.addNoise( LaplacianNoise );
images.push_back( example );
cout << " add noise (blue) ..." << endl;
example.label( "Add Noise\n(Blue Channel)" );
example.addNoiseChannel( BlueChannel, PoissonNoise );
images.push_back( example );
cout << " annotate ..." << endl;
example = model;
example.label( "Annotate" );
example.density( "72x72" );
example.fontPointsize( 18 );
example.font( font );
example.strokeColor( Color() );
example.fillColor( "gold" );
example.annotate( "Magick++", "+0+20", NorthGravity );
images.push_back( example );
cout << " blur ..." << endl;
example = model;
example.label( "Blur" );
example.blur( 0, 1.5 );
images.push_back( example );
cout << " blur red channel ..." << endl;
example = model;
example.label( "Blur Channel\n(Red Channel)" );
example.blurChannel( RedChannel, 0, 3.0 );
images.push_back( example );
cout << " border ..." << endl;
example = model;
example.label( "Border" );
example.borderColor( "gold" );
example.border( Geometry(6,6) );
images.push_back( example );
cout << " channel ..." << endl;
example = model;
example.label( "Channel\n(Red Channel)" );
example.channel( RedChannel );
images.push_back( example );
cout << " charcoal ..." << endl;
example = model;
example.label( "Charcoal" );
example.charcoal( );
images.push_back( example );
cout << " composite ..." << endl;
example = model;
example.label( "Composite" );
example.composite( smile, "+35+65", OverCompositeOp);
images.push_back( example );
cout << " contrast ..." << endl;
example = model;
example.label( "Contrast" );
example.contrast( false );
images.push_back( example );
cout << " convolve ..." << endl;
example = model;
example.label( "Convolve" );
{
// 3x3 matrix
const double kernel[] = { 1, 1, 1, 1, 4, 1, 1, 1, 1 };
example.convolve( 3, kernel );
}
images.push_back( example );
cout << " crop ..." << endl;
example = model;
example.label( "Crop" );
example.crop( "80x80+25+50" );
images.push_back( example );
cout << " despeckle ..." << endl;
example = model;
example.label( "Despeckle" );
example.despeckle( );
images.push_back( example );
cout << " draw ..." << endl;
example = model;
example.label( "Draw" );
example.fillColor(Color());
example.strokeColor( "gold" );
example.strokeWidth( 2 );
example.draw( DrawableCircle( 60,90, 60,120 ) );
images.push_back( example );
cout << " edge ..." << endl;
example = model;
example.label( "Detect Edges" );
example.edge( );
images.push_back( example );
cout << " emboss ..." << endl;
example = model;
example.label( "Emboss" );
example.emboss( );
images.push_back( example );
cout << " equalize ..." << endl;
example = model;
example.label( "Equalize" );
example.equalize( );
images.push_back( example );
cout << " explode ..." << endl;
example = model;
example.label( "Explode" );
example.backgroundColor( "#000000FF" );
example.implode( -1 );
images.push_back( example );
cout << " flip ..." << endl;
example = model;
example.label( "Flip" );
example.flip( );
images.push_back( example );
cout << " flop ..." << endl;
example = model;
example.label( "Flop" );
example.flop();
images.push_back( example );
cout << " frame ..." << endl;
example = model;
example.label( "Frame" );
example.frame( );
images.push_back( example );
cout << " gamma ..." << endl;
example = model;
example.label( "Gamma" );
example.gamma( 1.6 );
images.push_back( example );
cout << " gaussian blur ..." << endl;
example = model;
example.label( "Gaussian Blur" );
example.gaussianBlur( 0.0, 1.5 );
images.push_back( example );
cout << " gaussian blur channel ..." << endl;
example = model;
example.label( "Gaussian Blur\n(Green Channel)" );
example.gaussianBlurChannel( GreenChannel, 0.0, 1.5 );
images.push_back( example );
cout << " gradient ..." << endl;
Image gradient;
gradient.size( "130x194" );
gradient.read( "gradient:#20a0ff-#ffff00" );
gradient.label( "Gradient" );
images.push_back( gradient );
cout << " grayscale ..." << endl;
example = model;
example.label( "Grayscale" );
example.quantizeColorSpace( GRAYColorspace );
example.quantize( );
images.push_back( example );
cout << " implode ..." << endl;
example = model;
example.label( "Implode" );
example.implode( 0.5 );
images.push_back( example );
cout << " level ..." << endl;
example = model;
example.label( "Level" );
example.level( 0.20*QuantumRange, 0.90*QuantumRange, 1.20 );
images.push_back( example );
cout << " level red channel ..." << endl;
example = model;
example.label( "Level Channel\n(Red Channel)" );
example.levelChannel( RedChannel, 0.20*QuantumRange, 0.90*QuantumRange, 1.20 );
images.push_back( example );
cout << " median filter ..." << endl;
example = model;
example.label( "Median Filter" );
example.medianFilter( );
images.push_back( example );
cout << " modulate ..." << endl;
example = model;
example.label( "Modulate" );
example.modulate( 110, 110, 110 );
images.push_back( example );
cout << " monochrome ..." << endl;
example = model;
example.label( "Monochrome" );
example.quantizeColorSpace( GRAYColorspace );
example.quantizeColors( 2 );
example.quantizeDither( false );
example.quantize( );
images.push_back( example );
cout << " motion blur ..." << endl;
example = model;
example.label( "Motion Blur" );
example.motionBlur( 0.0, 7.0,45 );
images.push_back( example );
cout << " negate ..." << endl;
example = model;
example.label( "Negate" );
example.negate( );
images.push_back( example );
cout << " normalize ..." << endl;
example = model;
example.label( "Normalize" );
example.normalize( );
images.push_back( example );
cout << " oil paint ..." << endl;
example = model;
example.label( "Oil Paint" );
example.oilPaint( );
images.push_back( example );
cout << " ordered dither 2x2 ..." << endl;
example = model;
example.label( "Ordered Dither\n(2x2)" );
example.randomThreshold( Geometry(2,2) );
images.push_back( example );
cout << " ordered dither 3x3..." << endl;
example = model;
example.label( "Ordered Dither\n(3x3)" );
example.randomThreshold( Geometry(3,3) );
images.push_back( example );
cout << " ordered dither 4x4..." << endl;
example = model;
example.label( "Ordered Dither\n(4x4)" );
example.randomThreshold( Geometry(4,4) );
images.push_back( example );
cout << " ordered dither red 4x4..." << endl;
example = model;
example.label( "Ordered Dither\n(Red 4x4)" );
example.randomThresholdChannel( Geometry(4,4), RedChannel);
images.push_back( example );
cout << " plasma ..." << endl;
Image plasma;
plasma.size( "130x194" );
plasma.read( "plasma:fractal" );
plasma.label( "Plasma" );
images.push_back( plasma );
cout << " quantize ..." << endl;
example = model;
example.label( "Quantize" );
example.quantize( );
images.push_back( example );
cout << " quantum operator ..." << endl;
example = model;
example.label( "Quantum Operator\nRed * 0.4" );
example.quantumOperator( RedChannel,MultiplyEvaluateOperator,0.40 );
images.push_back( example );
cout << " raise ..." << endl;
example = model;
example.label( "Raise" );
example.raise( );
images.push_back( example );
cout << " reduce noise ..." << endl;
example = model;
example.label( "Reduce Noise" );
example.reduceNoise( 1.0 );
images.push_back( example );
cout << " resize ..." << endl;
example = model;
example.label( "Resize" );
example.zoom( "50%" );
images.push_back( example );
cout << " roll ..." << endl;
example = model;
example.label( "Roll" );
example.roll( "+20+10" );
images.push_back( example );
cout << " rotate ..." << endl;
example = model;
example.label( "Rotate" );
example.rotate( 45 );
example.transparent( "black" );
images.push_back( example );
cout << " scale ..." << endl;
example = model;
example.label( "Scale" );
example.scale( "60%" );
images.push_back( example );
cout << " segment ..." << endl;
example = model;
example.label( "Segment" );
example.segment( 0.5, 0.25 );
images.push_back( example );
cout << " shade ..." << endl;
example = model;
example.label( "Shade" );
example.shade( 30, 30, false );
images.push_back( example );
cout << " sharpen ..." << endl;
example = model;
example.label("Sharpen");
example.sharpen( 0.0, 1.0 );
images.push_back( example );
cout << " shave ..." << endl;
example = model;
example.label("Shave");
example.shave( Geometry( 10, 10) );
images.push_back( example );
cout << " shear ..." << endl;
example = model;
example.label( "Shear" );
example.shear( 45, 45 );
example.transparent( "black" );
images.push_back( example );
cout << " spread ..." << endl;
example = model;
example.label( "Spread" );
example.spread( 3 );
images.push_back( example );
cout << " solarize ..." << endl;
example = model;
example.label( "Solarize" );
example.solarize( );
images.push_back( example );
cout << " swirl ..." << endl;
example = model;
example.backgroundColor( "#000000FF" );
example.label( "Swirl" );
example.swirl( 90 );
images.push_back( example );
cout << " threshold ..." << endl;
example = model;
example.label( "Threshold" );
example.threshold( QuantumRange/2.0 );
images.push_back( example );
cout << " threshold random ..." << endl;
example = model;
example.label( "Random\nThreshold" );
example.randomThreshold( Geometry((unsigned int) (0.3*QuantumRange),
(unsigned int) (0.85*QuantumRange)) );
images.push_back( example );
cout << " unsharp mask ..." << endl;
example = model;
example.label( "Unsharp Mask" );
// radius_, sigma_, amount_, threshold_
example.unsharpmask( 0.0, 1.0, 1.0, 0.05);
images.push_back( example );
cout << " wave ..." << endl;
example = model;
example.label( "Wave" );
example.matte( true );
example.backgroundColor( "#000000FF" );
example.wave( 25, 150 );
images.push_back( example );
//
// Create image montage.
//
cout << "Montage images..." << endl;
for_each( images.begin(), images.end(), fontImage( font ) );
for_each( images.begin(), images.end(), strokeColorImage( Color("#600") ) );
MontageFramed montageOpts;
montageOpts.geometry( "130x194+10+5>" );
montageOpts.gravity( CenterGravity );
montageOpts.borderColor( "green" );
montageOpts.borderWidth( 1 );
montageOpts.tile( "7x4" );
montageOpts.compose( OverCompositeOp );
montageOpts.backgroundColor( "#ffffff" );
montageOpts.font( font );
montageOpts.pointSize( 18 );
montageOpts.fillColor( "#600" );
montageOpts.strokeColor( Color() );
montageOpts.compose(OverCompositeOp);
montageOpts.fileName( "Magick++ Demo" );
montageImages( &montage, images.begin(), images.end(), montageOpts );
}
Image& montage_image = montage.front();
{
// Create logo image
cout << "Adding logo image ..." << endl;
Image logo( "logo:" );
logo.zoom( "45%" );
// Composite logo into montage image
Geometry placement(0,0,(montage_image.columns()/2)-(logo.columns()/2),0);
montage_image.composite( logo, placement, OverCompositeOp );
}
cout << "Writing image \"demo_out.miff\" ..." << endl;
montage_image.matte( false );
montage_image.compressType( RLECompression );
writeImages(montage.begin(),montage.end(),"demo_out.miff");
// Uncomment following lines to display image to screen
// cout << "Display image..." << endl;
// montage_image.display();
}
catch( exception &error_ )
{
cout << "Caught exception: " << error_.what() << endl;
return 1;
}
return 0;
}
--- NEW FILE: zoom_blackman.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: smile_anim.miff ---
Id=ImageMagick
Class=PseudoClass Colors=2 Matte=False
Columns=48 Rows=48 Depth=8
Page=48x48+0+0
Background-color=gray100 Border-color=#dfdfdf Matte-color=gray74
Scene=0 Iterations=0 Delay=10 Dispose=3
Comment={GifBuilder 0.2 by Yves Piguet}
Signature=7b72ce35b443b218e81337ad355496ad
:
--- NEW FILE: zoom_quadratic.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: smile.miff ---
id=ImageMagick
class=PseudoClass colors=3 matte=True
columns=48 rows=48 depth=8
Resolution=89x89 units=undefined
page=1x1+0+0
delay=10
dispose=3
Signature=e479e50a6b2fd2ede083d65cfe4f844d
:
--- NEW FILE: zoom_sample.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: zoom_triangle.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: detrans.cpp ---
//
// Replace transparency in an image with a solid color using Magick++
//
// Useful to see how a transparent image looks on a particular
// background color, or to create a similar looking effect without
// transparency.
//
// Copyright Bob Friesenhahn, 2000
//
// Usage: detrans color file...
//
#include
#include
using namespace std;
using namespace Magick;
int main(int argc,char **argv)
{
if ( argc < 3 )
{
cout << "Usage: " << argv[0] << " background_color file..." << endl;
exit( 1 );
}
// Initialize ImageMagick install location for Windows
InitializeMagick(*argv);
{
Color color;
try {
color = Color(argv[1]);
}
catch ( Exception error_ )
{
cout << error_.what() << endl;
cout.flush();
exit(1);
}
char **arg = &argv[2];
while ( *arg )
{
string fname(*arg);
try {
Image overlay( fname );
Image base( overlay.size(), color );
base.composite( overlay, 0, 0, OverCompositeOp );
base.matte( false );
base.write( fname );
}
catch( Exception &error_ )
{
cout << error_.what() << endl;
}
++arg;
}
}
return 0;
}
--- NEW FILE: button.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
outfile="test_${executable}.out"
rm -f $outfile
${MEMCHECK} "./${executable}" 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: piddle.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
outfile="test_${executable}.out"
rm -f $outfile
${MEMCHECK} "./${executable}" 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: zoom_hamming.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: zoom_cubic.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: zoom_scale.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: zoom_hanning.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: shapes.cpp ---
// This may look like C code, but it is really -*- C++ -*-
//
// Copyright Bob Friesenhahn, 1999, 2000, 2002, 2003
//
// GD/PerlMagick example using Magick++ methods.
//
// Concept and algorithms lifted from PerlMagick demo script
//
#include
#include
#include
using namespace std;
using namespace Magick;
int main( int /*argc*/, char ** argv)
{
// Initialize ImageMagick install location for Windows
InitializeMagick(*argv);
try {
string srcdir("");
if(getenv("SRCDIR") != 0)
srcdir = getenv("SRCDIR");
//
// Create a 300x300 white canvas.
//
Image image( "300x300", "white" );
//
// Draw texture-filled polygon
//
// Polygon list
std::list poly_coord;
poly_coord.push_back( Coordinate(30,30) );
poly_coord.push_back( Coordinate(100,10) );
poly_coord.push_back( Coordinate(190,290) );
poly_coord.push_back( Coordinate(30,290) );
Image texture( srcdir + "tile.miff" );
image.penTexture( texture );
image.draw( DrawablePolygon( poly_coord ) );
texture.isValid( false );
image.penTexture( texture ); // Unset texture
//
// Draw filled ellipse with black border, and red fill color
//
image.strokeColor( "black" );
image.fillColor( "red" );
image.strokeWidth( 5 );
image.draw( DrawableEllipse( 100,100, 50,75, 0,360 ) );
image.fillColor( Color() ); // Clear out fill color
//
// Draw ellipse, and polygon, with black stroke, strokeWidth of 5
//
image.strokeColor( "black" );
image.strokeWidth( 5 );
list drawlist;
// Add polygon to list
poly_coord.clear();
poly_coord.push_back( Coordinate(30,30) );
poly_coord.push_back( Coordinate(100,10) );
poly_coord.push_back( Coordinate(190,290) );
poly_coord.push_back( Coordinate(30,290) );
drawlist.push_back( DrawablePolygon( poly_coord ) );
image.draw( drawlist );
//
// Floodfill object with blue
//
image.colorFuzz( 80 );
image.floodFillColor( "+132+62", "blue" );
//
// Draw text
//
image.strokeColor(Color());
image.fillColor( "red" );
image.fontPointsize( 18 );
image.annotate( "Hello world!", "+150+20" );
image.fillColor( "blue" );
image.fontPointsize( 14 );
image.annotate( "Goodbye cruel world!", "+150+38" );
image.fillColor( "black" );
image.fontPointsize( 14 );
image.annotate( "I'm climbing the wall!", "+280+120",
NorthWestGravity, 90.0 );
//image.display();
//
// Write image.
//
cout << "Writing image \"shapes_out.miff\" ..." << endl;
image.compressType( RLECompression );
image.write( "shapes_out.miff" );
// cout << "Display image..." << endl;
// image.display( );
}
catch( exception &error_ )
{
cout << "Caught exception: " << error_.what() << endl;
return 1;
}
return 0;
}
--- NEW FILE: demo.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
outfile="test_${executable}.out"
rm -f $outfile
${MEMCHECK} "./${executable}" 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: button.cpp ---
//
// Magick++ demo to generate a simple text button
//
// Copyright Bob Friesenhahn, 1999, 2000, 2001, 2003
//
#include
#include
#include
using namespace std;
using namespace Magick;
int main( int /*argc*/, char ** argv)
{
// Initialize ImageMagick install location for Windows
InitializeMagick(*argv);
try {
string srcdir("");
if(getenv("SRCDIR") != 0)
srcdir = getenv("SRCDIR");
//
// Options
//
string backGround = "xc:#CCCCCC"; // A solid color
// Color to use for decorative border
Color border = "#D4DCF3";
// Button size
string buttonSize = "120x20";
// Button background texture
string buttonTexture = "granite:";
// Button text
string text = "Button Text";
// Button text color
string textColor = "red";
// Font point size
int fontPointSize = 16;
//
// Magick++ operations
//
Image button;
// Set button size
button.size( buttonSize );
// Read background image
button.read( backGround );
// Set background to buttonTexture
Image backgroundTexture( buttonTexture );
button.texture( backgroundTexture );
// Add some text
button.fillColor( textColor );
button.fontPointsize( fontPointSize );
button.annotate( text, CenterGravity );
// Add a decorative frame
button.borderColor( border );
button.frame( "6x6+3+3" );
// Quantize to desired colors
// button.quantizeTreeDepth(8);
button.quantizeDither(false);
button.quantizeColors(64);
button.quantize();
// Save to file
cout << "Writing to \"button_out.miff\" ..." << endl;
button.compressType( RLECompression );
button.write("button_out.miff");
// Display on screen
// button.display();
}
catch( exception &error_ )
{
cout << "Caught exception: " << error_.what() << endl;
return 1;
}
return 0;
}
--- NEW FILE: flip.cpp ---
// This may look like C code, but it is really -*- C++ -*-
//
// Copyright Bob Friesenhahn, 1999, 2003
//
// Demonstration of unary function-object based operations
//
// Reads the multi-frame file "smile_anim.miff" and writes a
// flipped and morphed version to "flip_out.miff".
//
#include
#include
#include
#include
#include
using namespace std;
using namespace Magick;
int main( int /*argc*/, char ** argv)
{
// Initialize ImageMagick install location for Windows
InitializeMagick(*argv);
try {
string srcdir("");
if(getenv("SRCDIR") != 0)
srcdir = getenv("SRCDIR");
// Read images into STL list
list imageList;
readImages( &imageList, srcdir + "smile_anim.miff" );
// cout << "Total scenes: " << imageList.size() << endl;
// Flip images
for_each( imageList.begin(), imageList.end(), flipImage() );
// Create a morphed version, adding three frames between each
// existing frame.
list morphed;
morphImages( &morphed, imageList.begin(), imageList.end(), 3 );
// Write out images
cout << "Writing image \"flip_out.miff\" ..." << endl;
writeImages( morphed.begin(), morphed.end(), "flip_out.miff" );
}
catch( exception &error_ )
{
cout << "Caught exception: " << error_.what() << endl;
return 1;
}
return 0;
}
--- NEW FILE: shapes.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
outfile="test_${executable}.out"
rm -f $outfile
${MEMCHECK} "./${executable}" 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: zoom_lanczos.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: analyze.cpp ---
//
// Demonstrate using the 'analyze' process module to compute
// image statistics.
//
// Copyright Bob Friesenhahn, 2003, 2004
//
// Usage: analyze file...
//
#include
#include
#include
#include
using namespace std;
using namespace Magick;
int main(int argc,char **argv)
{
if ( argc < 2 )
{
cout << "Usage: " << argv[0] << " file..." << endl;
exit( 1 );
}
// Initialize ImageMagick install location for Windows
InitializeMagick(*argv);
{
std::list attributes;
attributes.push_back("TopLeftColor");
attributes.push_back("TopRightColor");
attributes.push_back("BottomLeftColor");
attributes.push_back("BottomRightColor");
attributes.push_back("filter:brightness:mean");
attributes.push_back("filter:brightness:standard-deviation");
attributes.push_back("filter:brightness:kurtosis");
attributes.push_back("filter:brightness:skewness");
attributes.push_back("filter:saturation:mean");
attributes.push_back("filter:saturation:standard-deviation");
attributes.push_back("filter:saturation:kurtosis");
attributes.push_back("filter:saturation:skewness");
char **arg = &argv[1];
while ( *arg )
{
string fname(*arg);
try {
cout << "File: " << fname << endl;
Image image( fname );
/* Analyze module does not require an argument list */
image.process("analyze",0,0);
list::iterator pos = attributes.begin();
while(pos != attributes.end())
{
cout << " " << setw(16) << setfill(' ') << setiosflags(ios::left)
<< *pos << " = " << image.attribute(*pos) << endl;
pos++;
}
}
catch( Exception &error_ )
{
cout << error_.what() << endl;
}
++arg;
}
}
return 0;
}
--- NEW FILE: zoom_point.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: zoom_mitchell.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
--- NEW FILE: zoom.cpp ---
// This may look like C code, but it is really -*- C++ -*-
//
// Copyright Bob Friesenhahn, 2001, 2002, 2003
//
// Resize image using specified resize algorithm with Magick++ API
//
// Usage: zoom [-density resolution] [-filter algorithm] [-geometry geometry]
// [-resample resolution] input_file output_file
//
#include
#include
#include
using namespace std;
using namespace Magick;
static void Usage ( char **argv )
{
cout << "Usage: " << argv[0]
<< " [-density resolution] [-filter algorithm] [-geometry geometry]"
<< " [-resample resolution] input_file output_file" << endl
<< " algorithm - bessel blackman box catrom cubic gaussian hamming hanning" << endl
<< " hermite lanczos mitchell point quadratic sample scale sinc triangle" << endl;
exit(1);
}
static void ParseError (int position, char **argv)
{
cout << "Argument \"" << argv[position] << "\" at position" << position
<< "incorrect" << endl;
Usage(argv);
}
int main(int argc,char **argv)
{
// Initialize ImageMagick install location for Windows
InitializeMagick(*argv);
if ( argc < 2 )
Usage(argv);
enum ResizeAlgorithm
{
Zoom,
Scale,
Sample
};
{
Geometry density;
Geometry geometry;
Geometry resample;
Magick::FilterTypes filter(LanczosFilter);
ResizeAlgorithm resize_algorithm=Zoom;
int argv_index=1;
while ((argv_index < argc - 2) && (*argv[argv_index] == '-'))
{
std::string command(argv[argv_index]);
if (command.compare("-density") == 0)
{
argv_index++;
try {
density=Geometry(argv[argv_index]);
}
catch( exception &/* error_ */)
{
ParseError(argv_index,argv);
}
argv_index++;
continue;
}
else if (command.compare("-filter") == 0)
{
argv_index++;
std::string algorithm(argv[argv_index]);
if (algorithm.compare("point") == 0)
filter=PointFilter;
else if (algorithm.compare("box") == 0)
filter=BoxFilter;
else if (algorithm.compare("triangle") == 0)
filter=TriangleFilter;
else if (algorithm.compare("hermite") == 0)
filter=HermiteFilter;
else if (algorithm.compare("hanning") == 0)
filter=HanningFilter;
else if (algorithm.compare("hamming") == 0)
filter=HammingFilter;
else if (algorithm.compare("blackman") == 0)
filter=BlackmanFilter;
else if (algorithm.compare("gaussian") == 0)
filter=GaussianFilter;
else if (algorithm.compare("quadratic") == 0)
filter=QuadraticFilter;
else if (algorithm.compare("cubic") == 0)
filter=CubicFilter;
else if (algorithm.compare("catrom") == 0)
filter=CatromFilter;
else if (algorithm.compare("mitchell") == 0)
filter=MitchellFilter;
else if (algorithm.compare("lanczos") == 0)
filter=LanczosFilter;
else if (algorithm.compare("bessel") == 0)
filter=BesselFilter;
else if (algorithm.compare("sinc") == 0)
filter=SincFilter;
else if (algorithm.compare("sample") == 0)
resize_algorithm=Sample;
else if (algorithm.compare("scale") == 0)
resize_algorithm=Scale;
else
ParseError(argv_index,argv);
argv_index++;
continue;
}
else if (command.compare("-geometry") == 0)
{
argv_index++;
try {
geometry=Geometry(argv[argv_index]);
}
catch( exception &/* error_ */)
{
ParseError(argv_index,argv);
}
argv_index++;
continue;
}
else if (command.compare("-resample") == 0)
{
argv_index++;
try {
resample=Geometry(argv[argv_index]);
}
catch( exception &/* error_ */)
{
ParseError(argv_index,argv);
}
argv_index++;
continue;
}
ParseError(argv_index,argv);
}
if (argv_index>argc-1)
ParseError(argv_index,argv);
std::string input_file(argv[argv_index]);
argv_index++;
if (argv_index>argc)
ParseError(argv_index,argv);
std::string output_file(argv[argv_index]);
try {
Image image(input_file);
if (density.isValid())
image.density(density);
density=image.density();
if (resample.isValid())
{
geometry =
Geometry(static_cast
(image.columns()*((double)resample.width()/density.width())+0.5),
static_cast
(image.rows()*((double)resample.height()/density.height())+0.5));
image.density(resample);
}
switch (resize_algorithm)
{
case Sample:
image.sample(geometry);
break;
case Scale:
image.scale(geometry);
break;
case Zoom:
image.filterType(filter);
image.zoom(geometry);
break;
}
image.write(output_file);
}
catch( exception &error_ )
{
cout << "Caught exception: " << error_.what() << endl;
return 1;
}
}
return 0;
}
--- NEW FILE: zoom_box.sh ---
#!/bin/sh
#
# Copyright 2004 Bob Friesenhahn
#
# This file is part of Magick++, the C++ API for ImageMagick and
# ImageMagick. Please see the file "COPYING" included with Magick++
# for usage and copying restrictions.
#
SRCDIR=`dirname $0`
SRCDIR=`cd $SRCDIR; pwd`/
export SRCDIR
cd Magick++/demo || exit 1
base_test=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
executable=`echo $base_test | sed -e 's:_.*$::'`
filter=`echo $base_test | sed -e 's:.*_::'`
outfile="test_${base_test}.out"
rm -f $outfile
${MEMCHECK} ./$executable -filter $filter -geometry 600x600 ${SRCDIR}/model.miff ${executable}_${filter}_out.miff 2>&1 > $outfile
status=$?
if test $status -eq 1
then
cat $outfile
fi
rm -f $outfile
exit $status
From ebala at helixcommunity.org Thu Sep 10 11:34:19 2009
From: ebala at helixcommunity.org (ebala@helixcommunity.org)
Date: Thu Sep 10 20:37:11 2009
Subject: [Common-cvs] import/imagemagick/Magick++/lib Magick++.h, 1.1,
1.2 ImageMagick++.pc.in, 1.1, 1.2 Magick++.pc.in, 1.1,
1.2 ImageMagick++.pc, 1.1, 1.2 Makefile.am, 1.1, 1.2 Blob.cpp,
1.1, 1.2 BlobRef.cpp, 1.1, 1.2 CoderInfo.cpp, 1.1,
1.2 Color.cpp, 1.1, 1.2 Drawable.cpp, 1.1, 1.2 Exception.cpp,
1.1, 1.2 Functions.cpp, 1.1, 1.2 Geometry.cpp, 1.1,
1.2 Image.cpp, 1.1, 1.2 ImageRef.cpp, 1.1, 1.2 Montage.cpp,
1.1, 1.2 Options.cpp, 1.1, 1.2 Pixels.cpp, 1.1, 1.2 STL.cpp,
1.1, 1.2 Thread.cpp, 1.1, 1.2 TypeMetric.cpp, 1.1, 1.2
Message-ID:
Update of /cvsroot/common/import/imagemagick/Magick++/lib
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv27291
Added Files:
Magick++.h ImageMagick++.pc.in Magick++.pc.in ImageMagick++.pc
Makefile.am Blob.cpp BlobRef.cpp CoderInfo.cpp Color.cpp
Drawable.cpp Exception.cpp Functions.cpp Geometry.cpp
Image.cpp ImageRef.cpp Montage.cpp Options.cpp Pixels.cpp
STL.cpp Thread.cpp TypeMetric.cpp
Log Message:
Import of Imagemagick
--- NEW FILE: ImageMagick++.pc.in ---
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@/ImageMagick
Name: ImageMagick++
Version: @PACKAGE_VERSION@
Description: Magick++ - C++ API for ImageMagick
Requires: ImageMagick
Libs: -L${libdir} -lMagick++
Cflags: -I${includedir}
--- NEW FILE: TypeMetric.cpp ---
// This may look like C code, but it is really -*- C++ -*-
//
// Copyright Bob Friesenhahn, 2001
//
// TypeMetric implementation
//
#define MAGICKCORE_IMPLEMENTATION 1
#define MAGICK_PLUSPLUS_IMPLEMENTATION 1
#include "Magick++/TypeMetric.h"
#include
// Default constructor
Magick::TypeMetric::TypeMetric ( void )
{
memset( &_typeMetric, 0, sizeof(_typeMetric));
}
Magick::TypeMetric::~TypeMetric ( void )
{
// Nothing to do
}
// Ascent, expressed in pixels
double Magick::TypeMetric::ascent ( void ) const
{
return _typeMetric.ascent;
}
// Descent, expressed in pixels
double Magick::TypeMetric::descent ( void ) const
{
return _typeMetric.descent;
}
// Text width, expressed in pixels
double Magick::TypeMetric::textWidth ( void ) const
{
return _typeMetric.width;
}
// Text height, expressed in pixels
double Magick::TypeMetric::textHeight ( void ) const
{
return _typeMetric.height;
}
// Maximum horizontal advance, expressed in pixels
double Magick::TypeMetric::maxHorizontalAdvance ( void ) const
{
return _typeMetric.max_advance;
}
--- NEW FILE: Pixels.cpp ---
// This may look like C code, but it is really -*- C++ -*-
//
// Copyright Bob Friesenhahn, 1999, 2000, 2001, 2002, 2003
//
// Pixels Implementation
//
#define MAGICKCORE_IMPLEMENTATION 1
#define MAGICK_PLUSPLUS_IMPLEMENTATION 1
#include "Magick++/Include.h"
#include // This is here to compile with Visual C++
#include "Magick++/Thread.h"
#include "Magick++/Exception.h"
#include "Magick++/Pixels.h"
namespace Magick
{
}
// Construct pixel view using specified image.
Magick::Pixels::Pixels( Magick::Image &image_ )
: _image(image_),
_view(AcquireCacheView(_image.image())),
_x(0),
_y(0),
_columns(0),
_rows(0)
{
GetExceptionInfo( &_exception );
if (!_view)
_image.throwImageException();
(void) DestroyExceptionInfo( &_exception );
}
// Destroy pixel view
Magick::Pixels::~Pixels( void )
{
if ( _view )
_view = DestroyCacheView( _view );
}
// Transfer pixels from the image to the pixel view as defined by
// the specified region. Modified pixels may be subsequently
// transferred back to the image via sync.
Magick::PixelPacket* Magick::Pixels::get ( const int x_,
const int y_,
const unsigned int columns_,
const unsigned int rows_ )
{
_x = x_;
_y = y_;
_columns = columns_;
_rows = rows_;
PixelPacket* pixels = GetCacheViewAuthenticPixels( _view, x_, y_, columns_, rows_, &_exception);
if ( !pixels )
throwException( *GetCacheViewException(_view) );
return pixels;
}
// Transfer read-only pixels from the image to the pixel view as
// defined by the specified region.
const Magick::PixelPacket* Magick::Pixels::getConst ( const int x_, const int y_,
const unsigned int columns_,
const unsigned int rows_ )
{
_x = x_;
_y = y_;
_columns = columns_;
_rows = rows_;
const PixelPacket* pixels =
GetCacheViewVirtualPixels(_view, x_, y_, columns_, rows_, &_exception );
if ( !pixels )
throwException( _exception );
return pixels;
}
// Transfers the image view pixels to the image.
void Magick::Pixels::sync ( void )
{
if( !SyncCacheViewAuthenticPixels( _view, &_exception ) )
throwException( _exception );
}
// Allocate a pixel view region to store image pixels as defined
// by the region rectangle. This area is subsequently transferred
// from the pixel view to the image via 'sync'.
Magick::PixelPacket* Magick::Pixels::set ( const int x_,
const int y_,
const unsigned int columns_,
const unsigned int rows_ )
{
_x = x_;
_y = y_;
_columns = columns_;
_rows = rows_;
PixelPacket* pixels = QueueCacheViewAuthenticPixels( _view, static_cast(x_), static_cast(y_),
columns_, rows_, &_exception );
if ( !pixels )
throwException( _exception );
return pixels;
}
// Return pixel colormap index array
Magick::IndexPacket* Magick::Pixels::indexes ( void )
{
IndexPacket* pixel_indexes = GetCacheViewAuthenticIndexQueue( _view );
if ( !pixel_indexes )
_image.throwImageException();
return pixel_indexes;
}
--- NEW FILE: Makefile.am ---
#
# Makefile for Magick++ library
#
# Copyright Bob Friesenhahn, 1999, 2000, 2001, 2002, 2003
#
AUTOMAKE_OPTIONS = 1.8 nostdinc
SUBDIRS = Magick++
AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)
includedir = @includedir@
pkgdatadir = $(datadir)/Magick++
pkglibdir = $(libdir)/Magick++
pkgincludedir = $(includedir)/Magick++
lib_LTLIBRARIES = libMagick++.la
LIBRARY_CURRENT = @LIBRARY_CURRENT@
LIBRARY_REVISION = @LIBRARY_REVISION@
LIBRARY_AGE = @LIBRARY_AGE@
libMagick___la_SOURCES = \
Blob.cpp BlobRef.cpp CoderInfo.cpp Color.cpp Drawable.cpp \
Exception.cpp Functions.cpp Geometry.cpp Image.cpp ImageRef.cpp \
Montage.cpp Options.cpp Pixels.cpp STL.cpp Thread.cpp TypeMetric.cpp
libMagick___la_LDFLAGS = \
-version-info $(LIBRARY_CURRENT):$(LIBRARY_REVISION):$(LIBRARY_AGE)
libMagick___la_LIBADD = $(top_builddir)/wand/libMagickWand.la $(top_builddir)/magick/libMagickCore.la
include_HEADERS = Magick++.h
EXTRA_DIST = ImageMagick++.pc.in
AM_LDFLAGS = @LDFLAGS@ $(LIBSTDCLDFLAGS)
# Pkgconfig directory
pkgconfigdir = $(libdir)/pkgconfig
# Files to install in Pkgconfig directory
pkgconfig_DATA = ImageMagick++.pc
--- NEW FILE: Color.cpp ---
// This may look like C code, but it is really -*- C++ -*-
//
// Copyright Bob Friesenhahn, 1999, 2000, 2001, 2002, 2003
//
// Color Implementation
//
#define MAGICKCORE_IMPLEMENTATION
#define MAGICK_PLUSPLUS_IMPLEMENTATION 1
#include "Magick++/Include.h"
#include
using namespace std;
#include "Magick++/Color.h"
#include "Magick++/Exception.h"
//
// Color operator fuctions
//
int Magick::operator == ( const Magick::Color& left_,
const Magick::Color& right_ )
{
return ( ( left_.isValid() == right_.isValid() ) &&
( left_.redQuantum() == right_.redQuantum() ) &&
( left_.greenQuantum() == right_.greenQuantum() ) &&
( left_.blueQuantum() == right_.blueQuantum() )
);
}
int Magick::operator != ( const Magick::Color& left_,
const Magick::Color& right_ )
{
return ( ! (left_ == right_) );
}
int Magick::operator > ( const Magick::Color& left_,
const Magick::Color& right_ )
{
return ( !( left_ < right_ ) && ( left_ != right_ ) );
}
// Compare color intensities (similar to ImageMagick Intensity macro)
// If intensities match, discriminate based on priority green, red,
// & then blue.
int Magick::operator < ( const Magick::Color& left_,
const Magick::Color& right_ )
{
double left_intensity=left_.intensity();
double right_intensity=right_.intensity();
return (
(left_intensity < right_intensity)
|| (
(left_intensity == right_intensity)
&& (
(left_.greenQuantum() < right_.greenQuantum()) ||
(left_.redQuantum() < right_.redQuantum()) ||
(left_.blueQuantum() < right_.blueQuantum())
)
)
);
}
int Magick::operator >= ( const Magick::Color& left_,
const Magick::Color& right_ )
{
return ( ( left_ > right_ ) || ( left_ == right_ ) );
}
int Magick::operator <= ( const Magick::Color& left_,
const Magick::Color& right_ )
{
return ( ( left_ < right_ ) || ( left_ == right_ ) );
}
//
// Color Implementation
//
// Default constructor
Magick::Color::Color ( void )
: _pixel(new PixelPacket),
_pixelOwn(true),
_isValid(false),
_pixelType(RGBPixel)
{
initPixel();
}
// Construct from RGB
Magick::Color::Color ( Quantum red_,
Quantum green_,
Quantum blue_ )
: _pixel(new PixelPacket),
_pixelOwn(true),
_isValid(true),
_pixelType(RGBPixel)
{
redQuantum ( red_ );
greenQuantum ( green_ );
blueQuantum ( blue_ );
alphaQuantum ( OpaqueOpacity );
}
// Construct from RGBA
Magick::Color::Color ( Quantum red_,
Quantum green_,
Quantum blue_,
Quantum alpha_ )
: _pixel(new PixelPacket),
_pixelOwn(true),
_isValid(true),
_pixelType(RGBAPixel)
{
redQuantum ( red_ );
greenQuantum ( green_ );
blueQuantum ( blue_ );
alphaQuantum ( alpha_ );
}
// Copy constructor
Magick::Color::Color ( const Magick::Color & color_ )
: _pixel( new PixelPacket ),
_pixelOwn( true ),
_isValid( color_._isValid ),
_pixelType( color_._pixelType )
{
*_pixel = *color_._pixel;
}
// Construct from color expressed as C++ string
Magick::Color::Color ( const std::string &x11color_ )
: _pixel(new PixelPacket),
_pixelOwn(true),
_isValid(true),
_pixelType(RGBPixel)
{
initPixel();
// Use operator = implementation
*this = x11color_;
}
// Construct from color expressed as C string
Magick::Color::Color ( const char * x11color_ )
: _pixel(new PixelPacket),
_pixelOwn(true),
_isValid(true),
_pixelType(RGBPixel)
{
initPixel();
// Use operator = implementation
*this = x11color_;
}
// Construct color via ImageMagick PixelPacket
Magick::Color::Color ( const PixelPacket &color_ )
: _pixel(new PixelPacket),
_pixelOwn(true), // We allocated this pixel
_isValid(true),
_pixelType(RGBPixel) // RGB pixel by default
{
*_pixel = color_;
if ( color_.opacity != OpaqueOpacity )
_pixelType = RGBAPixel;
}
// Protected constructor to construct with PixelPacket*
// Used to point Color at a pixel.
Magick::Color::Color ( PixelPacket* rep_, PixelType pixelType_ )
: _pixel(rep_),
_pixelOwn(false),
_isValid(true),
_pixelType(pixelType_)
{
}
// Destructor
Magick::Color::~Color( void )
{
if ( _pixelOwn )
delete _pixel;
_pixel=0;
}
// Assignment operator
Magick::Color& Magick::Color::operator = ( const Magick::Color& color_ )
{
// If not being set to ourself
if ( this != &color_ )
{
// Copy pixel value
*_pixel = *color_._pixel;
// Validity
_isValid = color_._isValid;
// Copy pixel type
_pixelType = color_._pixelType;
}
return *this;
}
// Set color via X11 color specification string
const Magick::Color& Magick::Color::operator = ( const std::string &x11color_ )
{
initPixel();
PixelPacket target_color;
ExceptionInfo exception;
GetExceptionInfo( &exception );
if ( QueryColorDatabase( x11color_.c_str(), &target_color, &exception ) )
{
redQuantum( target_color.red );
greenQuantum( target_color.green );
blueQuantum( target_color.blue );
alphaQuantum( target_color.opacity );
if ( target_color.opacity > OpaqueOpacity )
_pixelType = RGBAPixel;
else
_pixelType = RGBPixel;
}
else
{
_isValid = false;
throwException(exception);
}
(void) DestroyExceptionInfo( &exception );
return *this;
}
// Set color via X11 color specification C string
const Magick::Color& Magick::Color::operator = ( const char * x11color_ )
{
*this = std::string(x11color_);
return *this;
}
// Return X11 color specification string
Magick::Color::operator std::string() const
{
if ( !isValid() )
return std::string("none");
char colorbuf[MaxTextExtent];
MagickPixelPacket
pixel;
pixel.colorspace=RGBColorspace;
pixel.matte=_pixelType == RGBAPixel ? MagickTrue : MagickFalse;
pixel.depth=MAGICKCORE_QUANTUM_DEPTH;
pixel.red=_pixel->red;
pixel.green=_pixel->green;
pixel.blue=_pixel->blue;
pixel.opacity=_pixel->opacity;
GetColorTuple( &pixel, MagickTrue, colorbuf );
return std::string(colorbuf);
}
// Set color via ImageMagick PixelPacket
const Magick::Color& Magick::Color::operator= ( const MagickCore::PixelPacket &color_ )
{
*_pixel = color_;
if ( color_.opacity != OpaqueOpacity )
_pixelType = RGBAPixel;
else
_pixelType = RGBPixel;
return *this;
}
// Set pixel
// Used to point Color at a pixel in an image
void Magick::Color::pixel ( PixelPacket* rep_, PixelType pixelType_ )
{
if ( _pixelOwn )
delete _pixel;
_pixel = rep_;
_pixelOwn = false;
_isValid = true;
_pixelType = pixelType_;
}
// Does object contain valid color?
bool Magick::Color::isValid ( void ) const
{
return( _isValid );
}
void Magick::Color::isValid ( bool valid_ )
{
if ( (valid_ && isValid()) || (!valid_ && !isValid()) )
return;
if ( !_pixelOwn )
{
_pixel = new PixelPacket;
_pixelOwn = true;
}
_isValid=valid_;
initPixel();
}
//
// ColorHSL Implementation
//
Magick::ColorHSL::ColorHSL ( double hue_,
double saturation_,
double luminosity_ )
: Color ()
{
Quantum red, green, blue;
ConvertHSLToRGB ( hue_,
saturation_,
luminosity_,
&red,
&green,
&blue );
redQuantum ( red );
greenQuantum ( green );
blueQuantum ( blue );
alphaQuantum ( OpaqueOpacity );
}
// Null constructor
Magick::ColorHSL::ColorHSL ( )
: Color ()
{
}
// Copy constructor from base class
Magick::ColorHSL::ColorHSL ( const Magick::Color & color_ )
: Color( color_ )
{
}
// Destructor
Magick::ColorHSL::~ColorHSL ( )
{
// Nothing to do
}
void Magick::ColorHSL::hue ( double hue_ )
{
double hue_val, saturation_val, luminosity_val;
ConvertRGBToHSL ( redQuantum(),
greenQuantum(),
blueQuantum(),
&hue_val,
&saturation_val,
&luminosity_val );
hue_val = hue_;
Quantum red, green, blue;
ConvertHSLToRGB ( hue_val,
saturation_val,
luminosity_val,
&red,
&green,
&blue
);
redQuantum ( red );
greenQuantum ( green );
blueQuantum ( blue );
}
double Magick::ColorHSL::hue ( void ) const
{
double hue_val, saturation_val, luminosity_val;
ConvertRGBToHSL ( redQuantum(),
greenQuantum(),
blueQuantum(),
&hue_val,
&saturation_val,
&luminosity_val );
return hue_val;
}
void Magick::ColorHSL::saturation ( double saturation_ )
{
double hue_val, saturation_val, luminosity_val;
ConvertRGBToHSL ( redQuantum(),
greenQuantum(),
blueQuantum(),
&hue_val,
&saturation_val,
&luminosity_val );
saturation_val = saturation_;
Quantum red, green, blue;
ConvertHSLToRGB ( hue_val,
saturation_val,
luminosity_val,
&red,
&green,
&blue
);
redQuantum ( red );
greenQuantum ( green );
blueQuantum ( blue );
}
double Magick::ColorHSL::saturation ( void ) const
{
double hue_val, saturation_val, luminosity_val;
ConvertRGBToHSL ( redQuantum(),
greenQuantum(),
blueQuantum(),
&hue_val,
&saturation_val,
&luminosity_val );
return saturation_val;
}
void Magick::ColorHSL::luminosity ( double luminosity_ )
{
double hue_val, saturation_val, luminosity_val;
ConvertRGBToHSL ( redQuantum(),
greenQuantum(),
blueQuantum(),
&hue_val,
&saturation_val,
&luminosity_val );
luminosity_val = luminosity_;
Quantum red, green, blue;
ConvertHSLToRGB ( hue_val,
saturation_val,
luminosity_val,
&red,
&green,
&blue
);
redQuantum ( red );
greenQuantum ( green );
blueQuantum ( blue );
}
double Magick::ColorHSL::luminosity ( void ) const
{
double hue_val, saturation_val, luminosity_val;
ConvertRGBToHSL ( redQuantum(),
greenQuantum(),
blueQuantum(),
&hue_val,
&saturation_val,
&luminosity_val );
return luminosity_val;
}
// Assignment from base class
Magick::ColorHSL& Magick::ColorHSL::operator = ( const Magick::Color& color_ )
{
*static_cast(this) = color_;
return *this;
}
//
// ColorGray Implementation
//
Magick::ColorGray::ColorGray ( double shade_ )
: Color ( scaleDoubleToQuantum( shade_ ),
scaleDoubleToQuantum( shade_ ),
scaleDoubleToQuantum( shade_ ) )
{
alphaQuantum ( OpaqueOpacity );
}
// Null constructor
Magick::ColorGray::ColorGray ( void )
: Color ()
{
}
// Copy constructor from base class
Magick::ColorGray::ColorGray ( const Magick::Color & color_ )
: Color( color_ )
{
}
// Destructor
Magick::ColorGray::~ColorGray ()
{
// Nothing to do
}
void Magick::ColorGray::shade ( double shade_ )
{
Quantum gray = scaleDoubleToQuantum( shade_ );
redQuantum ( gray );
greenQuantum ( gray );
blueQuantum ( gray );
}
double Magick::ColorGray::shade ( void ) const
{
return scaleQuantumToDouble ( greenQuantum() );
}
// Assignment from base class
Magick::ColorGray& Magick::ColorGray::operator = ( const Magick::Color& color_ )
{
*static_cast(this) = color_;
return *this;
}
//
// ColorMono Implementation
//
Magick::ColorMono::ColorMono ( bool mono_ )
: Color ( ( mono_ ? QuantumRange : 0 ),
( mono_ ? QuantumRange : 0 ),
( mono_ ? QuantumRange : 0 ) )
{
alphaQuantum ( OpaqueOpacity );
}
// Null constructor
Magick::ColorMono::ColorMono ( void )
: Color ()
{
}
// Copy constructor from base class
Magick::ColorMono::ColorMono ( const Magick::Color & color_ )
: Color( color_ )
{
}
// Destructor
Magick::ColorMono::~ColorMono ()
{
// Nothing to do
}
void Magick::ColorMono::mono ( bool mono_ )
{
redQuantum ( mono_ ? QuantumRange : 0 );
greenQuantum ( mono_ ? QuantumRange : 0 );
blueQuantum ( mono_ ? QuantumRange : 0 );
}
bool Magick::ColorMono::mono ( void ) const
{
if ( greenQuantum() )
return true;
else
return false;
}
// Assignment from base class
Magick::ColorMono& Magick::ColorMono::operator = ( const Magick::Color& color_ )
{
*static_cast(this) = color_;
return *this;
}
//
// ColorRGB Implementation
//
// Construct from red, green, and blue, components
Magick::ColorRGB::ColorRGB ( double red_,
double green_,
double blue_ )
: Color ( scaleDoubleToQuantum(red_),
scaleDoubleToQuantum(green_),
scaleDoubleToQuantum(blue_) )
{
alphaQuantum ( OpaqueOpacity );
}
// Null constructor
Magick::ColorRGB::ColorRGB ( void )
: Color ()
{
}
// Copy constructor from base class
Magick::ColorRGB::ColorRGB ( const Magick::Color & color_ )
: Color( color_ )
{
}
// Destructor
Magick::ColorRGB::~ColorRGB ( void )
{
// Nothing to do
}
// Assignment from base class
Magick::ColorRGB& Magick::ColorRGB::operator = ( const Magick::Color& color_ )
{
*static_cast(this) = color_;
return *this;
}
//
// ColorYUV Implementation
//
// R = Y +1.13980*V
// G = Y-0.39380*U-0.58050*V
// B = Y+2.02790*U
//
// U and V, normally -0.5 through 0.5, must be normalized to the range 0
// through QuantumRange.
//
// Y = 0.29900*R+0.58700*G+0.11400*B
// U = -0.14740*R-0.28950*G+0.43690*B
// V = 0.61500*R-0.51500*G-0.10000*B
//
// U and V, normally -0.5 through 0.5, are normalized to the range 0
// through QuantumRange. Note that U = 0.493*(B-Y), V = 0.877*(R-Y).
//
// Construct from color components
Magick::ColorYUV::ColorYUV ( double y_,
double u_,
double v_ )
: Color ( scaleDoubleToQuantum(y_ + 1.13980 * v_ ),
scaleDoubleToQuantum(y_ - (0.39380 * u_) - (0.58050 * v_) ),
scaleDoubleToQuantum(y_ + 2.02790 * u_ ) )
{
alphaQuantum ( OpaqueOpacity );
}
// Null constructor
Magick::ColorYUV::ColorYUV ( void )
: Color ()
{
}
// Copy constructor from base class
Magick::ColorYUV::ColorYUV ( const Magick::Color & color_ )
: Color( color_ )
{
}
// Destructor
Magick::ColorYUV::~ColorYUV ( void )
{
// Nothing to do
}
void Magick::ColorYUV::u ( double u_ )
{
double V = v();
double Y = y();
redQuantum ( scaleDoubleToQuantum( Y + 1.13980 * V ) );
greenQuantum ( scaleDoubleToQuantum( Y - (0.39380 * u_) - (0.58050 * V) ) );
blueQuantum ( scaleDoubleToQuantum( Y + 2.02790 * u_ ) );
}
double Magick::ColorYUV::u ( void ) const
{
return scaleQuantumToDouble( (-0.14740 * redQuantum()) - (0.28950 *
greenQuantum()) + (0.43690 * blueQuantum()) );
}
void Magick::ColorYUV::v ( double v_ )
{
double U = u();
double Y = y();
redQuantum ( scaleDoubleToQuantum( Y + 1.13980 * v_ ) );
greenQuantum ( scaleDoubleToQuantum( Y - (0.39380 * U) - (0.58050 * v_) ) );
blueQuantum ( scaleDoubleToQuantum( Y + 2.02790 * U ) );
}
double Magick::ColorYUV::v ( void ) const
{
return scaleQuantumToDouble((0.61500 * redQuantum()) -
(0.51500 * greenQuantum()) -
(0.10000 * blueQuantum()));
}
void Magick::ColorYUV::y ( double y_ )
{
double U = u();
double V = v();
redQuantum ( scaleDoubleToQuantum( y_ + 1.13980 * V ) );
greenQuantum ( scaleDoubleToQuantum( y_ - (0.39380 * U) - (0.58050 * V) ) );
blueQuantum ( scaleDoubleToQuantum( y_ + 2.02790 * U ) );
}
double Magick::ColorYUV::y ( void ) const
{
return scaleQuantumToDouble((0.29900 * redQuantum()) +
(0.58700 * greenQuantum()) +
(0.11400 * blueQuantum()));
}
// Assignment from base class
Magick::ColorYUV& Magick::ColorYUV::operator = ( const Magick::Color& color_ )
{
*static_cast(this) = color_;
return *this;
}
--- NEW FILE: Magick++.h ---
// This may look like C code, but it is really -*- C++ -*-
//
// Copyright Bob Friesenhahn, 1999, 2000
//
// Simplified includes for Magick++.
// Inclusion of this header is sufficient to use all Magick++ APIs.
//
#ifndef MagickPlusPlus_Header
#include
#include
#include
#include
#define MagickPlusPlus_Header
#endif // MagickPlusPlus_Header
--- NEW FILE: ImageRef.cpp ---
// This may look like C code, but it is really -*- C++ -*-
//
// Copyright Bob Friesenhahn, 1999, 2000, 2001, 2002
//
// Implementation of ImageRef
//
// This is an internal implementation class.
//
#define MAGICKCORE_IMPLEMENTATION 1
#define MAGICK_PLUSPLUS_IMPLEMENTATION 1
#include "Magick++/ImageRef.h"
#include "Magick++/Exception.h"
#include "Magick++/Options.h"
// Construct with an image and default options
Magick::ImageRef::ImageRef ( MagickCore::Image * image_ )
: _image(image_),
_options(new Options),
_id(-1),
_refCount(1),
_mutexLock()
{
}
// Construct with an image and options
// Inserts Image* in image, but copies Options into image.
Magick::ImageRef::ImageRef ( MagickCore::Image * image_,
const Options * options_ )
: _image(image_),
_options(0),
_id(-1),
_refCount(1),
_mutexLock()
{
_options = new Options( *options_ );
}
// Default constructor
Magick::ImageRef::ImageRef ( void )
: _image(0),
_options(new Options),
_id(-1),
_refCount(1),
_mutexLock()
{
// Allocate default image
_image = AcquireImage( _options->imageInfo() );
// Test for error and throw exception (like throwImageException())
throwException(_image->exception);
}
// Destructor
Magick::ImageRef::~ImageRef( void )
{
// Unregister image (if still registered)
if( _id > -1 )
{
char id[MaxTextExtent];
sprintf(id,"%ld",_id);
DeleteImageRegistry( id );
_id=-1;
}
// Deallocate image
if ( _image )
{
DestroyImageList( _image );
_image = 0;
}
// Deallocate image options
delete _options;
_options = 0;
}
// Assign image to reference
void Magick::ImageRef::image ( MagickCore::Image * image_ )
{
if(_image)
DestroyImageList( _image );
_image = image_;
}
// Assign options to reference
void Magick::ImageRef::options ( Magick::Options * options_ )
{
delete _options;
_options = options_;
}
// Assign registration id to reference
void Magick::ImageRef::id ( const long id_ )
{
if( _id > -1 )
{
char id[MaxTextExtent];
sprintf(id,"%ld",_id);
DeleteImageRegistry( id );
}
_id = id_;
}
--- NEW FILE: Magick++.pc.in ---
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@/ImageMagick
Name: Magick++
Version: @PACKAGE_VERSION@
Description: Magick++ - C++ API for ImageMagick
Requires: ImageMagick
Libs: -L${libdir} -lMagick++
Cflags: -I${includedir}
--- NEW FILE: ImageMagick++.pc ---
prefix=/usr/local
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include/ImageMagick
Name: ImageMagick++
Version: 6.5.4
Description: Magick++ - C++ API for ImageMagick
Requires: ImageMagick
Libs: -L${libdir} -lMagick++
Cflags: -I${includedir}
--- NEW FILE: Drawable.cpp ---
// This may look like C code, but it is really -*- C++ -*-
//
// Copyright Bob Friesenhahn, 1999, 2000, 2001, 2002, 2003
//
// Implementation of Drawable (Graphic objects)
//
#define MAGICKCORE_IMPLEMENTATION 1
#define MAGICK_PLUSPLUS_IMPLEMENTATION 1
#define MAGICK_DRAWABLE_IMPLEMENTATION
#include "Magick++/Include.h"
#include
#include
#include "Magick++/Drawable.h"
#include "Magick++/Image.h"
using namespace std;
[...2106 lines suppressed...]
{
for( CoordinateList::const_iterator p = _coordinates.begin();
p != _coordinates.end(); p++ )
{
DrawPathMoveToRelative( context_, p->x(), p->y() );
}
}
Magick::VPathBase* Magick::PathMovetoRel::copy() const
{
return new PathMovetoRel(*this);
}
#if defined(EXPLICIT_TEMPLATE_INSTANTIATION)
// template class std::list;
// template class std::list;
// template class std::list