[hxdatatype] CR: common/baserend

[hxdatatype] CR: common/baserend

Jonathan H.H. Bloedow jbloedow at real.com
Wed Jul 23 10:58:39 PDT 2003


I have to admit I don't know much about baserend, but I do know that it's 
used by some of the image renderers, and to get them to build for EPOC's 
fussy approach to data segments we need "fix" these non-const statics. This 
look OK?

-- Jonathan


Index: pub/baserend.h
===================================================================
RCS file: /cvs/datatype/common/baserend/pub/baserend.h,v
retrieving revision 1.2
diff -b -u -5 -r1.2 baserend.h
--- pub/baserend.h	24 Jun 2003 18:47:07 -0000	1.2
+++ pub/baserend.h	23 Jul 2003 17:48:27 -0000
@@ -133,12 +133,12 @@
      STDMETHOD_(UINT32,GetInitialGranularity)             (THIS);
      STDMETHOD_(UINT32,GetDisplayFlags)                   (THIS);
      STDMETHOD_(UINT32,GetHighestSupportedContentVersion) (THIS);
      STDMETHOD_(UINT32,GetHighestSupportedStreamVersion)  (THIS);

-    static const char*      m_pszBaseCopyright;
-    static const char*      m_pszBaseMoreInfoURL;
+    static const char*      const m_pszBaseCopyright;
+    static const char*      const m_pszBaseMoreInfoURL;

      STDMETHOD(CheckStreamVersions)        (THIS_ IHXValues* pHeader);
      STDMETHOD(AddMimeToUpgradeCollection) (THIS_ const char* pszMimeType);
      STDMETHOD(GetPreference)              (THIS_ const 
char*      pszPrefName,
                                                   REF(BOOL)        rbPresent,
Index: baserend.cpp
===================================================================
RCS file: /cvs/datatype/common/baserend/baserend.cpp,v
retrieving revision 1.5
diff -b -u -5 -r1.5 baserend.cpp
--- baserend.cpp	24 Jun 2003 18:47:07 -0000	1.5
+++ baserend.cpp	23 Jul 2003 17:48:27 -0000
@@ -62,12 +62,12 @@
  #ifdef _DEBUG
  #undef HX_THIS_FILE		
  static const char HX_THIS_FILE[] = __FILE__;
  #endif

-const char* CRNBaseRenderer::m_pszBaseCopyright   = HXVER_COPYRIGHT;
-const char* CRNBaseRenderer::m_pszBaseMoreInfoURL = HXVER_MOREINFO;
+const char* const CRNBaseRenderer::m_pszBaseCopyright   = HXVER_COPYRIGHT;
+const char* const CRNBaseRenderer::m_pszBaseMoreInfoURL = HXVER_MOREINFO;

  CRNBaseRenderer::CRNBaseRenderer()
  {
      m_lRefCount            = 0;
      m_pContext             = NULL;
@@ -711,17 +711,17 @@
      return TRUE;
  }

  STDMETHODIMP CRNBaseRenderer::GetCopyright(REF(const char*) rpszCopyright)
  {
-    rpszCopyright = m_pszBaseCopyright;
+    rpszCopyright = (const char*) m_pszBaseCopyright;
      return HXR_OK;
  }

  STDMETHODIMP CRNBaseRenderer::GetMoreInfoURL(REF(const char*) 
rpszMoreInfoURL)
  {
-    rpszMoreInfoURL = m_pszBaseMoreInfoURL;
+    rpszMoreInfoURL = (const char*) m_pszBaseMoreInfoURL;
      return HXR_OK;
  }

  STDMETHODIMP_(UINT32) CRNBaseRenderer::GetInitialGranularity()
  {


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe at datatype.helixcommunity.org
For additional commands, e-mail: dev-help at datatype.helixcommunity.org




More information about the Datatype-dev mailing list
 

Site Map   |   Terms of Use   |   Privacy Policy   |   Contact Us

Copyright © 1995-2007 RealNetworks, Inc. All rights reserved. RealNetworks and Helix are trademarks of RealNetworks.
All other trademarks or registered trademarks are the property of their respective holders.